[PATCH vkd3d 3/3] vkd3d-shader/spirv: Ignore break instructions outside active blocks.

Henri Verbeet hverbeet at codeweavers.com
Mon Nov 8 07:50:19 CST 2021


From: Philip Rebohle <philip.rebohle at tu-dortmund.de>

Signed-off-by: Conor McCarthy <cmccarthy at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
v2: Minor adjustments to the commit message and comment.

 libs/vkd3d-shader/spirv.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index e5b9ef03..698c3054 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -7802,8 +7802,10 @@ static int vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_c
             }
             else if (breakable_cf_info->current_block == VKD3D_BLOCK_SWITCH)
             {
-                assert(breakable_cf_info->inside_block);
-                vkd3d_spirv_build_op_branch(builder, breakable_cf_info->u.switch_.merge_block_id);
+                /* The current case block may have already been ended by an
+                 * unconditional continue instruction. */
+                if (breakable_cf_info->inside_block)
+                    vkd3d_spirv_build_op_branch(builder, breakable_cf_info->u.switch_.merge_block_id);
             }
 
             cf_info->inside_block = false;
-- 
2.20.1




More information about the wine-devel mailing list