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

Browse Source
This commit is contained in:
Francisco Casas
2025-08-06 17:54:02 -04:00
committed by Henri Verbeet
parent a91b880afa
commit 880cb1083f
Notes: Henri Verbeet 2025-08-07 20:52:01 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1673
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7528,12 +7528,13 @@ static bool replace_texcoord_with_point_coord(struct vsir_program *program,
static enum vkd3d_result vsir_program_insert_point_coord(struct vsir_program *program, static enum vkd3d_result vsir_program_insert_point_coord(struct vsir_program *program,
struct vsir_transformation_context *ctx) struct vsir_transformation_context *ctx)
{ {
struct vsir_program_iterator it = vsir_program_iterator(&program->instructions), it2;
const struct vkd3d_shader_parameter1 *sprite_parameter = NULL; const struct vkd3d_shader_parameter1 *sprite_parameter = NULL;
static const struct vkd3d_shader_location no_loc; static const struct vkd3d_shader_location no_loc;
struct vkd3d_shader_instruction *ins; struct vkd3d_shader_instruction *ins;
bool used_texcoord = false; bool used_texcoord = false;
unsigned int coord_temp; unsigned int coord_temp;
size_t i, insert_pos; size_t i;
if (program->shader_version.type != VKD3D_SHADER_TYPE_PIXEL) if (program->shader_version.type != VKD3D_SHADER_TYPE_PIXEL)
return VKD3D_OK; return VKD3D_OK;
@@ -7574,21 +7575,16 @@ static enum vkd3d_result vsir_program_insert_point_coord(struct vsir_program *pr
/* Construct the new temp after all LABEL, DCL, and NOP instructions. /* Construct the new temp after all LABEL, DCL, and NOP instructions.
* We need to skip NOP instructions because they might result from removed * We need to skip NOP instructions because they might result from removed
* DCLs, and there could still be DCLs after NOPs. */ * DCLs, and there could still be DCLs after NOPs. */
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 (!vsir_instruction_is_dcl(ins) && ins->opcode != VSIR_OP_LABEL && ins->opcode != VSIR_OP_NOP) if (!vsir_instruction_is_dcl(ins) && ins->opcode != VSIR_OP_LABEL && ins->opcode != VSIR_OP_NOP)
break; break;
} }
insert_pos = i; it2 = it;
/* Replace each texcoord read with a read from the point coord. */ /* Replace each texcoord read with a read from the point coord. */
for (; i < program->instructions.count; ++i) for (; ins; ins = vsir_program_iterator_next(&it2))
{ {
ins = &program->instructions.elements[i];
if (vsir_instruction_is_dcl(ins)) if (vsir_instruction_is_dcl(ins))
continue; continue;
@@ -7617,9 +7613,10 @@ static enum vkd3d_result vsir_program_insert_point_coord(struct vsir_program *pr
if (used_texcoord) if (used_texcoord)
{ {
if (!shader_instruction_array_insert_at(&program->instructions, insert_pos, 2)) vsir_program_iterator_prev(&it);
if (!vsir_program_iterator_insert_after(&it, 2))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
ins = &program->instructions.elements[insert_pos]; ins = vsir_program_iterator_next(&it);
vsir_instruction_init_with_params(program, ins, &no_loc, VSIR_OP_MOV, 1, 1); vsir_instruction_init_with_params(program, ins, &no_loc, VSIR_OP_MOV, 1, 1);
dst_param_init_temp_float4(&ins->dst[0], coord_temp); dst_param_init_temp_float4(&ins->dst[0], coord_temp);
@@ -7627,14 +7624,14 @@ static enum vkd3d_result vsir_program_insert_point_coord(struct vsir_program *pr
vsir_src_param_init(&ins->src[0], VKD3DSPR_POINT_COORD, VSIR_DATA_F32, 0); vsir_src_param_init(&ins->src[0], VKD3DSPR_POINT_COORD, VSIR_DATA_F32, 0);
ins->src[0].reg.dimension = VSIR_DIMENSION_VEC4; ins->src[0].reg.dimension = VSIR_DIMENSION_VEC4;
ins->src[0].swizzle = VKD3D_SHADER_NO_SWIZZLE; ins->src[0].swizzle = VKD3D_SHADER_NO_SWIZZLE;
++ins; ins = vsir_program_iterator_next(&it);
vsir_instruction_init_with_params(program, ins, &no_loc, VSIR_OP_MOV, 1, 1); vsir_instruction_init_with_params(program, ins, &no_loc, VSIR_OP_MOV, 1, 1);
dst_param_init_temp_float4(&ins->dst[0], coord_temp); dst_param_init_temp_float4(&ins->dst[0], coord_temp);
ins->dst[0].write_mask = VKD3DSP_WRITEMASK_2 | VKD3DSP_WRITEMASK_3; ins->dst[0].write_mask = VKD3DSP_WRITEMASK_2 | VKD3DSP_WRITEMASK_3;
vsir_src_param_init(&ins->src[0], VKD3DSPR_IMMCONST, VSIR_DATA_F32, 0); vsir_src_param_init(&ins->src[0], VKD3DSPR_IMMCONST, VSIR_DATA_F32, 0);
ins->src[0].reg.dimension = VSIR_DIMENSION_VEC4; ins->src[0].reg.dimension = VSIR_DIMENSION_VEC4;
++ins; vsir_program_iterator_next(&it);
program->has_point_coord = true; program->has_point_coord = true;
} }