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

Browse Source
This commit is contained in:
Francisco Casas
2025-07-31 19:48:00 -04:00
committed by Henri Verbeet
parent 6dc9ff1bd8
commit 97e3877aa4
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
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1936,6 +1936,7 @@ static enum vkd3d_result vsir_program_remap_output_signature(struct vsir_program
struct vsir_transformation_context *ctx) struct vsir_transformation_context *ctx)
{ {
const struct vkd3d_shader_location location = {.source_name = ctx->compile_info->source_name}; const struct vkd3d_shader_location location = {.source_name = ctx->compile_info->source_name};
struct vsir_program_iterator it = vsir_program_iterator(&program->instructions);
struct vkd3d_shader_message_context *message_context = ctx->message_context; struct vkd3d_shader_message_context *message_context = ctx->message_context;
const struct vkd3d_shader_compile_info *compile_info = ctx->compile_info; const struct vkd3d_shader_compile_info *compile_info = ctx->compile_info;
bool allows_subset_masks = target_allows_subset_masks(compile_info); bool allows_subset_masks = target_allows_subset_masks(compile_info);
@@ -1945,6 +1946,7 @@ static enum vkd3d_result vsir_program_remap_output_signature(struct vsir_program
struct signature_element *new_elements, *e; struct signature_element *new_elements, *e;
unsigned int uninit_varying_count = 0; unsigned int uninit_varying_count = 0;
unsigned int subset_varying_count = 0; unsigned int subset_varying_count = 0;
struct vkd3d_shader_instruction *ins;
unsigned int new_register_count = 0; unsigned int new_register_count = 0;
unsigned int i; unsigned int i;
@@ -2044,18 +2046,18 @@ static enum vkd3d_result vsir_program_remap_output_signature(struct vsir_program
} }
/* Write each uninitialized varying before each ret. */ /* Write each uninitialized varying before each ret. */
for (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];
struct vkd3d_shader_location loc; struct vkd3d_shader_location loc;
if (ins->opcode != VSIR_OP_RET) if (ins->opcode != VSIR_OP_RET)
continue; continue;
loc = ins->location; loc = ins->location;
if (!shader_instruction_array_insert_at(&program->instructions, i, uninit_varying_count)) vsir_program_iterator_prev(&it);
if (!vsir_program_iterator_insert_after(&it, uninit_varying_count))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
ins = &program->instructions.elements[i]; ins = vsir_program_iterator_next(&it);
for (unsigned int j = signature->element_count - uninit_varying_count; j < signature->element_count; ++j) for (unsigned int j = signature->element_count - uninit_varying_count; j < signature->element_count; ++j)
{ {
@@ -2065,10 +2067,8 @@ static enum vkd3d_result vsir_program_remap_output_signature(struct vsir_program
dst_param_init_output(&ins->dst[0], VSIR_DATA_F32, e->register_index, e->mask); dst_param_init_output(&ins->dst[0], VSIR_DATA_F32, e->register_index, e->mask);
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; ins = vsir_program_iterator_next(&it);
} }
i += uninit_varying_count;
} }
/* Vulkan (without KHR_maintenance4) disallows any mismatching masks, /* Vulkan (without KHR_maintenance4) disallows any mismatching masks,
@@ -2079,10 +2079,8 @@ static enum vkd3d_result vsir_program_remap_output_signature(struct vsir_program
if (!subset_varying_count || allows_subset_masks) if (!subset_varying_count || allows_subset_masks)
return VKD3D_OK; return VKD3D_OK;
for (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];
for (unsigned int j = 0; j < ins->dst_count; ++j) for (unsigned int j = 0; j < ins->dst_count; ++j)
remove_unread_output_components(signature, ins, &ins->dst[j]); remove_unread_output_components(signature, ins, &ins->dst[j]);
} }