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

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-07-27 16:28:02 +02:00
committed by Henri Verbeet
parent 812f6faa11
commit 247fbd869a
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
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1740,14 +1740,21 @@ static enum vkd3d_result vsir_program_lower_instructions(struct vsir_program *pr
static enum vkd3d_result vsir_program_ensure_ret(struct vsir_program *program, static enum vkd3d_result vsir_program_ensure_ret(struct vsir_program *program,
struct vsir_transformation_context *ctx) struct vsir_transformation_context *ctx)
{ {
struct vsir_program_iterator it = vsir_program_iterator(&program->instructions);
static const struct vkd3d_shader_location no_loc; static const struct vkd3d_shader_location no_loc;
if (program->instructions.count struct vkd3d_shader_instruction *ins;
&& program->instructions.elements[program->instructions.count - 1].opcode == VSIR_OP_RET)
ins = vsir_program_iterator_tail(&it);
if (ins && ins->opcode == VSIR_OP_RET)
return VKD3D_OK; return VKD3D_OK;
if (!shader_instruction_array_insert_at(&program->instructions, program->instructions.count, 1)) if (!vsir_program_iterator_insert_after(&it, 1))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
vsir_instruction_init(&program->instructions.elements[program->instructions.count - 1], &no_loc, VSIR_OP_RET);
ins = vsir_program_iterator_next(&it);
vsir_instruction_init(ins, &no_loc, VSIR_OP_RET);
return VKD3D_OK; return VKD3D_OK;
} }

7
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@@ -1453,6 +1453,13 @@ static inline struct vkd3d_shader_instruction *vsir_program_iterator_head(
return vsir_program_iterator_current(iterator); return vsir_program_iterator_current(iterator);
} }
static inline struct vkd3d_shader_instruction *vsir_program_iterator_tail(struct vsir_program_iterator *iterator)
{
iterator->idx = iterator->array->count - 1;
return vsir_program_iterator_current(iterator);
}
static inline struct vkd3d_shader_instruction *vsir_program_iterator_next( static inline struct vkd3d_shader_instruction *vsir_program_iterator_next(
struct vsir_program_iterator *iterator) struct vsir_program_iterator *iterator)
{ {