wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/ir: Get rid of shader_instruction_is_dcl().

Browse Source
This commit is contained in:
Henri Verbeet
2024-01-22 20:32:55 +01:00
committed by Alexandre Julliard
parent d304422a34
commit 365ad56888
Notes: Alexandre Julliard 2024-01-24 22:55:50 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/596
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libs/vkd3d-shader/ir.c
View File

@@ -39,10 +39,11 @@ static inline bool shader_register_is_phase_instance_id(const struct vkd3d_shade
return reg->type == VKD3DSPR_FORKINSTID || reg->type == VKD3DSPR_JOININSTID; return reg->type == VKD3DSPR_FORKINSTID || reg->type == VKD3DSPR_JOININSTID;
} }
static bool shader_instruction_is_dcl(const struct vkd3d_shader_instruction *ins) static bool vsir_instruction_is_dcl(const struct vkd3d_shader_instruction *instruction)
{ {
return (VKD3DSIH_DCL <= ins->handler_idx && ins->handler_idx <= VKD3DSIH_DCL_VERTICES_OUT) enum vkd3d_shader_opcode handler_idx = instruction->handler_idx;
|| ins->handler_idx == VKD3DSIH_HS_DECLS; return (VKD3DSIH_DCL <= handler_idx && handler_idx <= VKD3DSIH_DCL_VERTICES_OUT)
|| handler_idx == VKD3DSIH_HS_DECLS;
} }
static void vkd3d_shader_instruction_make_nop(struct vkd3d_shader_instruction *ins) static void vkd3d_shader_instruction_make_nop(struct vkd3d_shader_instruction *ins)
@@ -340,7 +341,7 @@ static void flattener_eliminate_phase_related_dcls(struct hull_flattener *normal
return; return;
} }
if (normaliser->phase == VKD3DSIH_INVALID || shader_instruction_is_dcl(ins)) if (normaliser->phase == VKD3DSIH_INVALID || vsir_instruction_is_dcl(ins))
return; return;
if (normaliser->phase_body_idx == ~0u) if (normaliser->phase_body_idx == ~0u)
@@ -639,7 +640,7 @@ static enum vkd3d_result instruction_array_normalise_hull_shader_control_point_i
normaliser.phase = ins->handler_idx; normaliser.phase = ins->handler_idx;
break; break;
default: default:
if (shader_instruction_is_dcl(ins)) if (vsir_instruction_is_dcl(ins))
break; break;
for (j = 0; j < ins->dst_count; ++j) for (j = 0; j < ins->dst_count; ++j)
shader_dst_param_normalise_outpointid(&ins->dst[j], &normaliser); shader_dst_param_normalise_outpointid(&ins->dst[j], &normaliser);
@@ -1332,7 +1333,7 @@ static void shader_instruction_normalise_io_params(struct vkd3d_shader_instructi
memset(normaliser->pc_dcl_params, 0, sizeof(normaliser->pc_dcl_params)); memset(normaliser->pc_dcl_params, 0, sizeof(normaliser->pc_dcl_params));
break; break;
default: default:
if (shader_instruction_is_dcl(ins)) if (vsir_instruction_is_dcl(ins))
break; break;
for (i = 0; i < ins->dst_count; ++i) for (i = 0; i < ins->dst_count; ++i)
shader_dst_param_io_normalise(&ins->dst[i], false, normaliser); shader_dst_param_io_normalise(&ins->dst[i], false, normaliser);
@@ -1972,13 +1973,6 @@ static void VKD3D_PRINTF_FUNC(3, 4) cf_flattener_create_block_name(struct cf_fla
flattener->block_names[block_id] = buffer.buffer; flattener->block_names[block_id] = buffer.buffer;
} }
static bool vsir_instruction_is_dcl(const struct vkd3d_shader_instruction *instruction)
{
enum vkd3d_shader_opcode handler_idx = instruction->handler_idx;
return (VKD3DSIH_DCL <= handler_idx && handler_idx <= VKD3DSIH_DCL_VERTICES_OUT)
|| handler_idx == VKD3DSIH_HS_DECLS;
}
static enum vkd3d_result cf_flattener_iterate_instruction_array(struct cf_flattener *flattener) static enum vkd3d_result cf_flattener_iterate_instruction_array(struct cf_flattener *flattener)
{ {
bool main_block_open, is_hull_shader, after_declarations_section; bool main_block_open, is_hull_shader, after_declarations_section;