From 9213e056f198145344be6fffd476854eeeb40975 Mon Sep 17 00:00:00 2001 From: Alexander Galazin Date: Mon, 3 Dec 2018 19:40:25 +0100 Subject: [PATCH] Fix incorrect decoration on PushConstant The spec reuires PC to be decorated as Block not BufferBlock Components: Vulkan Affects: dEQP-VK.spirv_assembly.instruction.graphics.16bit_storage.* VK-GL-CTS issue: 1494 Change-Id: Ic82ad34970117a06101173bdc2f62dea6859e723 --- .../vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp index 08c130d..1793d99 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp @@ -2004,7 +2004,7 @@ void addCompute16bitStoragePushConstant16To32Group (tcu::TestCaseGroup* group) "${stride}" - "OpDecorate %PC16 BufferBlock\n" + "OpDecorate %PC16 Block\n" "OpMemberDecorate %PC16 0 Offset 0\n" "OpMemberDecorate %SSBO32 0 Offset 0\n" "OpDecorate %SSBO32 BufferBlock\n" @@ -4744,7 +4744,7 @@ void addGraphics16BitStoragePushConstantFloat16To32Group (tcu::TestCaseGroup* te "OpDecorate %a64f32 ArrayStride 4\n" "OpDecorate %SSBO32 BufferBlock\n" "OpMemberDecorate %SSBO32 0 Offset 0\n" - "OpDecorate %PC16 BufferBlock\n" + "OpDecorate %PC16 Block\n" "OpMemberDecorate %PC16 0 Offset 0\n" "OpDecorate %ssbo32 DescriptorSet 0\n" "OpDecorate %ssbo32 Binding 0\n"; @@ -4813,7 +4813,7 @@ void addGraphics16BitStoragePushConstantFloat16To32Group (tcu::TestCaseGroup* te "OpDecorate %a16v4f32 ArrayStride 16\n" "OpDecorate %SSBO32 BufferBlock\n" "OpMemberDecorate %SSBO32 0 Offset 0\n" - "OpDecorate %PC16 BufferBlock\n" + "OpDecorate %PC16 Block\n" "OpMemberDecorate %PC16 0 Offset 0\n" "OpDecorate %ssbo32 DescriptorSet 0\n" "OpDecorate %ssbo32 Binding 0\n"; @@ -4886,7 +4886,7 @@ void addGraphics16BitStoragePushConstantFloat16To32Group (tcu::TestCaseGroup* te "OpMemberDecorate %SSBO32 0 Offset 0\n" "OpMemberDecorate %SSBO32 0 ColMajor\n" "OpMemberDecorate %SSBO32 0 MatrixStride 16\n" - "OpDecorate %PC16 BufferBlock\n" + "OpDecorate %PC16 Block\n" "OpMemberDecorate %PC16 0 Offset 0\n" "OpMemberDecorate %PC16 0 ColMajor\n" "OpMemberDecorate %PC16 0 MatrixStride 8\n" @@ -5053,7 +5053,7 @@ void addGraphics16BitStoragePushConstantInt16To32Group (tcu::TestCaseGroup* test "OpDecorate %a${count}${type32} ArrayStride 4\n" "OpDecorate %SSBO32 BufferBlock\n" "OpMemberDecorate %SSBO32 0 Offset 0\n" - "OpDecorate %PC16 BufferBlock\n" + "OpDecorate %PC16 Block\n" "OpMemberDecorate %PC16 0 Offset 0\n" "OpDecorate %ssbo32 DescriptorSet 0\n" "OpDecorate %ssbo32 Binding 0\n"); @@ -5168,7 +5168,7 @@ void addGraphics16BitStoragePushConstantInt16To32Group (tcu::TestCaseGroup* test "OpDecorate %a${count}${type32} ArrayStride 8\n" "OpDecorate %SSBO32 BufferBlock\n" "OpMemberDecorate %SSBO32 0 Offset 0\n" - "OpDecorate %PC16 BufferBlock\n" + "OpDecorate %PC16 Block\n" "OpMemberDecorate %PC16 0 Offset 0\n" "OpDecorate %ssbo32 DescriptorSet 0\n" "OpDecorate %ssbo32 Binding 0\n"); -- 2.7.4