wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d-shader: Track current block for control flow instructions.

Browse Source
This commit is contained in:
Józef Kucia
2017-06-28 12:28:09 +02:00
parent 170168c9cb
commit 7e71b86031
1 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -967,6 +967,14 @@ struct vkd3d_control_flow_info
{ {
uint32_t merge_block_id; uint32_t merge_block_id;
uint32_t else_block_id; uint32_t else_block_id;
enum
{
VKD3D_BLOCK_MAIN,
VKD3D_BLOCK_IF,
VKD3D_BLOCK_ELSE,
VKD3D_BLOCK_NONE,
} current_block;
}; };
struct vkd3d_dxbc_compiler struct vkd3d_dxbc_compiler
@@ -2037,7 +2045,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_
switch (instruction->handler_idx) switch (instruction->handler_idx)
{ {
case VKD3DSIH_IF: case VKD3DSIH_IF:
if (cf_info->merge_block_id) if (cf_info->current_block != VKD3D_BLOCK_MAIN)
{ {
FIXME("Nested control flow not supported yet.\n"); FIXME("Nested control flow not supported yet.\n");
return; return;
@@ -2061,6 +2069,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_
cf_info->merge_block_id = merge_block_id; cf_info->merge_block_id = merge_block_id;
cf_info->else_block_id = false_label; cf_info->else_block_id = false_label;
cf_info->current_block = VKD3D_BLOCK_IF;
vkd3d_spirv_build_op_name(builder, merge_block_id, "branch%u_merge", compiler->branch_id); vkd3d_spirv_build_op_name(builder, merge_block_id, "branch%u_merge", compiler->branch_id);
vkd3d_spirv_build_op_name(builder, true_label, "branch%u_true", compiler->branch_id); vkd3d_spirv_build_op_name(builder, true_label, "branch%u_true", compiler->branch_id);
@@ -2069,23 +2078,48 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_
break; break;
case VKD3DSIH_ELSE: case VKD3DSIH_ELSE:
assert(cf_info->merge_block_id); if (cf_info->current_block == VKD3D_BLOCK_IF)
vkd3d_spirv_build_op_branch(builder, cf_info->merge_block_id);
vkd3d_spirv_build_op_branch(builder, cf_info->merge_block_id);
vkd3d_spirv_build_op_label(builder, cf_info->else_block_id); vkd3d_spirv_build_op_label(builder, cf_info->else_block_id);
cf_info->current_block = VKD3D_BLOCK_ELSE;
break; break;
case VKD3DSIH_ENDIF: case VKD3DSIH_ENDIF:
assert(cf_info->merge_block_id); assert(cf_info->current_block != VKD3D_BLOCK_MAIN);
vkd3d_spirv_build_op_branch(builder, cf_info->merge_block_id); if (cf_info->current_block == VKD3D_BLOCK_IF)
{
vkd3d_spirv_build_op_branch(builder, cf_info->merge_block_id);
vkd3d_spirv_build_op_label(builder, cf_info->else_block_id);
vkd3d_spirv_build_op_branch(builder, cf_info->merge_block_id);
}
else if (cf_info->current_block == VKD3D_BLOCK_ELSE)
{
vkd3d_spirv_build_op_branch(builder, cf_info->merge_block_id);
}
vkd3d_spirv_build_op_label(builder, cf_info->merge_block_id); vkd3d_spirv_build_op_label(builder, cf_info->merge_block_id);
memset(cf_info, 0, sizeof(*cf_info)); memset(cf_info, 0, sizeof(*cf_info));
break; break;
case VKD3DSIH_RET:
vkd3d_dxbc_compiler_emit_return(compiler, instruction);
if (cf_info->current_block == VKD3D_BLOCK_IF)
{
vkd3d_spirv_build_op_label(builder, cf_info->else_block_id);
cf_info->current_block = VKD3D_BLOCK_ELSE;
}
else
{
cf_info->current_block = VKD3D_BLOCK_NONE;
}
break;
default: default:
ERR("Unexpected instruction %#x.\n", instruction->handler_idx); ERR("Unexpected instruction %#x.\n", instruction->handler_idx);
break; break;
@@ -2160,10 +2194,8 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler
case VKD3DSIH_IF: case VKD3DSIH_IF:
case VKD3DSIH_ELSE: case VKD3DSIH_ELSE:
case VKD3DSIH_ENDIF: case VKD3DSIH_ENDIF:
vkd3d_dxbc_compiler_emit_control_flow_instruction(compiler, instruction);
break;
case VKD3DSIH_RET: case VKD3DSIH_RET:
vkd3d_dxbc_compiler_emit_return(compiler, instruction); vkd3d_dxbc_compiler_emit_control_flow_instruction(compiler, instruction);
break; break;
default: default:
FIXME("Unhandled instruction %#x.\n", instruction->handler_idx); FIXME("Unhandled instruction %#x.\n", instruction->handler_idx);