wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/dxil: Replace the result type enum with a bool.

Browse Source 
Changes to failure handling make the enum unnecessary.
This commit is contained in:
Conor McCarthy 2023-08-30 11:45:59 +10:00 committed by Alexandre Julliard
parent 58d6e44501
commit 720a087c28
Notes: Alexandre Julliard 2023-08-30 23:19:25 +02: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/283
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/vkd3d-shader/dxil.c
View File

@ -1855,15 +1855,10 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const
{ {
struct vkd3d_shader_instruction *ins; struct vkd3d_shader_instruction *ins;
const struct dxil_record *record; const struct dxil_record *record;
bool ret_found, is_terminator;
struct sm6_block *code_block; struct sm6_block *code_block;
struct sm6_value *dst; struct sm6_value *dst;
size_t i, block_idx; size_t i, block_idx;
bool ret_found;
enum
{
RESULT_VALUE,
RESULT_TERMINATE,
} result_type;
if (sm6->function_count) if (sm6->function_count)
{ {
@ -1934,14 +1929,14 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const
dst = sm6_parser_get_current_value(sm6); dst = sm6_parser_get_current_value(sm6);
dst->type = NULL; dst->type = NULL;
dst->value_type = VALUE_TYPE_REG; dst->value_type = VALUE_TYPE_REG;
result_type = RESULT_VALUE; is_terminator = false;
record = block->records[i]; record = block->records[i];
switch (record->code) switch (record->code)
{ {
case FUNC_CODE_INST_RET: case FUNC_CODE_INST_RET:
sm6_parser_emit_ret(sm6, record, code_block, ins); sm6_parser_emit_ret(sm6, record, code_block, ins);
result_type = RESULT_TERMINATE; is_terminator = true;
ret_found = true; ret_found = true;
break; break;
default: default:
@ -1949,7 +1944,7 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const
return VKD3D_ERROR_INVALID_SHADER; return VKD3D_ERROR_INVALID_SHADER;
} }
if (result_type == RESULT_TERMINATE) if (is_terminator)
{ {
++block_idx; ++block_idx;
code_block = (block_idx < function->block_count) ? function->blocks[block_idx] : NULL; code_block = (block_idx < function->block_count) ? function->blocks[block_idx] : NULL;