Browse Source

no message

Hongtae Kim 6 years ago
parent
commit
ec19b6c943
3 changed files with 10 additions and 10 deletions
  1. 1
    1
      Data/triangle.vert
  2. BIN
      Data/triangle.vert.spv
  3. 9
    9
      TestApp1/TestApp1.cpp

+ 1
- 1
Data/triangle.vert View File

6
 layout (location = 0) in vec3 inPos;
6
 layout (location = 0) in vec3 inPos;
7
 layout (location = 1) in vec3 inColor;
7
 layout (location = 1) in vec3 inColor;
8
 
8
 
9
-layout (binding = 0) uniform UBO 
9
+layout (binding = 0) uniform UBOX 
10
 {
10
 {
11
 	mat4 projectionMatrix;
11
 	mat4 projectionMatrix;
12
 	mat4 modelMatrix;
12
 	mat4 modelMatrix;

BIN
Data/triangle.vert.spv View File


+ 9
- 9
TestApp1/TestApp1.cpp View File

86
 		DKObject<DKRenderPipelineState> pipelineState = device->CreateRenderPipeline(pipelineDescriptor, &reflection);
86
 		DKObject<DKRenderPipelineState> pipelineState = device->CreateRenderPipeline(pipelineDescriptor, &reflection);
87
 		if (pipelineState)
87
 		if (pipelineState)
88
 		{
88
 		{
89
-			auto printShaderArg = [](const DKShaderArgument& arg)
89
+			auto printShaderArg = [](const DKShaderResource& arg)
90
 			{
90
 			{
91
 				const char* argType = "Unknown";
91
 				const char* argType = "Unknown";
92
 				switch (arg.type)
92
 				switch (arg.type)
93
 				{
93
 				{
94
-				case DKShaderArgument::TypeBuffer:	argType = "Buffer"; break;
95
-				case DKShaderArgument::TypeTexture:	argType = "Texture"; break;
96
-				case DKShaderArgument::TypeSampler:	argType = "Sampler"; break;
97
-				case DKShaderArgument::TypeThreadgroupMemory:	argType = "ThreadMemory"; break;
94
+				case DKShaderResource::TypeBuffer:	argType = "Buffer"; break;
95
+				case DKShaderResource::TypeTexture:	argType = "Texture"; break;
96
+				case DKShaderResource::TypeSampler:	argType = "Sampler"; break;
97
+				case DKShaderResource::TypeThreadgroupMemory:	argType = "ThreadMemory"; break;
98
 				}
98
 				}
99
 				DKLog("  --> \"%ls\"[%u] binding:%u:%u type:%s", (const wchar_t*)arg.name, uint32_t(arg.count), arg.set, arg.binding, argType);
99
 				DKLog("  --> \"%ls\"[%u] binding:%u:%u type:%s", (const wchar_t*)arg.name, uint32_t(arg.count), arg.set, arg.binding, argType);
100
 			};
100
 			};
101
-			DKLog("PipelineReflection.VertexArguments: %d", reflection.vertexArguments.Count());
102
-			for (auto& arg : reflection.vertexArguments)
101
+			DKLog("PipelineReflection.VertexResources: %d", reflection.vertexResources.Count());
102
+			for (auto& arg : reflection.vertexResources)
103
 				printShaderArg(arg);
103
 				printShaderArg(arg);
104
-			DKLog("PipelineReflection.FragmentArguments: %d", reflection.fragmentArguments.Count());
105
-			for (auto& arg : reflection.fragmentArguments)
104
+			DKLog("PipelineReflection.FragmentResources: %d", reflection.fragmentResources.Count());
105
+			for (auto& arg : reflection.fragmentResources)
106
 				printShaderArg(arg);
106
 				printShaderArg(arg);
107
 		}
107
 		}
108
 
108