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: Use iterators in control_point_normaliser_emit_hs_input().

Browse Source
This commit is contained in:
Francisco Casas
2025-09-01 13:43:23 -04:00
committed by Henri Verbeet
parent 500d54d588
commit 952e706883
Notes: Henri Verbeet 2025-09-09 15:10:17 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1707
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

@@ -2519,8 +2519,8 @@ static void shader_dst_param_normalise_outpointid(struct vkd3d_shader_dst_param
} }
static enum vkd3d_result control_point_normaliser_emit_hs_input(struct control_point_normaliser *normaliser, static enum vkd3d_result control_point_normaliser_emit_hs_input(struct control_point_normaliser *normaliser,
const struct shader_signature *s, unsigned int input_control_point_count, unsigned int dst, const struct shader_signature *s, unsigned int input_control_point_count,
const struct vkd3d_shader_location *location) struct vsir_program_iterator *dst_it, const struct vkd3d_shader_location *location)
{ {
struct vkd3d_shader_instruction *ins; struct vkd3d_shader_instruction *ins;
const struct signature_element *e; const struct signature_element *e;
@@ -2529,17 +2529,11 @@ static enum vkd3d_result control_point_normaliser_emit_hs_input(struct control_p
for (i = 0; i < s->element_count; ++i) for (i = 0; i < s->element_count; ++i)
count += !!s->elements[i].used_mask; count += !!s->elements[i].used_mask;
if (!shader_instruction_array_reserve(&normaliser->instructions, normaliser->instructions.count + count)) if (!(ins = vsir_program_iterator_insert_before_and_move(dst_it, count)))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
memmove(&normaliser->instructions.elements[dst + count], &normaliser->instructions.elements[dst],
(normaliser->instructions.count - dst) * sizeof(*normaliser->instructions.elements));
normaliser->instructions.count += count;
ins = &normaliser->instructions.elements[dst];
vsir_instruction_init(ins, location, VSIR_OP_HS_CONTROL_POINT_PHASE); vsir_instruction_init(ins, location, VSIR_OP_HS_CONTROL_POINT_PHASE);
++ins; ins = vsir_program_iterator_next(dst_it);
for (i = 0; i < s->element_count; ++i) for (i = 0; i < s->element_count; ++i)
{ {
@@ -2571,7 +2565,7 @@ static enum vkd3d_result control_point_normaliser_emit_hs_input(struct control_p
ins->src[0].reg.idx[0].rel_addr = normaliser->outpointid_param; ins->src[0].reg.idx[0].rel_addr = normaliser->outpointid_param;
ins->src[0].reg.idx[1].offset = e->register_index; ins->src[0].reg.idx[1].offset = e->register_index;
++ins; ins = vsir_program_iterator_next(dst_it);
} }
vsir_instruction_init(ins, location, VSIR_OP_RET); vsir_instruction_init(ins, location, VSIR_OP_RET);
@@ -2643,8 +2637,8 @@ static enum vkd3d_result instruction_array_normalise_hull_shader_control_point_i
case VSIR_OP_HS_JOIN_PHASE: case VSIR_OP_HS_JOIN_PHASE:
/* ins may be relocated if the instruction array expands. */ /* ins may be relocated if the instruction array expands. */
location = ins->location; location = ins->location;
ret = control_point_normaliser_emit_hs_input(&normaliser, &program->input_signature, ret = control_point_normaliser_emit_hs_input(&normaliser,
input_control_point_count, i, &location); &program->input_signature, input_control_point_count, &it, &location);
program->instructions = normaliser.instructions; program->instructions = normaliser.instructions;
program->normalisation_level = VSIR_NORMALISED_HULL_CONTROL_POINT_IO; program->normalisation_level = VSIR_NORMALISED_HULL_CONTROL_POINT_IO;
return ret; return ret;