vkd3d-shader/dxil: Rename "handler_idx" to "opcode" in sm6_parser_emit_dx_atomic_binop().

This commit is contained in:
Giovanni Mascellani
2025-10-08 21:45:36 +02:00
committed by Henri Verbeet
parent 9779b62699
commit ebb320346a
Notes: Henri Verbeet 2025-10-09 15:58:04 +02:00
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1780

View File

@@ -5043,18 +5043,18 @@ static void sm6_parser_emit_dx_atomic_binop(struct sm6_parser *sm6, enum dx_intr
unsigned int i, coord_idx, coord_count = 1; unsigned int i, coord_idx, coord_count = 1;
struct vkd3d_shader_dst_param *dst_params; struct vkd3d_shader_dst_param *dst_params;
struct vkd3d_shader_src_param *src_params; struct vkd3d_shader_src_param *src_params;
enum vkd3d_shader_opcode handler_idx;
struct vkd3d_shader_instruction *ins; struct vkd3d_shader_instruction *ins;
const struct sm6_value *resource; const struct sm6_value *resource;
struct vkd3d_shader_register reg; struct vkd3d_shader_register reg;
enum vkd3d_shader_opcode opcode;
resource = operands[0]; resource = operands[0];
if (!sm6_value_validate_is_handle(resource, sm6)) if (!sm6_value_validate_is_handle(resource, sm6))
return; return;
if (is_cmp_xchg) if (is_cmp_xchg)
handler_idx = VSIR_OP_IMM_ATOMIC_CMP_EXCH; opcode = VSIR_OP_IMM_ATOMIC_CMP_EXCH;
else if ((handler_idx = map_dx_atomic_binop(operands[1], sm6)) == VSIR_OP_INVALID) else if ((opcode = map_dx_atomic_binop(operands[1], sm6)) == VSIR_OP_INVALID)
return; return;
coord_idx = 2 - is_cmp_xchg; coord_idx = 2 - is_cmp_xchg;
@@ -5076,13 +5076,13 @@ static void sm6_parser_emit_dx_atomic_binop(struct sm6_parser *sm6, enum dx_intr
{ {
WARN("Ignoring unexpected operand.\n"); WARN("Ignoring unexpected operand.\n");
vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS,
"Ignoring an unexpected defined operand value for atomic instruction %u.", handler_idx); "Ignoring an unexpected defined operand value for atomic instruction %u.", opcode);
break; break;
} }
} }
ins = state->ins; ins = state->ins;
vsir_instruction_init(ins, &sm6->p.location, handler_idx); vsir_instruction_init(ins, &sm6->p.location, opcode);
if (!(src_params = instruction_src_params_alloc(ins, 2 + is_cmp_xchg, sm6))) if (!(src_params = instruction_src_params_alloc(ins, 2 + is_cmp_xchg, sm6)))
return; return;