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 vsir_program_normalise_flat_constants().

Browse Source
This commit is contained in:
Francisco Casas
2025-08-01 19:46:02 -04:00
committed by Henri Verbeet
parent 37ca1b55c9
commit 304caa885f
Notes: Henri Verbeet 2025-08-06 13:02:54 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1669
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3282,13 +3282,13 @@ static void shader_register_normalise_flat_constants(struct vkd3d_shader_src_par
static enum vkd3d_result vsir_program_normalise_flat_constants(struct vsir_program *program, static enum vkd3d_result vsir_program_normalise_flat_constants(struct vsir_program *program,
struct vsir_transformation_context *ctx) struct vsir_transformation_context *ctx)
{ {
struct vsir_program_iterator it = vsir_program_iterator(&program->instructions);
struct flat_constants_normaliser normaliser = {0}; struct flat_constants_normaliser normaliser = {0};
unsigned int i, j; struct vkd3d_shader_instruction *ins;
unsigned int i;
for (i = 0; i < program->instructions.count; ++i) for (ins = vsir_program_iterator_head(&it); ins; ins = vsir_program_iterator_next(&it))
{ {
struct vkd3d_shader_instruction *ins = &program->instructions.elements[i];
if (ins->opcode == VSIR_OP_DEF || ins->opcode == VSIR_OP_DEFI || ins->opcode == VSIR_OP_DEFB) if (ins->opcode == VSIR_OP_DEF || ins->opcode == VSIR_OP_DEFI || ins->opcode == VSIR_OP_DEFB)
{ {
struct flat_constant_def *def; struct flat_constant_def *def;
@@ -3303,15 +3303,19 @@ static enum vkd3d_result vsir_program_normalise_flat_constants(struct vsir_progr
def = &normaliser.defs[normaliser.def_count++]; def = &normaliser.defs[normaliser.def_count++];
get_flat_constant_register_type(&ins->dst[0].reg, &def->set, &def->index, NULL); get_flat_constant_register_type(&ins->dst[0].reg, &def->set, &def->index, NULL);
for (j = 0; j < 4; ++j) for (i = 0; i < 4; ++i)
def->value[j] = ins->src[0].reg.u.immconst_u32[j]; {
def->value[i] = ins->src[0].reg.u.immconst_u32[i];
}
vkd3d_shader_instruction_make_nop(ins); vkd3d_shader_instruction_make_nop(ins);
} }
else else
{ {
for (j = 0; j < ins->src_count; ++j) for (i = 0; i < ins->src_count; ++i)
shader_register_normalise_flat_constants(&ins->src[j], &normaliser); {
shader_register_normalise_flat_constants(&ins->src[i], &normaliser);
}
} }
} }