wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/ir: Lower SATURATE modifiers to instructions.

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-10-13 22:07:44 +02:00
committed by Henri Verbeet
parent 835044dd8e
commit 8b8ee542d7
Notes: Henri Verbeet 2025-10-14 16:33:38 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1788
2 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -605,6 +605,21 @@ static void shader_glsl_dot(struct vkd3d_glsl_generator *gen,
glsl_dst_cleanup(&dst, &gen->string_buffers); glsl_dst_cleanup(&dst, &gen->string_buffers);
} }
static void shader_glsl_saturate(struct vkd3d_glsl_generator *gen, const struct vkd3d_shader_instruction *ins)
{
struct glsl_src src;
struct glsl_dst dst;
uint32_t mask;
mask = glsl_dst_init(&dst, gen, ins, &ins->dst[0]);
glsl_src_init(&src, gen, &ins->src[0], mask);
shader_glsl_print_assignment(gen, &dst, "clamp(%s, 0.0, 1.0)", src.str->buffer);
glsl_src_cleanup(&src, &gen->string_buffers);
glsl_dst_cleanup(&dst, &gen->string_buffers);
}
static void shader_glsl_intrinsic(struct vkd3d_glsl_generator *gen, static void shader_glsl_intrinsic(struct vkd3d_glsl_generator *gen,
const struct vkd3d_shader_instruction *ins, const char *op) const struct vkd3d_shader_instruction *ins, const char *op)
{ {
@@ -1654,6 +1669,9 @@ static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *gen,
case VSIR_OP_RSQ: case VSIR_OP_RSQ:
shader_glsl_intrinsic(gen, ins, "inversesqrt"); shader_glsl_intrinsic(gen, ins, "inversesqrt");
break; break;
case VSIR_OP_SATURATE:
shader_glsl_saturate(gen, ins);
break;
case VSIR_OP_SIN: case VSIR_OP_SIN:
shader_glsl_intrinsic(gen, ins, "sin"); shader_glsl_intrinsic(gen, ins, "sin");
break; break;

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

@@ -2236,6 +2236,39 @@ static enum vkd3d_result vsir_program_lower_modifiers(struct vsir_program *progr
++program->ssa_count; ++program->ssa_count;
} }
} }
for (i = 0; i < ins->dst_count; ++i)
{
struct vkd3d_shader_dst_param *dst = &ins->dst[i];
if (dst->modifiers & VKD3DSPDM_SATURATE)
{
if (!vsir_program_iterator_insert_after(&it, 1))
return VKD3D_ERROR_OUT_OF_MEMORY;
ins = vsir_program_iterator_current(&it);
new_ins = vsir_program_iterator_next(&it);
if (!vsir_instruction_init_with_params(program, new_ins, &ins->location, VSIR_OP_SATURATE, 1, 1))
{
vkd3d_shader_instruction_make_nop(new_ins);
return VKD3D_ERROR_OUT_OF_MEMORY;
}
new_ins->dst[0] = *dst;
new_ins->dst[0].modifiers &= ~VKD3DSPDM_NONE;
dst_param_init_ssa(dst, program->ssa_count, dst->reg.data_type, dst->reg.dimension);
src_param_init_ssa(&new_ins->src[0], program->ssa_count, dst->reg.data_type, dst->reg.dimension);
if (data_type_is_64_bit(dst->reg.data_type))
{
dst->write_mask = vsir_write_mask_64_from_32(dst->write_mask);
new_ins->src[0].swizzle = vsir_swizzle_64_from_32(new_ins->src[0].swizzle);
}
++program->ssa_count;
}
}
} }
return VKD3D_OK; return VKD3D_OK;