[PATCH vkd3d 6/8] vkd3d-shader: Find innermost loops for breakc instructions.
Józef Kucia
joseph.kucia at gmail.com
Mon Sep 24 03:25:22 CDT 2018
From: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
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 86f8ff62c6ca..f3111477d43f 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:
{
--
2.16.4
More information about the wine-devel
mailing list