From 675b1b064d93ccaed20cfb192be14a1c63ce1700 Mon Sep 17 00:00:00 2001 From: Piers Daniell Date: Fri, 6 Apr 2018 11:16:47 -0600 Subject: [PATCH] Fix resource buffers used for the Op?Convert graphics tests I didn't catch this when reviewing CL 2240. The "graphics" variants of the OpUConvert/OpSConvert/OpFConvert tests are writing the shader results to a UBO instead of an SSBO. UBOs are read-only and writing to one has undefined results. This CL simply changes the resources to use SSBOs rather than UBOs, which follows the same template of most of the other dEQP-VK.spirv_assembly.instruction.graphics.* tests. Affects: dEQP-VK.spirv_assembly.instruction.graphics.sconvert.* dEQP-VK.spirv_assembly.instruction.graphics.uconvert.* dEQP-VK.spirv_assembly.instruction.graphics.fconvert.* Change-Id: Iab4014e6ca5e1482f74ff6d8bec7f04793b0e69d Components: Vulkan --- .../modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp index bf83d99..fa647dd 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp @@ -8490,8 +8490,8 @@ tcu::TestCaseGroup* createConvertGraphicsTests (tcu::TestContext& testCtx, const tcu::RGBA defaultColors[4]; getDefaultColors (defaultColors); - resources.inputs.push_back (std::make_pair(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, test->m_inputBuffer)); - resources.outputs.push_back (std::make_pair(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, test->m_outputBuffer)); + resources.inputs.push_back (std::make_pair(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, test->m_inputBuffer)); + resources.outputs.push_back (std::make_pair(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, test->m_outputBuffer)); extensions.push_back ("VK_KHR_storage_buffer_storage_class"); if (test->m_features == COMPUTE_TEST_USES_INT16 || test->m_features == COMPUTE_TEST_USES_INT16_INT64 || usesInt16(test->m_fromType, test->m_toType)) -- 2.7.4