vkd3d-shader/spirv: Handle RETP in spirv_compiler_handle_instruction().

This commit is contained in:
Conor McCarthy 2023-12-12 16:10:12 +10:00 committed by Alexandre Julliard
parent bc1b5e7132
commit f3d464de0e
Notes: Alexandre Julliard 2024-01-17 22:42:55 +01:00
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/450

View File

@ -7972,10 +7972,6 @@ static int spirv_compiler_emit_control_flow_instruction(struct spirv_compiler *c
compiler->main_block_open = false; compiler->main_block_open = false;
break; break;
case VKD3DSIH_RETP:
spirv_compiler_emit_retc(compiler, instruction);
break;
default: default:
ERR("Unexpected instruction %#x.\n", instruction->handler_idx); ERR("Unexpected instruction %#x.\n", instruction->handler_idx);
break; break;
@ -9741,10 +9737,12 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler,
case VKD3DSIH_IF: case VKD3DSIH_IF:
case VKD3DSIH_LOOP: case VKD3DSIH_LOOP:
case VKD3DSIH_RET: case VKD3DSIH_RET:
case VKD3DSIH_RETP:
case VKD3DSIH_SWITCH: case VKD3DSIH_SWITCH:
ret = spirv_compiler_emit_control_flow_instruction(compiler, instruction); ret = spirv_compiler_emit_control_flow_instruction(compiler, instruction);
break; break;
case VKD3DSIH_RETP:
spirv_compiler_emit_retc(compiler, instruction);
break;
case VKD3DSIH_DISCARD: case VKD3DSIH_DISCARD:
case VKD3DSIH_TEXKILL: case VKD3DSIH_TEXKILL:
spirv_compiler_emit_kill(compiler, instruction); spirv_compiler_emit_kill(compiler, instruction);