Hongtae Kim 6 lat temu
rodzic
commit
d5bd0b6f82
1 zmienionych plików z 20 dodań i 10 usunięć
  1. 20
    10
      TestApp1/TestApp1.cpp

+ 20
- 10
TestApp1/TestApp1.cpp Wyświetl plik

@@ -105,21 +105,21 @@ void PrintShaderResource(const DKShaderResource& res)
105 105
 			{
106 106
 				if (mem.count > 1)
107 107
 				{
108
-					DKLogI(" %ls+ %ls[%d] (%s, Offset: %d, Size: %d, Stride: %d)",
108
+					DKLogI(" %ls+ %ls[%d] (%s, Offset: %d, Stride: %d)",
109 109
 						   (const wchar_t*)indentStr,
110 110
 						   (const wchar_t*)mem.name,
111 111
 						   mem.count,
112 112
 						   ShaderDataTypeStr(mem.dataType),
113
-						   mem.offset, mem.size, mem.stride);
113
+						   mem.offset, mem.stride);
114 114
 
115 115
 				}
116 116
 				else
117 117
 				{
118
-					DKLogI(" %ls+ %ls (%s, Offset: %d, Size: %d)",
118
+					DKLogI(" %ls+ %ls (%s, Offset: %d)",
119 119
 						   (const wchar_t*)indentStr,
120 120
 						   (const wchar_t*)mem.name,
121 121
 						   ShaderDataTypeStr(mem.dataType),
122
-						   mem.offset, mem.size);
122
+						   mem.offset);
123 123
 				}
124 124
 
125 125
 				auto* p = res.structTypeMemberMap.Find(mem.typeInfoKey);
@@ -155,12 +155,22 @@ void PrintShaderResource(const DKShaderResource& res)
155 155
 		case DKShaderResource::AccessWriteOnly:	access = "WriteOnly"; break;
156 156
 		case DKShaderResource::AccessReadWrite:	access = "ReadWrite"; break;
157 157
 	}
158
-	DKLogI(" +Type:%s, Access:%s, Enabled:%d Alignment:%d, Size:%d",
159
-		   type,
160
-		   access,
161
-		   int(res.enabled),
162
-		   res.typeInfo.buffer.alignment,
163
-		   res.typeInfo.buffer.size);
158
+
159
+    if (res.type == DKShaderResource::TypeBuffer)
160
+    {
161
+        DKLogI(" +Type:%s, Access:%s, Enabled:%d, Size:%d",
162
+               type,
163
+               access,
164
+               int(res.enabled),
165
+               res.typeInfo.buffer.size);
166
+    }
167
+    else
168
+    {
169
+        DKLogI(" +Type:%s, Access:%s, Enabled:%d",
170
+               type,
171
+               access,
172
+               int(res.enabled));
173
+    }
164 174
 	if (res.typeInfoKey.Length() > 0)
165 175
 		DKLogI(" +TypeKey: %ls (struct)", (const wchar_t*)res.typeInfoKey);
166 176
 	if (res.type == DKShaderResource::TypeBuffer)