vkd3d-shader/ir: Use iterators in vsir_program_ensure_diffuse().

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

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(
struct vsir_program_iterator *iterator)
{
if (iterator->idx < iterator->array->count)
if (iterator->idx < iterator->array->count || iterator->idx == SIZE_MAX)
++iterator->idx;
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
* instruction as before the insertion, but all other iterators and pointers
* to the same container are invalidated and cannot be used any more. */