Fix mismatched types in shader_intrinsics tests
OpConstantComposite constituent type must match result type
The test is currenly wrongly using the type of m_format, but
m_residencyFormat is used in the descriptor
Components: Vulkan
VK-GL-CTS issue: 4456
Affected tests:
dEQP-VK.sparse_resources.shader_intrinsics.*
Change-Id: I6ff23d5638e363215449c5d0da8db9d9bb0186be
diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsStorage.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsStorage.cpp
index bf4e90e..3196c64 100644
--- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsStorage.cpp
+++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsStorage.cpp
@@ -197,9 +197,9 @@
<< "%constant_int_2 = OpConstant %type_int 2\n"
<< "%constant_bool_true = OpConstantTrue %type_bool\n"
- << "%constant_uint_resident = OpConstant " << (formatIsR64(m_format) ? "%type_uint64" : "%type_uint") << " " << MEMORY_BLOCK_BOUND_VALUE << "\n"
+ << "%constant_uint_resident = OpConstant %type_uint " << MEMORY_BLOCK_BOUND_VALUE << "\n"
<< "%constant_uvec4_resident = OpConstantComposite %type_uvec4 %constant_uint_resident %constant_uint_resident %constant_uint_resident %constant_uint_resident\n"
- << "%constant_uint_not_resident = OpConstant " << (formatIsR64(m_format) ? "%type_uint64" : "%type_uint") << " " << MEMORY_BLOCK_NOT_BOUND_VALUE << "\n"
+ << "%constant_uint_not_resident = OpConstant %type_uint " << MEMORY_BLOCK_NOT_BOUND_VALUE << "\n"
<< "%constant_uvec4_not_resident = OpConstantComposite %type_uvec4 %constant_uint_not_resident %constant_uint_not_resident %constant_uint_not_resident %constant_uint_not_resident\n"
// Call main function
