Fix SPIR-V continue construct dominance
authorDavid Neto <dneto@google.com>
Fri, 29 Jul 2016 16:11:33 +0000 (12:11 -0400)
committerPyry Haulos <phaulos@google.com>
Tue, 2 Aug 2016 15:31:52 +0000 (08:31 -0700)
Fix structured control flow validation problems in
dEQP-VK.spirv_assembly.instruction.compute.loop_control.*

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

external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp

index 972b428..28d8dfd 100644 (file)
@@ -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"