=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: vkd3d-shader: Translate continuec instructions.
Alexandre Julliard
julliard at winehq.org
Mon Sep 24 12:22:05 CDT 2018
Module: vkd3d
Branch: master
Commit: 9781b1553131ad9651f080861132dafae0560243
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9781b1553131ad9651f080861132dafae0560243
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Mon Sep 24 10:25:20 2018 +0200
vkd3d-shader: Translate continuec instructions.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/vkd3d-shader/spirv.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index b96b69e..86f8ff6 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -4761,7 +4761,7 @@ static void vkd3d_dxbc_compiler_emit_comparison_instruction(struct vkd3d_dxbc_co
vkd3d_dxbc_compiler_emit_store_reg(compiler, &dst->reg, dst->write_mask, result_id);
}
-static void vkd3d_dxbc_compiler_emit_breakc(struct vkd3d_dxbc_compiler *compiler,
+static void vkd3d_dxbc_compiler_emit_conditional_branch(struct vkd3d_dxbc_compiler *compiler,
const struct vkd3d_shader_instruction *instruction, uint32_t target_block_id)
{
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
@@ -5111,7 +5111,8 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_
assert(compiler->control_flow_depth);
assert(cf_info->current_block == VKD3D_BLOCK_LOOP);
- vkd3d_dxbc_compiler_emit_breakc(compiler, instruction, cf_info->u.loop.merge_block_id);
+ vkd3d_dxbc_compiler_emit_conditional_branch(compiler,
+ instruction, cf_info->u.loop.merge_block_id);
break;
case VKD3DSIH_CONTINUE:
@@ -5130,6 +5131,21 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_
break;
}
+ case VKD3DSIH_CONTINUEP:
+ {
+ struct vkd3d_control_flow_info *loop_cf_info;
+
+ if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler)))
+ {
+ ERR("Invalid 'continuec' instruction outside loop.\n");
+ return;
+ }
+
+ vkd3d_dxbc_compiler_emit_conditional_branch(compiler,
+ instruction, loop_cf_info->u.loop.continue_block_id);
+ break;
+ }
+
case VKD3DSIH_RET:
vkd3d_dxbc_compiler_emit_return(compiler, instruction);
@@ -6307,6 +6323,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler
case VKD3DSIH_BREAKP:
case VKD3DSIH_CASE:
case VKD3DSIH_CONTINUE:
+ case VKD3DSIH_CONTINUEP:
case VKD3DSIH_DEFAULT:
case VKD3DSIH_ELSE:
case VKD3DSIH_ENDIF:
More information about the wine-cvs
mailing list