Xcode 프로젝트 수정.

ComputeShader 클래스명 변경, 일부 변수명 변경

Samples.xcworkspace/contents.xcworkspacedata

@@ -5,6 +5,9 @@
       location = "container:"
       name = "Samples">
       <FileRef
+         location = "group:Samples/ComputeShader/ComputeShader.xcodeproj">
+      </FileRef>
+      <FileRef
          location = "group:Samples/Mesh/Mesh.xcodeproj">
       </FileRef>
       <FileRef

Samples/ComputeShader/ComputeShader.cpp

@@ -191,7 +191,7 @@ public:
     UBO* UniformBufferO() { return ubo; }
 };
 
-class MeshDemo : public SampleApp
+class ComputeShaderDemo : public SampleApp
 {
     DKObject<DKWindow> window;
 	DKObject<DKThread> renderThread;
@@ -201,7 +201,7 @@ class MeshDemo : public SampleApp
 	DKObject<UVQuad> quad;
     DKObject<DKTexture> textureColorMap;
 
-    DKObject<TextureComputeTarget> ComputeTarget;
+    DKObject<TextureComputeTarget> computeTarget;
     DKObject<DKSamplerState> sampleState = nullptr;;
 
     DKObject<GraphicShaderBindingSet> graphicShaderBindingSet = nullptr;
@@ -297,7 +297,7 @@ public:
 
         // Texture Resource Initialize
         
-        ComputeTarget = DKOBJECT_NEW TextureComputeTarget();
+        computeTarget = DKOBJECT_NEW TextureComputeTarget();
         
         DKSamplerDescriptor computeSamplerDesc = {};
         computeSamplerDesc.magFilter = DKSamplerDescriptor::MinMagFilterLinear;
@@ -401,7 +401,7 @@ public:
 
         DKComputePipelineDescriptor embossComputePipelineDescriptor;
         embossComputePipelineDescriptor.computeFunction = cs_ef;
-        auto Emboss = device->CreateComputePipeline(embossComputePipelineDescriptor);
+        auto emboss = device->CreateComputePipeline(embossComputePipelineDescriptor);
         
         DKObject<DKTexture> depthBuffer = nullptr;
         DKObject<DKTexture> targettex = nullptr;
@@ -444,7 +444,7 @@ public:
             rpd.depthStencilAttachment.loadAction = DKRenderPassAttachmentDescriptor::LoadActionClear;
             rpd.depthStencilAttachment.storeAction = DKRenderPassAttachmentDescriptor::StoreActionDontCare;
 
-            targettex = ComputeTarget->ComputeTarget(computeQueue, width, height);
+            targettex = computeTarget->ComputeTarget(computeQueue, width, height);
 
             DKObject<DKCommandBuffer> computeCmdbuffer = computeQueue->CreateCommandBuffer();
             DKObject<DKComputeCommandEncoder> computeEncoder = computeCmdbuffer->CreateComputeCommandEncoder();
@@ -455,7 +455,7 @@ public:
                     computebindSet->SetTexture(0, texture);
                     computebindSet->SetTexture(1, targettex);
                 }
-                computeEncoder->SetComputePipelineState(Emboss);
+                computeEncoder->SetComputePipelineState(emboss);
                 computeEncoder->SetResources(0, computebindSet);
                 computeEncoder->Dispatch(width / 16, height / 16, 1);
                 computeEncoder->EndEncoding();
@@ -516,7 +516,7 @@ public:
         quad = DKOBJECT_NEW UVQuad();
 
 		runningRenderThread = 1;
-		renderThread = DKThread::Create(DKFunction(this, &MeshDemo::RenderThread)->Invocation());
+		renderThread = DKThread::Create(DKFunction(this, &ComputeShaderDemo::RenderThread)->Invocation());
 	}
 	void OnTerminate(void) override
 	{
@@ -541,7 +541,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 int main(int argc, const char * argv[])
 #endif
 {
-    MeshDemo app;
+    ComputeShaderDemo app;
 	DKPropertySet::SystemConfig().SetValue("AppDelegate", "AppDelegate");
 	DKPropertySet::SystemConfig().SetValue("GraphicsAPI", "Vulkan");
 	return app.Run();

Samples/ComputeShader/ComputeShader.xcodeproj/project.pbxproj

@@ -7,8 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		66DA89941DD3117F00338015 /* Mesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 844A9A801DD0C080007DCC89 /* Mesh.cpp */; };
-		66DA89971DD3118000338015 /* Mesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 844A9A801DD0C080007DCC89 /* Mesh.cpp */; };
+		66DA89941DD3117F00338015 /* ComputeShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 844A9A801DD0C080007DCC89 /* ComputeShader.cpp */; };
+		66DA89971DD3118000338015 /* ComputeShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 844A9A801DD0C080007DCC89 /* ComputeShader.cpp */; };
 		8406D1D821E715E400E0EA0F /* libDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8406D1BF21E701FF00E0EA0F /* libDK.a */; };
 		8406D1F921E71C5500E0EA0F /* libDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8406D1C121E701FF00E0EA0F /* libDK.a */; };
 		841948EB1DDCBE6000E039F0 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 841948E91DDCBE5000E039F0 /* AppDelegate.m */; };
