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: Allocate instructions directly in sm6_parser_emit_dx_eval_attrib().

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-12-04 14:17:38 +01:00
committed by Henri Verbeet
parent 52bae288c5
commit f8358cf1ca
Notes: Henri Verbeet 2025-12-10 16:12:08 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1864
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5801,8 +5801,8 @@ static void sm6_parser_emit_dx_dot(struct sm6_parser *dxil, enum dx_intrinsic_op
static void sm6_parser_emit_dx_eval_attrib(struct sm6_parser *sm6, enum dx_intrinsic_opcode op,
const struct sm6_value **operands, struct function_emission_state *state)
{
struct vkd3d_shader_instruction *ins = state->ins;
const struct shader_signature *signature;
struct vkd3d_shader_instruction *ins;
unsigned int row_index, column_index;
struct vsir_src_operand *src_params;
const struct signature_element *e;
@@ -5813,7 +5813,6 @@ static void sm6_parser_emit_dx_eval_attrib(struct sm6_parser *sm6, enum dx_intri
signature = &sm6->program->input_signature;
if (row_index >= signature->element_count)
{
WARN("Invalid row index %u.\n", row_index);
vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND,
"Invalid input row index %u for an attribute evaluation.", row_index);
return;
@@ -5822,17 +5821,24 @@ static void sm6_parser_emit_dx_eval_attrib(struct sm6_parser *sm6, enum dx_intri
e = &signature->elements[row_index];
if (column_index >= VKD3D_VEC4_SIZE || !(e->mask & (1 << column_index)))
{
WARN("Invalid column index %u.\n", column_index);
vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND,
"Invalid input column index %u for an attribute evaluation.", column_index);
return;
}
if (!(ins = sm6_parser_add_function_instruction(sm6, state)))
return;
state->pushed_instruction = true;
vsir_instruction_init(ins, &sm6->p.location, (op == DX_EVAL_CENTROID)
? VSIR_OP_EVAL_CENTROID : VSIR_OP_EVAL_SAMPLE_INDEX);
if (!(src_params = instruction_src_params_alloc(ins, 1 + (op == DX_EVAL_SAMPLE_INDEX), sm6)))
{
vkd3d_shader_instruction_make_nop(ins);
return;
}
src_params[0].reg = sm6->input_params[row_index].reg;
src_param_init_scalar(&src_params[0], column_index);
@@ -5842,7 +5848,8 @@ static void sm6_parser_emit_dx_eval_attrib(struct sm6_parser *sm6, enum dx_intri
if (op == DX_EVAL_SAMPLE_INDEX)
src_param_init_from_value(&src_params[1], operands[3], 0, sm6);
instruction_dst_param_init_ssa_scalar(ins, 0, sm6);
if (!instruction_dst_param_init_ssa_scalar(ins, 0, sm6))
vkd3d_shader_instruction_make_nop(ins);
}
static void sm6_parser_emit_dx_fabs(struct sm6_parser *sm6, enum dx_intrinsic_opcode op,