Fix SPIR-V continue construct dominance

Fix structured control flow validation problems in
dEQP-VK.spirv_assembly.instruction.compute.loop_control.*

Fixes https://gitlab.khronos.org/vulkan/vulkancts/issues/441

diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
index 972b428b372b5dbf85c9d5f877e9a8152701831d..28d8dfdd8bc0daa79ae6e5ff79ab4d3156c12138 100644 (file)
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
@@ -3097,7 +3097,7 @@ tcu::TestCaseGroup* createLoopControlGroup (tcu::TestContext& testCtx)
                "%loop_entry  = OpLabel\n"
                "%i_val       = OpLoad %u32 %i\n"
                "%cmp_lt      = OpULessThan %bool %i_val %four\n"
-               "               OpLoopMerge %loop_merge %loop_entry ${CONTROL}\n"
+               "               OpLoopMerge %loop_merge %loop_body ${CONTROL}\n"
                "               OpBranchConditional %cmp_lt %loop_body %loop_merge\n"
                "%loop_body   = OpLabel\n"
                "%outval      = OpLoad %f32 %outloc\n"