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

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-07-16 22:08:15 +02:00
committed by Henri Verbeet
parent 9867d48c3a
commit a12d64fba1
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
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

@@ -1024,24 +1024,22 @@ static enum vkd3d_result vsir_program_lower_ifc(struct vsir_program *program,
} }
static enum vkd3d_result vsir_program_lower_texkill(struct vsir_program *program, static enum vkd3d_result vsir_program_lower_texkill(struct vsir_program *program,
struct vkd3d_shader_instruction *texkill, unsigned int *tmp_idx) struct vsir_program_iterator *it, unsigned int *tmp_idx)
{ {
const unsigned int components_read = 3 + (program->shader_version.major >= 2); const unsigned int components_read = 3 + (program->shader_version.major >= 2);
struct vkd3d_shader_instruction_array *instructions = &program->instructions; struct vkd3d_shader_instruction *ins, *texkill;
size_t pos = texkill - instructions->elements;
struct vkd3d_shader_instruction *ins;
unsigned int j; unsigned int j;
if (!shader_instruction_array_insert_at(instructions, pos + 1, components_read + 1)) if (!vsir_program_iterator_insert_after(it, components_read + 1))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
texkill = &instructions->elements[pos]; texkill = vsir_program_iterator_current(it);
if (*tmp_idx == ~0u) if (*tmp_idx == ~0u)
*tmp_idx = program->temp_count++; *tmp_idx = program->temp_count++;
/* tmp = ins->src[0] < 0 */ /* tmp = ins->src[0] < 0 */
ins = &instructions->elements[pos + 1]; ins = vsir_program_iterator_next(it);
if (!vsir_instruction_init_with_params(program, ins, &texkill->location, VSIR_OP_LTO, 1, 2)) if (!vsir_instruction_init_with_params(program, ins, &texkill->location, VSIR_OP_LTO, 1, 2))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
@@ -1065,7 +1063,7 @@ static enum vkd3d_result vsir_program_lower_texkill(struct vsir_program *program
for (j = 1; j < components_read; ++j) for (j = 1; j < components_read; ++j)
{ {
ins = &instructions->elements[pos + 1 + j]; ins = vsir_program_iterator_next(it);
if (!(vsir_instruction_init_with_params(program, ins, &texkill->location, VSIR_OP_OR, 1, 2))) if (!(vsir_instruction_init_with_params(program, ins, &texkill->location, VSIR_OP_OR, 1, 2)))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
@@ -1086,7 +1084,7 @@ static enum vkd3d_result vsir_program_lower_texkill(struct vsir_program *program
/* discard_nz tmp.x */ /* discard_nz tmp.x */
ins = &instructions->elements[pos + 1 + components_read]; ins = vsir_program_iterator_next(it);
if (!(vsir_instruction_init_with_params(program, ins, &texkill->location, VSIR_OP_DISCARD, 0, 1))) if (!(vsir_instruction_init_with_params(program, ins, &texkill->location, VSIR_OP_DISCARD, 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;
@@ -1595,7 +1593,7 @@ static enum vkd3d_result vsir_program_lower_instructions(struct vsir_program *pr
break; break;
case VSIR_OP_TEXKILL: case VSIR_OP_TEXKILL:
if ((ret = vsir_program_lower_texkill(program, ins, &tmp_idx)) < 0) if ((ret = vsir_program_lower_texkill(program, &it, &tmp_idx)) < 0)
return ret; return ret;
break; break;