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

Browse Source 
The change in vsir_program_iterator_next() is necessary to allow us to
introduce instructions before the iterator using:

    vsir_program_iterator_prev(&it);
    vsir_program_iterator_inset_after(&it, n);
    vsir_program_iterator_next(&it);

This since (it.idx == SIZE_MAX) is equivalent to the iterator being
before the beginning of the list.
This commit is contained in:
Francisco Casas
2025-07-31 18:08:07 -04:00
committed by Henri Verbeet
parent ce20f9d4b2
commit 6dc9ff1bd8
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
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1814,6 +1814,7 @@ static enum vkd3d_result vsir_program_add_diffuse_output(struct vsir_program *pr
static enum vkd3d_result vsir_program_ensure_diffuse(struct vsir_program *program, static enum vkd3d_result vsir_program_ensure_diffuse(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;
struct vkd3d_shader_instruction *ins; struct vkd3d_shader_instruction *ins;
unsigned int i; unsigned int i;
@@ -1825,17 +1826,16 @@ static enum vkd3d_result vsir_program_ensure_diffuse(struct vsir_program *progra
/* Write the instruction after all LABEL, DCL, and NOP instructions. /* Write the instruction 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;
} }
if (!shader_instruction_array_insert_at(&program->instructions, i, 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;
ins = &program->instructions.elements[i]; 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);
vsir_dst_param_init(&ins->dst[0], VKD3DSPR_ATTROUT, VSIR_DATA_F32, 1); vsir_dst_param_init(&ins->dst[0], VKD3DSPR_ATTROUT, VSIR_DATA_F32, 1);

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

@@ -1463,12 +1463,21 @@ static inline struct vkd3d_shader_instruction *vsir_program_iterator_tail(struct
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)
{ {
if (iterator->idx < iterator->array->count) if (iterator->idx < iterator->array->count || iterator->idx == SIZE_MAX)
++iterator->idx; ++iterator->idx;
return vsir_program_iterator_current(iterator); return vsir_program_iterator_current(iterator);
} }
static inline struct vkd3d_shader_instruction *vsir_program_iterator_prev(
struct vsir_program_iterator *iterator)
{
if (iterator->idx != SIZE_MAX)
--iterator->idx;
return vsir_program_iterator_current(iterator);
}
/* When insertion takes place, argument `it' is updated to point to the same /* When insertion takes place, argument `it' is updated to point to the same
* instruction as before the insertion, but all other iterators and pointers * instruction as before the insertion, but all other iterators and pointers
* to the same container are invalidated and cannot be used any more. */ * to the same container are invalidated and cannot be used any more. */