Removed correct code by mistake, adding that back and back out the originally intende...

diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
index 52f8f1c..16b01fc 100644 (file)
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
@@ -605,6 +605,7 @@ tcu::TestCaseGroup* createOpCopyMemoryGroup (tcu::TestContext& testCtx)
                "OpName %id             \"gl_GlobalInvocationID\"\n"
 
                "OpDecorate %id BuiltIn GlobalInvocationId\n"
+               "OpDecorate %vec4arr ArrayStride 16\n"
 
                + string(s_InputOutputBufferTraits) + string(s_CommonTypes) +
 
@@ -664,6 +665,7 @@ tcu::TestCaseGroup* createOpCopyMemoryGroup (tcu::TestContext& testCtx)
                "OpName %id             \"gl_GlobalInvocationID\"\n"
 
                "OpDecorate %id BuiltIn GlobalInvocationId\n"
+               "OpDecorate %f32arr100 ArrayStride 4\n"
 
                + string(s_InputOutputBufferTraits) + string(s_CommonTypes) +
 
@@ -714,7 +716,6 @@ tcu::TestCaseGroup* createOpCopyMemoryGroup (tcu::TestContext& testCtx)
                "OpName %id             \"gl_GlobalInvocationID\"\n"
 
                "OpDecorate %id BuiltIn GlobalInvocationId\n"
-               "OpDecorate %vec4arr ArrayStride 16\n"
                "OpMemberDecorate %inbuf 0 Offset 0\n"
                "OpMemberDecorate %inbuf 1 Offset 16\n"
                "OpMemberDecorate %inbuf 2 Offset 32\n"
@@ -769,7 +770,6 @@ tcu::TestCaseGroup* createOpCopyMemoryGroup (tcu::TestContext& testCtx)
                "OpName %id             \"gl_GlobalInvocationID\"\n"
 
                "OpDecorate %id BuiltIn GlobalInvocationId\n"
-               "OpDecorate %f32arr100 ArrayStride 4\n"
 
                + string(s_InputOutputBufferTraits) + string(s_CommonTypes) + string(s_InputOutputBuffer) +