PSO/Reflection 테스트용 VertexDescriptor (DKVertexDescriptor) 자동 생성.

TestApp1/TestApp1.cpp

@@ -88,6 +88,86 @@ const char* ShaderDataTypeStr(DKShaderDataType t)
 	return "Error";
 }
 
+DKVertexDescriptor VertexDescriptorForVertexAttributes(const DKArray<DKVertexAttribute>& attrs)
+{
+    uint32_t vertexSize = 0;
+    DKVertexDescriptor descriptor = {};
+
+    for (uint32_t i = 0; i < attrs.Count(); ++i)
+    {         
+        if (const DKVertexAttribute& attr = attrs.Value(i); attr.active)
+        {
+            DKVertexAttributeDescriptor desc = {};
+
+            switch (attr.type)
+            {
+               case DKShaderDataType::Float:
+               case DKShaderDataType::Half:
+               case DKShaderDataType::Int:
+               case DKShaderDataType::UInt:
+               case DKShaderDataType::Short:
+               case DKShaderDataType::UShort:
+               case DKShaderDataType::Char:
+               case DKShaderDataType::UChar:
+               case DKShaderDataType::Bool:
+                   desc.format = DKVertexFormat::Float;
+                   desc.offset = vertexSize;
+                   vertexSize += 4;
+                   break;
+               case DKShaderDataType::Float2:
+               case DKShaderDataType::Half2:
+               case DKShaderDataType::Int2:
+               case DKShaderDataType::UInt2:
+               case DKShaderDataType::Short2:
+               case DKShaderDataType::UShort2:
+               case DKShaderDataType::Char2:
+               case DKShaderDataType::UChar2:
+               case DKShaderDataType::Bool2:
+                   desc.format = DKVertexFormat::Float2;
+                   desc.offset = vertexSize;
+                   vertexSize += 8;
+                   break;
+               case DKShaderDataType::Float3:
+               case DKShaderDataType::Half3:
+               case DKShaderDataType::Int3:
+               case DKShaderDataType::UInt3:
+               case DKShaderDataType::Short3:
+               case DKShaderDataType::UShort3:
+               case DKShaderDataType::Char3:
+               case DKShaderDataType::UChar3:
+               case DKShaderDataType::Bool3:
+                   desc.format = DKVertexFormat::Float3;
+                   desc.offset = vertexSize;
+                   vertexSize += 12;
+                   break;
+               case DKShaderDataType::Float4:
+               case DKShaderDataType::Half4:
+               case DKShaderDataType::Int4:
+               case DKShaderDataType::UInt4:
+               case DKShaderDataType::Short4:
+               case DKShaderDataType::UShort4:
+               case DKShaderDataType::Char4:
+               case DKShaderDataType::UChar4:
+               case DKShaderDataType::Bool4:
+                   desc.format = DKVertexFormat::Float4;
+                   desc.offset = vertexSize;
+                   vertexSize += 16;
+                   break;
+               default:
+                   DKASSERT_DESC(0, "Unsupported type!");
+                   break;
+            }
+            desc.location = attr.location;
+
+            descriptor.attributes.Add(desc);
+        }
+    }
+
+    descriptor.layouts = { { DKVertexStepRate::Vertex, vertexSize}, };
+
+    return descriptor;
+};
+
 void PrintShaderResource(const DKShaderResource& res)
 {
 	struct MemberPrinter
@@ -206,22 +286,6 @@ public:
 		DKObject<DKData> vertData = resourcePool.LoadResourceData("shaders/texturearray/instancing.vert.spv");
 		DKObject<DKData> fragData = resourcePool.LoadResourceData("shaders/texturearray/instancing.frag.spv");
 
-		struct Vertex
-		{
-			DKVector3 position;
-			DKVector2 uv;
-			DKVector3 normal;
-		};
-		DKVertexDescriptor vertexDescriptor;
-		vertexDescriptor.attributes = {
-			{ DKVertexFormat::Float3, 0, 0, 0 },
-			{ DKVertexFormat::Float2, sizeof(DKVector2), 0, 1 },
-			{ DKVertexFormat::Float3, sizeof(DKVector3), 0, 2 },
-		};
-		vertexDescriptor.layouts = {
-			{ DKVertexStepRate::Vertex, sizeof(Vertex), 0 },
-		};
-
 		DKShader vertShader(vertData, DKShader::Vertex);
 		DKShader fragShader(fragData, DKShader::Fragment);
 
@@ -241,6 +305,10 @@ public:
 			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;

TestApp1/TestApp1.vcxproj

@@ -96,6 +96,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>DKGL_STATIC=1;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../DK</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -117,6 +118,7 @@ xcopy /Y /D /R /Q /E "$(SolutionDir)Data" "$(OutDir)Data\"
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>DKGL_STATIC=1;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../DK</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -140,6 +142,7 @@ xcopy /Y /D /R /Q /E "$(SolutionDir)Data" "$(OutDir)Data\"
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>DKGL_STATIC=1;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../DK</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -165,6 +168,7 @@ xcopy /Y /D /R /Q /E "$(SolutionDir)Data" "$(OutDir)Data\"
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>DKGL_STATIC=1;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>../DK</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>