@@ -18,8 +18,6 @@
 		844A9A851DD0C080007DCC89 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 844A9A781DD0C080007DCC89 /* Assets.xcassets */; };
 		844A9A8B1DD0C08F007DCC89 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 844A9A741DD0C080007DCC89 /* Assets.xcassets */; };
 		844A9A8D1DD0C08F007DCC89 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 844A9A761DD0C080007DCC89 /* LaunchScreen.storyboard */; };
-		84A81E9D226443700060BCBB /* tiny_obj_loader.cc in Sources */ = {isa = PBXBuildFile; fileRef = 84A81E9C226443700060BCBB /* tiny_obj_loader.cc */; };
-		84A81E9E226443700060BCBB /* tiny_obj_loader.cc in Sources */ = {isa = PBXBuildFile; fileRef = 84A81E9C226443700060BCBB /* tiny_obj_loader.cc */; };
 		84A81EAF22644A7D0060BCBB /* dkgl_new.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84B5FE4B20726C3600B52742 /* dkgl_new.cpp */; };
 		84A81EB222644A7E0060BCBB /* dkgl_new.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84B5FE4B20726C3600B52742 /* dkgl_new.cpp */; };
 /* End PBXBuildFile section */
@@ -76,8 +74,8 @@
 		841948EC1DDCBE7500E039F0 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		841948ED1DDCBE7500E039F0 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		8420EE1F1EE5BA6500A20933 /* Data */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Data; path = ../Data; sourceTree = "<group>"; };
-		844A9A441DD0BCFD007DCC89 /* Mesh_macOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Mesh_macOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		844A9A5C1DD0BEDD007DCC89 /* Mesh_iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Mesh_iOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		844A9A441DD0BCFD007DCC89 /* ComputeShader_macOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ComputeShader_macOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		844A9A5C1DD0BEDD007DCC89 /* ComputeShader_iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ComputeShader_iOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		844A9A741DD0C080007DCC89 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		844A9A751DD0C080007DCC89 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		844A9A761DD0C080007DCC89 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -88,8 +86,7 @@
 		844A9A7D1DD0C080007DCC89 /* targetver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = targetver.h; sourceTree = "<group>"; };
 		844A9A7E1DD0C080007DCC89 /* SampleApp.ico */ = {isa = PBXFileReference; lastKnownFileType = image.ico; path = SampleApp.ico; sourceTree = "<group>"; };
 		844A9A7F1DD0C080007DCC89 /* SampleApp.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SampleApp.rc; sourceTree = "<group>"; };
-		844A9A801DD0C080007DCC89 /* Mesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Mesh.cpp; sourceTree = "<group>"; };
-		84A81E9C226443700060BCBB /* tiny_obj_loader.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tiny_obj_loader.cc; path = ../Libs/tinyobjLoader/tiny_obj_loader.cc; sourceTree = "<group>"; };
+		844A9A801DD0C080007DCC89 /* ComputeShader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ComputeShader.cpp; sourceTree = "<group>"; };
 		84B5FE4B20726C3600B52742 /* dkgl_new.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dkgl_new.cpp; sourceTree = "<group>"; };
 		84B81E9021E6FF8400E0C5FF /* app.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = app.h; sourceTree = "<group>"; };
 		84B81E9121E6FF8400E0C5FF /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; };
@@ -148,8 +145,8 @@
 		844A9A451DD0BCFD007DCC89 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				844A9A441DD0BCFD007DCC89 /* Mesh_macOS.app */,
