@@ -176,12 +176,12 @@ std::vector<unsigned int> LoadSPIRVFromGLSL(const char* FilePath, SHADER_TYPE Sh
176176}
177177
178178void TestSPIRVResourcesWithSPIRV (
179- const std::vector<unsigned int >& SPIRV,
180- const char * FilePath,
181- const std::vector<SPIRVShaderResourceRefAttribs>& RefResources,
182- SHADER_COMPILER Compiler,
183- SHADER_TYPE ShaderType = SHADER_TYPE_PIXEL,
184- SHADER_SOURCE_LANGUAGE SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL)
179+ const std::vector<unsigned int >& SPIRV,
180+ const char * FilePath,
181+ const std::vector<SPIRVShaderResourceRefAttribs>& RefResources,
182+ SHADER_COMPILER Compiler,
183+ SHADER_TYPE ShaderType = SHADER_TYPE_PIXEL,
184+ SHADER_SOURCE_LANGUAGE SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL)
185185{
186186 ShaderDesc ShaderDesc;
187187 ShaderDesc.Name = " SPIRVResources test" ;
@@ -284,16 +284,16 @@ TEST_F(SPIRVShaderResourcesTest, ConvertUBOToPushConstant)
284284 ASSERT_FALSE (ConvertedSPIRV.empty ()) << " Failed to convert UBO to push constant" ;
285285
286286 TestSPIRVResourcesWithSPIRV (
287- ConvertedSPIRV,
288- " UniformBuffers.psh" ,
289- {
290- // CB1 should now be a PushConstant (48 bytes = 12 floats)
291- SPIRVShaderResourceRefAttribs{" CB1" , 1 , SPIRVResourceType::PushConstant, RESOURCE_DIM_BUFFER, 0 , 48 , 0 },
292- // CB2 remains as UniformBuffer
293- SPIRVShaderResourceRefAttribs{" CB2" , 1 , SPIRVResourceType::UniformBuffer, RESOURCE_DIM_BUFFER, 0 , 16 , 0 },
294- },
295- SHADER_COMPILER_GLSLANG,
296- SHADER_TYPE_PIXEL);
287+ ConvertedSPIRV,
288+ " UniformBuffers.psh" ,
289+ {
290+ // CB1 should now be a PushConstant (48 bytes = 12 floats)
291+ SPIRVShaderResourceRefAttribs{" CB1" , 1 , SPIRVResourceType::PushConstant, RESOURCE_DIM_BUFFER, 0 , 48 , 0 },
292+ // CB2 remains as UniformBuffer
293+ SPIRVShaderResourceRefAttribs{" CB2" , 1 , SPIRVResourceType::UniformBuffer, RESOURCE_DIM_BUFFER, 0 , 16 , 0 },
294+ },
295+ SHADER_COMPILER_GLSLANG,
296+ SHADER_TYPE_PIXEL);
297297}
298298
299299TEST_F (SPIRVShaderResourcesTest, ConvertUBOToPushConstant_DXC)
@@ -312,16 +312,16 @@ TEST_F(SPIRVShaderResourcesTest, ConvertUBOToPushConstant_DXC)
312312 ASSERT_FALSE (ConvertedSPIRV.empty ()) << " Failed to convert UBO to push constant" ;
313313
314314 TestSPIRVResourcesWithSPIRV (
315- ConvertedSPIRV,
316- " UniformBuffers.psh" ,
317- {
318- // CB1 should now be a PushConstant (48 bytes = 12 floats)
319- SPIRVShaderResourceRefAttribs{" CB1" , 1 , SPIRVResourceType::PushConstant, RESOURCE_DIM_BUFFER, 0 , 48 , 0 },
320- // CB2 remains as UniformBuffer
321- SPIRVShaderResourceRefAttribs{" CB2" , 1 , SPIRVResourceType::UniformBuffer, RESOURCE_DIM_BUFFER, 0 , 16 , 0 },
322- },
323- SHADER_COMPILER_DXC,
324- SHADER_TYPE_PIXEL);
315+ ConvertedSPIRV,
316+ " UniformBuffers.psh" ,
317+ {
318+ // CB1 should now be a PushConstant (48 bytes = 12 floats)
319+ SPIRVShaderResourceRefAttribs{" CB1" , 1 , SPIRVResourceType::PushConstant, RESOURCE_DIM_BUFFER, 0 , 48 , 0 },
320+ // CB2 remains as UniformBuffer
321+ SPIRVShaderResourceRefAttribs{" CB2" , 1 , SPIRVResourceType::UniformBuffer, RESOURCE_DIM_BUFFER, 0 , 16 , 0 },
322+ },
323+ SHADER_COMPILER_DXC,
324+ SHADER_TYPE_PIXEL);
325325}
326326
327327void TestStorageBuffers (SHADER_COMPILER Compiler)
0 commit comments