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

Browse Source
This commit is contained in:
Francisco Casas
2025-08-06 17:08:18 -04:00
committed by Henri Verbeet
parent 14643b02f6
commit 0ed34c22c9
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 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7283,32 +7283,32 @@ static bool is_pre_rasterization_shader(enum vkd3d_shader_type type)
} }
static enum vkd3d_result insert_point_size_before_ret(struct vsir_program *program, static enum vkd3d_result insert_point_size_before_ret(struct vsir_program *program,
const struct vkd3d_shader_instruction *ret, size_t *ret_pos) struct vsir_program_iterator *it)
{ {
struct vkd3d_shader_instruction_array *instructions = &program->instructions; const struct vkd3d_shader_location loc = vsir_program_iterator_current(it)->location;
const struct vkd3d_shader_location loc = ret->location;
size_t pos = ret - instructions->elements;
struct vkd3d_shader_instruction *ins; struct vkd3d_shader_instruction *ins;
if (!shader_instruction_array_insert_at(&program->instructions, pos, 1)) vsir_program_iterator_prev(it);
if (!vsir_program_iterator_insert_after(it, 1))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
ret = NULL; ins = vsir_program_iterator_next(it);
ins = &program->instructions.elements[pos];
vsir_instruction_init_with_params(program, ins, &loc, VSIR_OP_MOV, 1, 1); vsir_instruction_init_with_params(program, ins, &loc, VSIR_OP_MOV, 1, 1);
vsir_dst_param_init(&ins->dst[0], VKD3DSPR_RASTOUT, VSIR_DATA_F32, 1); vsir_dst_param_init(&ins->dst[0], VKD3DSPR_RASTOUT, VSIR_DATA_F32, 1);
ins->dst[0].reg.idx[0].offset = VSIR_RASTOUT_POINT_SIZE; ins->dst[0].reg.idx[0].offset = VSIR_RASTOUT_POINT_SIZE;
src_param_init_parameter(&ins->src[0], VKD3D_SHADER_PARAMETER_NAME_POINT_SIZE, VSIR_DATA_F32); src_param_init_parameter(&ins->src[0], VKD3D_SHADER_PARAMETER_NAME_POINT_SIZE, VSIR_DATA_F32);
ins = vsir_program_iterator_next(it);
*ret_pos = pos + 1;
return VKD3D_OK; return VKD3D_OK;
} }
static enum vkd3d_result vsir_program_insert_point_size(struct vsir_program *program, static enum vkd3d_result vsir_program_insert_point_size(struct vsir_program *program,
struct vsir_transformation_context *ctx) struct vsir_transformation_context *ctx)
{ {
struct vsir_program_iterator it = vsir_program_iterator(&program->instructions);
const struct vkd3d_shader_parameter1 *size_parameter = NULL; const struct vkd3d_shader_parameter1 *size_parameter = NULL;
static const struct vkd3d_shader_location no_loc; static const struct vkd3d_shader_location no_loc;
struct vkd3d_shader_instruction *ins;
if (program->has_point_size) if (program->has_point_size)
return VKD3D_OK; return VKD3D_OK;
@@ -7337,18 +7337,14 @@ static enum vkd3d_result vsir_program_insert_point_size(struct vsir_program *pro
program->has_point_size = true; program->has_point_size = true;
/* Append a point size write before each ret. */ /* Append a point size write before each ret. */
for (size_t 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_RET) if (ins->opcode == VSIR_OP_RET)
{ {
size_t new_pos;
int ret; int ret;
if ((ret = insert_point_size_before_ret(program, ins, &new_pos)) < 0) if ((ret = insert_point_size_before_ret(program, &it)) < 0)
return ret; return ret;
i = new_pos;
} }
} }