Józef Kucia : vkd3d-shader: Find innermost loops for breakc instructions.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 01ef2ceced0bd39f9d6795b7770ef6f257c29fb8
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=01ef2ceced0bd39f9d6795b7...

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Mon Sep 24 10:25:22 2018 +0200

vkd3d-shader: Find innermost loops for breakc instructions.

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 libs/vkd3d-shader/spirv.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 86f8ff6..f311147 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -5108,12 +5108,19 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_
         }
 
         case VKD3DSIH_BREAKP:
-            assert(compiler->control_flow_depth);
-            assert(cf_info->current_block == VKD3D_BLOCK_LOOP);
+        {
+            struct vkd3d_control_flow_info *loop_cf_info;
+
+            if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler)))
+            {
+                ERR("Invalid 'breakc' instruction outside loop.\n");
+                return;
+            }
 
             vkd3d_dxbc_compiler_emit_conditional_branch(compiler,
-                    instruction, cf_info->u.loop.merge_block_id);
+                    instruction, loop_cf_info->u.loop.merge_block_id);
             break;
+        }
 
         case VKD3DSIH_CONTINUE:
         {