-				844A9A5C1DD0BEDD007DCC89 /* Mesh_iOS.app */,
+				844A9A441DD0BCFD007DCC89 /* ComputeShader_macOS.app */,
+				844A9A5C1DD0BEDD007DCC89 /* ComputeShader_iOS.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -157,8 +154,7 @@
 		844A9A461DD0BCFD007DCC89 /* Source Files */ = {
 			isa = PBXGroup;
 			children = (
-				84A81E9C226443700060BCBB /* tiny_obj_loader.cc */,
-				844A9A801DD0C080007DCC89 /* Mesh.cpp */,
+				844A9A801DD0C080007DCC89 /* ComputeShader.cpp */,
 			);
 			name = "Source Files";
 			sourceTree = "<group>";
@@ -215,9 +211,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		844A9A431DD0BCFD007DCC89 /* Mesh_macOS */ = {
+		844A9A431DD0BCFD007DCC89 /* ComputeShader_macOS */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 844A9A551DD0BCFD007DCC89 /* Build configuration list for PBXNativeTarget "Mesh_macOS" */;
+			buildConfigurationList = 844A9A551DD0BCFD007DCC89 /* Build configuration list for PBXNativeTarget "ComputeShader_macOS" */;
 			buildPhases = (
 				844A9A401DD0BCFD007DCC89 /* Sources */,
 				844A9A411DD0BCFD007DCC89 /* Frameworks */,
@@ -228,14 +224,14 @@
 			dependencies = (
 				8406D1DC21E715FD00E0EA0F /* PBXTargetDependency */,
 			);
-			name = Mesh_macOS;
+			name = ComputeShader_macOS;
 			productName = TestApp1;
-			productReference = 844A9A441DD0BCFD007DCC89 /* Mesh_macOS.app */;
+			productReference = 844A9A441DD0BCFD007DCC89 /* ComputeShader_macOS.app */;
 			productType = "com.apple.product-type.application";
 		};
-		844A9A5B1DD0BEDD007DCC89 /* Mesh_iOS */ = {
+		844A9A5B1DD0BEDD007DCC89 /* ComputeShader_iOS */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 844A9A701DD0BEDD007DCC89 /* Build configuration list for PBXNativeTarget "Mesh_iOS" */;
+			buildConfigurationList = 844A9A701DD0BEDD007DCC89 /* Build configuration list for PBXNativeTarget "ComputeShader_iOS" */;
 			buildPhases = (
 				844A9A581DD0BEDD007DCC89 /* Sources */,
 				844A9A591DD0BEDD007DCC89 /* Frameworks */,
@@ -246,9 +242,9 @@
 			dependencies = (
 				8406D1DA21E715F400E0EA0F /* PBXTargetDependency */,
 			);
-			name = Mesh_iOS;
+			name = ComputeShader_iOS;
 			productName = TestApp1_iOS;
-			productReference = 844A9A5C1DD0BEDD007DCC89 /* Mesh_iOS.app */;
+			productReference = 844A9A5C1DD0BEDD007DCC89 /* ComputeShader_iOS.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -271,7 +267,7 @@
 					};
 				};
 			};
-			buildConfigurationList = 844A9A3F1DD0BCFD007DCC89 /* Build configuration list for PBXProject "Mesh" */;
+			buildConfigurationList = 844A9A3F1DD0BCFD007DCC89 /* Build configuration list for PBXProject "ComputeShader" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
@@ -291,8 +287,8 @@
 			);
 			projectRoot = "";
 			targets = (
-				844A9A431DD0BCFD007DCC89 /* Mesh_macOS */,
-				844A9A5B1DD0BEDD007DCC89 /* Mesh_iOS */,
+				844A9A431DD0BCFD007DCC89 /* ComputeShader_macOS */,
+				844A9A5B1DD0BEDD007DCC89 /* ComputeShader_iOS */,
 			);
 		};
 /* End PBXProject section */
@@ -357,8 +353,7 @@
 			files = (
 				84A81EAF22644A7D0060BCBB /* dkgl_new.cpp in Sources */,
 				841948EF1DDCBE7B00E039F0 /* AppDelegate.m in Sources */,
-				84A81E9D226443700060BCBB /* tiny_obj_loader.cc in Sources */,
-				66DA89941DD3117F00338015 /* Mesh.cpp in Sources */,
+				66DA89941DD3117F00338015 /* ComputeShader.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -368,8 +363,7 @@
 			files = (
 				84A81EB222644A7E0060BCBB /* dkgl_new.cpp in Sources */,
 				841948EB1DDCBE6000E039F0 /* AppDelegate.m in Sources */,
-				84A81E9E226443700060BCBB /* tiny_obj_loader.cc in Sources */,
-				66DA89971DD3118000338015 /* Mesh.cpp in Sources */,
+				66DA89971DD3118000338015 /* ComputeShader.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -554,7 +548,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		844A9A3F1DD0BCFD007DCC89 /* Build configuration list for PBXProject "Mesh" */ = {
+		844A9A3F1DD0BCFD007DCC89 /* Build configuration list for PBXProject "ComputeShader" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				844A9A531DD0BCFD007DCC89 /* Debug */,
@@ -563,7 +557,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		844A9A551DD0BCFD007DCC89 /* Build configuration list for PBXNativeTarget "Mesh_macOS" */ = {
+		844A9A551DD0BCFD007DCC89 /* Build configuration list for PBXNativeTarget "ComputeShader_macOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				844A9A561DD0BCFD007DCC89 /* Debug */,
@@ -572,7 +566,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		844A9A701DD0BEDD007DCC89 /* Build configuration list for PBXNativeTarget "Mesh_iOS" */ = {
+		844A9A701DD0BEDD007DCC89 /* Build configuration list for PBXNativeTarget "ComputeShader_iOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				844A9A711DD0BEDD007DCC89 /* Debug */,