wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d-shader: Always emit default block for OpSwitch.

Browse Source 
The default block is required in SPIR-V.
This commit is contained in:
Józef Kucia 2017-10-05 15:58:51 +02:00
parent 9feb7a3956
commit 5479ac7011
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libs/vkd3d-shader/spirv.c
View File

@ -4132,6 +4132,22 @@ static struct vkd3d_control_flow_info *vkd3d_dxbc_compiler_find_innermost_breaka
return NULL; return NULL;
} }
static void vkd3d_dxbc_compiler_emit_switch_default_case(struct vkd3d_dxbc_compiler *compiler,
struct vkd3d_control_flow_info *cf_info)
{
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
assert(!cf_info->u.switch_.default_block_id);
cf_info->u.switch_.default_block_id = vkd3d_spirv_alloc_id(builder);
if (cf_info->u.switch_.inside_block) /* fall-through */
vkd3d_spirv_build_op_branch(builder, cf_info->u.switch_.default_block_id);
vkd3d_spirv_build_op_label(builder, cf_info->u.switch_.default_block_id);
vkd3d_spirv_build_op_name(builder, cf_info->u.switch_.default_block_id,
"switch%u_default", cf_info->u.switch_.id);
}
static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_compiler *compiler, static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_compiler *compiler,
const struct vkd3d_shader_instruction *instruction) const struct vkd3d_shader_instruction *instruction)
{ {
@ -4279,6 +4295,14 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_
case VKD3DSIH_ENDSWITCH: case VKD3DSIH_ENDSWITCH:
assert(compiler->control_flow_depth); assert(compiler->control_flow_depth);
assert(cf_info->current_block == VKD3D_BLOCK_SWITCH); assert(cf_info->current_block == VKD3D_BLOCK_SWITCH);
assert(!cf_info->u.switch_.inside_block);
/* The default block is required in SPIR-V. */
if (!cf_info->u.switch_.default_block_id)
{
vkd3d_dxbc_compiler_emit_switch_default_case(compiler, cf_info);
vkd3d_spirv_build_op_branch(builder, cf_info->u.switch_.merge_block_id);
}
vkd3d_spirv_build_op_label(builder, cf_info->u.switch_.merge_block_id); vkd3d_spirv_build_op_label(builder, cf_info->u.switch_.merge_block_id);
@ -4327,14 +4351,8 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_
assert(compiler->control_flow_depth); assert(compiler->control_flow_depth);
assert(cf_info->current_block == VKD3D_BLOCK_SWITCH); assert(cf_info->current_block == VKD3D_BLOCK_SWITCH);
cf_info->u.switch_.default_block_id = vkd3d_spirv_alloc_id(builder); vkd3d_dxbc_compiler_emit_switch_default_case(compiler, cf_info);
if (cf_info->u.switch_.inside_block) /* fall-through */
vkd3d_spirv_build_op_branch(builder, cf_info->u.switch_.default_block_id);
vkd3d_spirv_build_op_label(builder, cf_info->u.switch_.default_block_id);
cf_info->u.switch_.inside_block = true; cf_info->u.switch_.inside_block = true;
vkd3d_spirv_build_op_name(builder, cf_info->u.switch_.default_block_id,
"switch%u_default", cf_info->u.switch_.id);
break; break;
case VKD3DSIH_BREAK: case VKD3DSIH_BREAK: