wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/dxil: Use sm6_parser_add_function_instruction() in sm6_parser_emit_reg_composite_construct().

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-12-04 11:30:11 +01:00
committed by Henri Verbeet
parent 52f00ceec5
commit 89c17a142e
Notes: Henri Verbeet 2025-12-08 17:49:13 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1858
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5021,7 +5021,7 @@ static bool sm6_parser_emit_reg_composite_construct(struct sm6_parser *sm6,
const struct vkd3d_shader_register *operand_regs, unsigned int component_count, const struct vkd3d_shader_register *operand_regs, unsigned int component_count,
struct function_emission_state *state, struct vkd3d_shader_register *reg) struct function_emission_state *state, struct vkd3d_shader_register *reg)
{ {
struct vkd3d_shader_instruction *ins = state->ins; struct vkd3d_shader_instruction *ins;
struct vsir_src_operand *src_params; struct vsir_src_operand *src_params;
struct vsir_dst_operand *dst_param; struct vsir_dst_operand *dst_param;
bool all_constant = true; bool all_constant = true;
@@ -5050,27 +5050,33 @@ static bool sm6_parser_emit_reg_composite_construct(struct sm6_parser *sm6,
register_init_with_id(reg, VKD3DSPR_TEMP, operand_regs[0].data_type, state->temp_idx++); register_init_with_id(reg, VKD3DSPR_TEMP, operand_regs[0].data_type, state->temp_idx++);
reg->dimension = VSIR_DIMENSION_VEC4; reg->dimension = VSIR_DIMENSION_VEC4;
for (i = 0; i < component_count; ++i, ++ins) for (i = 0; i < component_count; ++i)
{ {
if (!(ins = sm6_parser_add_function_instruction(sm6, state)))
return false;
state->ins = ins + 1;
vsir_instruction_init(ins, &sm6->p.location, VSIR_OP_MOV); vsir_instruction_init(ins, &sm6->p.location, VSIR_OP_MOV);
if (!(src_params = instruction_src_params_alloc(ins, 1, sm6))) if (!(src_params = instruction_src_params_alloc(ins, 1, sm6)))
return false; goto error;
src_param_init(&src_params[0]); src_param_init(&src_params[0]);
src_params[0].reg = operand_regs[i]; src_params[0].reg = operand_regs[i];
if (!(dst_param = instruction_dst_params_alloc(ins, 1, sm6))) if (!(dst_param = instruction_dst_params_alloc(ins, 1, sm6)))
return false; goto error;
dst_param_init_scalar(dst_param, i); dst_param_init_scalar(dst_param, i);
dst_param->reg = *reg; dst_param->reg = *reg;
} }
state->ins = ins;
state->function->instructions.count += component_count;
return true; return true;
error:
vkd3d_shader_instruction_make_nop(ins);
return false;
} }
static bool sm6_parser_emit_composite_construct(struct sm6_parser *sm6, const struct sm6_value **operands, static bool sm6_parser_emit_composite_construct(struct sm6_parser *sm6, const struct sm6_value **operands,