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

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-07-27 16:10:15 +02:00
committed by Henri Verbeet
parent 50afaf4ac6
commit 812f6faa11
Notes: Henri Verbeet 2025-07-29 13:35:06 +02:00 
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1656
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -903,14 +903,13 @@ static bool get_opcode_from_rel_op(enum vkd3d_shader_rel_op rel_op,
static enum vkd3d_result vsir_program_normalize_addr(struct vsir_program *program, static enum vkd3d_result vsir_program_normalize_addr(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 vkd3d_shader_instruction *ins, *ins2; struct vkd3d_shader_instruction *ins, *ins2;
unsigned int tmp_idx = ~0u; unsigned int tmp_idx = ~0u;
unsigned int i, k, r; unsigned int k, r;
for (i = 0; i < program->instructions.count; ++i) for (ins = vsir_program_iterator_head(&it); ins; ins = vsir_program_iterator_next(&it))
{ {
ins = &program->instructions.elements[i];
if (ins->opcode == VSIR_OP_MOV && ins->dst[0].reg.type == VKD3DSPR_ADDR) if (ins->opcode == VSIR_OP_MOV && ins->dst[0].reg.type == VKD3DSPR_ADDR)
{ {
if (tmp_idx == ~0u) if (tmp_idx == ~0u)
@@ -926,16 +925,16 @@ static enum vkd3d_result vsir_program_normalize_addr(struct vsir_program *progra
if (tmp_idx == ~0u) if (tmp_idx == ~0u)
tmp_idx = program->temp_count++; tmp_idx = program->temp_count++;
if (!shader_instruction_array_insert_at(&program->instructions, i + 1, 1)) if (!vsir_program_iterator_insert_after(&it, 1))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
ins = &program->instructions.elements[i]; ins = vsir_program_iterator_current(&it);
ins2 = &program->instructions.elements[i + 1];
ins->opcode = VSIR_OP_ROUND_NE; ins->opcode = VSIR_OP_ROUND_NE;
vsir_register_init(&ins->dst[0].reg, VKD3DSPR_TEMP, VSIR_DATA_F32, 1); vsir_register_init(&ins->dst[0].reg, VKD3DSPR_TEMP, VSIR_DATA_F32, 1);
ins->dst[0].reg.idx[0].offset = tmp_idx; ins->dst[0].reg.idx[0].offset = tmp_idx;
ins->dst[0].reg.dimension = VSIR_DIMENSION_VEC4; ins->dst[0].reg.dimension = VSIR_DIMENSION_VEC4;
ins2 = vsir_program_iterator_next(&it);
if (!vsir_instruction_init_with_params(program, ins2, &ins->location, VSIR_OP_FTOU, 1, 1)) if (!vsir_instruction_init_with_params(program, ins2, &ins->location, VSIR_OP_FTOU, 1, 1))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;