RenderPipeline / ComputePipeline 분리

TestApp1/TestApp1.cpp

@@ -261,11 +261,113 @@ void PrintShaderResource(const DKShaderResource& res)
 	}
 }
 
+
 class TestApp1 : public DKApplication
 {
 	DKResourcePool resourcePool;
 	DKString userConfigPath;
 
+    DKObject<DKGraphicsDevice> device;
+
+    void TestRenderPipelineReflection(const DKString& path)
+    {
+        DKObject<DKData> vertData = resourcePool.LoadResourceData(path + ".vert.spv");
+        DKObject<DKData> fragData = resourcePool.LoadResourceData(path + ".frag.spv");
+
+        DKASSERT(vertData);
+        DKASSERT(fragData);
+
+        DKShader vertShader(vertData, DKShader::Vertex);
+        DKShader fragShader(fragData, DKShader::Fragment);
+
+        DKObject<DKShaderModule> vertShaderModule = device->CreateShaderModule(&vertShader);
+        DKObject<DKShaderModule> fragShaderModule = device->CreateShaderModule(&fragShader);
+
+        DKObject<DKShaderFunction> vertShaderFunction = vertShaderModule->CreateFunction(vertShaderModule->FunctionNames().Value(0));
+        DKObject<DKShaderFunction> fragShaderFunction = fragShaderModule->CreateFunction(fragShaderModule->FunctionNames().Value(0));
+
+        DKLog("VertexFunction.VertexAttributes: %d", vertShaderFunction->VertexAttributes().Count());
+        for (int i = 0; i < vertShaderFunction->VertexAttributes().Count(); ++i)
+        {
+            const DKVertexAttribute& attr = vertShaderFunction->VertexAttributes().Value(i);
+            DKLog("  --> VertexAttribute[%d]: \"%ls\" (location:%u)", i, (const wchar_t*)attr.name, attr.location);
+        }
+
+        // setup dummy vertex-descriptor
+        DKVertexDescriptor vertexDescriptor = VertexDescriptorForVertexAttributes(vertShaderFunction->VertexAttributes());
+
+        // setup rendering pipeline state object (PSO)
+        DKRenderPipelineDescriptor pipelineDescriptor;
+        pipelineDescriptor.vertexFunction = vertShaderFunction;
+        pipelineDescriptor.fragmentFunction = fragShaderFunction;
+        pipelineDescriptor.colorAttachments.Resize(1);
+        pipelineDescriptor.colorAttachments.Value(0).pixelFormat = DKPixelFormat::RGBA8Unorm;
+        pipelineDescriptor.depthStencilAttachmentPixelFormat = DKPixelFormat::Invalid; // no depth buffer
+        pipelineDescriptor.vertexDescriptor = vertexDescriptor;
+        pipelineDescriptor.primitiveTopology = DKPrimitiveType::Triangle;
+        pipelineDescriptor.frontFace = DKFrontFace::CCW;
+        pipelineDescriptor.triangleFillMode = DKTriangleFillMode::Fill;
+        pipelineDescriptor.depthClipMode = DKDepthClipMode::Clip;
+        pipelineDescriptor.cullMode = DKCullMode::None;
+        pipelineDescriptor.rasterizationEnabled = true;
+
+        DKRenderPipelineReflection reflection;
+        DKObject<DKRenderPipelineState> pipelineState = device->CreateRenderPipeline(pipelineDescriptor, &reflection);
+        if (pipelineState)
+        {
+            DKLog("=========================================================");
+            DKLog("PipelineReflection.VertexResources: %d", reflection.vertexResources.Count());
+            for (auto& arg : reflection.vertexResources)
+                PrintShaderResource(arg);
+            DKLog("---------------------------------------------------------");
+            DKLog("PipelineReflection.FragmentResources: %d", reflection.fragmentResources.Count());
+            for (auto& arg : reflection.fragmentResources)
+                PrintShaderResource(arg);
+            DKLog("=========================================================");
+        }
+        else
+        {
+            DKLogE("CreateRenderPipeline failed.");
+        }
+    }
+
+    void TestComputePipelineReflection(const DKString& path)
+    {
+        DKObject<DKData> shaderData = resourcePool.LoadResourceData(path + ".comp.spv");
+
+        DKASSERT(shaderData);
+
+        DKShader shader(shaderData, DKShader::Compute);
+
+        DKObject<DKShaderModule> shaderModule = device->CreateShaderModule(&shader);
+        DKObject<DKShaderFunction> shaderFunction = shaderModule->CreateFunction(shaderModule->FunctionNames().Value(0));
+
+        DKLog("ComputeFunction.StageInputAttributes: %d", shaderFunction->StageInputAttributes().Count());
+        for (int i = 0; i < shaderFunction->StageInputAttributes().Count(); ++i)
+        {
+            const DKShaderAttribute& attr = shaderFunction->StageInputAttributes().Value(i);
+            DKLog("  --> ShaderAttribute[%d]: \"%ls\" (location:%u)", i, (const wchar_t*)attr.name, attr.location);
+        }
+
+        // setup pipeline state object (PSO)
+        DKComputePipelineDescriptor pipelineDescriptor;
+
+        DKComputePipelineReflection reflection;
+        DKObject<DKComputePipelineState> pipelineState = device->CreateComputePipeline(pipelineDescriptor, &reflection);
+        if (pipelineState)
+        {
+            DKLog("=========================================================");
+            DKLog("PipelineReflection.Resources: %d", reflection.resources.Count());
+            for (auto& arg : reflection.resources)
+                PrintShaderResource(arg);
+            DKLog("=========================================================");
+        }
+        else
+        {
+            DKLogE("CreateComputePipeline failed.");
+        }
+    }
+
 public:
 	void OnInitialize(void) override
 	{
@@ -283,60 +385,10 @@ public:
 		if (numItemsImported >= 0)
 			DKLogI("UserSettings: %ls (%d items imported)", (const wchar_t*)userConfigPath, numItemsImported);
 
-		DKObject<DKData> vertData = resourcePool.LoadResourceData("shaders/texturearray/instancing.vert.spv");
-		DKObject<DKData> fragData = resourcePool.LoadResourceData("shaders/texturearray/instancing.frag.spv");
-
-		DKShader vertShader(vertData, DKShader::Vertex);
-		DKShader fragShader(fragData, DKShader::Fragment);
-
-		DKObject<DKGraphicsDevice> device = DKGraphicsDevice::SharedInstance();
-		DKObject<DKShaderModule> vertShaderModule = device->CreateShaderModule(&vertShader);
-		DKObject<DKShaderModule> fragShaderModule = device->CreateShaderModule(&fragShader);
-
-		DKObject<DKShaderFunction> vertShaderFunction = vertShaderModule->CreateFunction(vertShaderModule->FunctionNames().Value(0));
-		DKObject<DKShaderFunction> fragShaderFunction = fragShaderModule->CreateFunction(fragShaderModule->FunctionNames().Value(0));
+        device = DKGraphicsDevice::SharedInstance();
 
-		DKObject<DKCommandQueue> queue = device->CreateCommandQueue(DKCommandQueue::Graphics);
-
-		DKLog("VertexFunction.VertexAttributes: %d", vertShaderFunction->VertexAttributes().Count());
-		for (int i = 0; i < vertShaderFunction->VertexAttributes().Count(); ++i)
-		{
-			const DKVertexAttribute& attr = vertShaderFunction->VertexAttributes().Value(i);
-			DKLog("  --> VertexAttribute[%d]: \"%ls\" (location:%u)", i, (const wchar_t*)attr.name, attr.location);
-		}
-
-        // setup dummy vertex-descriptor
-        DKVertexDescriptor vertexDescriptor = VertexDescriptorForVertexAttributes(vertShaderFunction->VertexAttributes());
-
-        // setup rendering pipeline state object (PSO)
-		DKRenderPipelineDescriptor pipelineDescriptor;
-		pipelineDescriptor.vertexFunction = vertShaderFunction;
-		pipelineDescriptor.fragmentFunction = fragShaderFunction;
-		pipelineDescriptor.colorAttachments.Resize(1);
-		pipelineDescriptor.colorAttachments.Value(0).pixelFormat = DKPixelFormat::RGBA8Unorm;
-		pipelineDescriptor.depthStencilAttachmentPixelFormat = DKPixelFormat::Invalid; // no depth buffer
-		pipelineDescriptor.vertexDescriptor = vertexDescriptor;
-		pipelineDescriptor.primitiveTopology = DKPrimitiveType::Triangle;
-		pipelineDescriptor.frontFace = DKFrontFace::CCW;
-		pipelineDescriptor.triangleFillMode = DKTriangleFillMode::Fill;
-		pipelineDescriptor.depthClipMode = DKDepthClipMode::Clip;
-		pipelineDescriptor.cullMode = DKCullMode::None;
-		pipelineDescriptor.rasterizationEnabled = true;
-
-		DKRenderPipelineReflection reflection;
-		DKObject<DKRenderPipelineState> pipelineState = device->CreateRenderPipeline(pipelineDescriptor, &reflection);
-		if (pipelineState)
-		{
-            DKLog("=========================================================");
-			DKLog("PipelineReflection.VertexResources: %d", reflection.vertexResources.Count());
-			for (auto& arg : reflection.vertexResources)
-				PrintShaderResource(arg);
-            DKLog("---------------------------------------------------------");
-			DKLog("PipelineReflection.FragmentResources: %d", reflection.fragmentResources.Count());
-			for (auto& arg : reflection.fragmentResources)
-				PrintShaderResource(arg);
-            DKLog("=========================================================");
-		}
+        TestRenderPipelineReflection("shaders/deferredshadows/deferred");
+        TestComputePipelineReflection("shaders/computeshader/emboss");
 
 		Terminate(0);
 	}
@@ -344,6 +396,8 @@ public:
 	{
 		DKLogD("%s", DKGL_FUNCTION_NAME);
 
+        device = NULL;
+
 		int numItemsExported = DKPropertySet::DefaultSet().Export(userConfigPath, true);
 		DKLogI("Setting saved: %ls (%d items exported)", (const wchar_t*)userConfigPath, numItemsExported);