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 the iterator in vsir_program_lower_ifc().

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-07-16 22:06:00 +02:00
committed by Henri Verbeet
parent 2d848b5bc0
commit 9867d48c3a
Notes: Henri Verbeet 2025-07-17 14:18:45 +02:00 
Approved-by: Francisco Casas (@fcasas)
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1614
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -971,18 +971,16 @@ static enum vkd3d_result vsir_program_normalize_addr(struct vsir_program *progra
} }
static enum vkd3d_result vsir_program_lower_ifc(struct vsir_program *program, static enum vkd3d_result vsir_program_lower_ifc(struct vsir_program *program,
struct vkd3d_shader_instruction *ifc, unsigned int *tmp_idx, struct vsir_program_iterator *it, unsigned int *tmp_idx,
struct vkd3d_shader_message_context *message_context) struct vkd3d_shader_message_context *message_context)
{ {
struct vkd3d_shader_instruction_array *instructions = &program->instructions; struct vkd3d_shader_instruction *ifc, *ins;
size_t pos = ifc - instructions->elements;
struct vkd3d_shader_instruction *ins;
enum vkd3d_shader_opcode opcode; enum vkd3d_shader_opcode opcode;
bool swap; bool swap;
if (!shader_instruction_array_insert_at(instructions, pos + 1, 2)) if (!vsir_program_iterator_insert_after(it, 2))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
ifc = &instructions->elements[pos]; ifc = vsir_program_iterator_current(it);
if (*tmp_idx == ~0u) if (*tmp_idx == ~0u)
*tmp_idx = program->temp_count++; *tmp_idx = program->temp_count++;
@@ -996,7 +994,7 @@ static enum vkd3d_result vsir_program_lower_ifc(struct vsir_program *program,
return VKD3D_ERROR_NOT_IMPLEMENTED; return VKD3D_ERROR_NOT_IMPLEMENTED;
} }
ins = &instructions->elements[pos + 1]; ins = vsir_program_iterator_next(it);
if (!vsir_instruction_init_with_params(program, ins, &ifc->location, opcode, 1, 2)) if (!vsir_instruction_init_with_params(program, ins, &ifc->location, opcode, 1, 2))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
@@ -1009,7 +1007,7 @@ static enum vkd3d_result vsir_program_lower_ifc(struct vsir_program *program,
ins->src[1] = ifc->src[!swap]; ins->src[1] = ifc->src[!swap];
/* Create new if instruction using the previous result. */ /* Create new if instruction using the previous result. */
ins = &instructions->elements[pos + 2]; ins = vsir_program_iterator_next(it);
if (!vsir_instruction_init_with_params(program, ins, &ifc->location, VSIR_OP_IF, 0, 1)) if (!vsir_instruction_init_with_params(program, ins, &ifc->location, VSIR_OP_IF, 0, 1))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
ins->flags = VKD3D_SHADER_CONDITIONAL_OP_NZ; ins->flags = VKD3D_SHADER_CONDITIONAL_OP_NZ;
@@ -1592,7 +1590,7 @@ static enum vkd3d_result vsir_program_lower_instructions(struct vsir_program *pr
switch (ins->opcode) switch (ins->opcode)
{ {
case VSIR_OP_IFC: case VSIR_OP_IFC:
if ((ret = vsir_program_lower_ifc(program, ins, &tmp_idx, message_context)) < 0) if ((ret = vsir_program_lower_ifc(program, &it, &tmp_idx, message_context)) < 0)
return ret; return ret;
break; break;

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

@@ -1456,6 +1456,14 @@ static inline struct vkd3d_shader_instruction *vsir_program_iterator_next(
return vsir_program_iterator_current(iterator); 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. */
static inline bool vsir_program_iterator_insert_after(struct vsir_program_iterator *it, unsigned int count)
{
return shader_instruction_array_insert_at(it->array, it->idx + 1, count);
}
enum vkd3d_shader_config_flags enum vkd3d_shader_config_flags
{ {
VKD3D_SHADER_CONFIG_FLAG_FORCE_VALIDATION = 0x00000001, VKD3D_SHADER_CONFIG_FLAG_FORCE_VALIDATION = 0x00000001,