Browse Source

no message

Hongtae Kim 6 years ago
parent
commit
d5bd0b6f82
1 changed files with 20 additions and 10 deletions
  1. 20
    10
      TestApp1/TestApp1.cpp

+ 20
- 10
TestApp1/TestApp1.cpp View File

105
 			{
105
 			{
106
 				if (mem.count > 1)
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
 						   (const wchar_t*)indentStr,
109
 						   (const wchar_t*)indentStr,
110
 						   (const wchar_t*)mem.name,
110
 						   (const wchar_t*)mem.name,
111
 						   mem.count,
111
 						   mem.count,
112
 						   ShaderDataTypeStr(mem.dataType),
112
 						   ShaderDataTypeStr(mem.dataType),
113
-						   mem.offset, mem.size, mem.stride);
113
+						   mem.offset, mem.stride);
114
 
114
 
115
 				}
115
 				}
116
 				else
116
 				else
117
 				{
117
 				{
118
-					DKLogI(" %ls+ %ls (%s, Offset: %d, Size: %d)",
118
+					DKLogI(" %ls+ %ls (%s, Offset: %d)",
119
 						   (const wchar_t*)indentStr,
119
 						   (const wchar_t*)indentStr,
120
 						   (const wchar_t*)mem.name,
120
 						   (const wchar_t*)mem.name,
121
 						   ShaderDataTypeStr(mem.dataType),
121
 						   ShaderDataTypeStr(mem.dataType),
122
-						   mem.offset, mem.size);
122
+						   mem.offset);
123
 				}
123
 				}
124
 
124
 
125
 				auto* p = res.structTypeMemberMap.Find(mem.typeInfoKey);
125
 				auto* p = res.structTypeMemberMap.Find(mem.typeInfoKey);
155
 		case DKShaderResource::AccessWriteOnly:	access = "WriteOnly"; break;
155
 		case DKShaderResource::AccessWriteOnly:	access = "WriteOnly"; break;
156
 		case DKShaderResource::AccessReadWrite:	access = "ReadWrite"; break;
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
 	if (res.typeInfoKey.Length() > 0)
174
 	if (res.typeInfoKey.Length() > 0)
165
 		DKLogI(" +TypeKey: %ls (struct)", (const wchar_t*)res.typeInfoKey);
175
 		DKLogI(" +TypeKey: %ls (struct)", (const wchar_t*)res.typeInfoKey);
166
 	if (res.type == DKShaderResource::TypeBuffer)
176
 	if (res.type == DKShaderResource::TypeBuffer)