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: Remove SATURATE modifiers after lowering them.

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-10-16 12:16:33 +02:00
committed by Henri Verbeet
parent 346b62bc70
commit 737158e7b8
Notes: Henri Verbeet 2025-10-16 15:22:54 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1797
4 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -498,14 +498,12 @@ static void VKD3D_PRINTF_FUNC(4, 0) shader_glsl_vprint_assignment(struct vkd3d_g
if (dst->vsir->shift)
vkd3d_glsl_compiler_error(gen, VKD3D_SHADER_ERROR_GLSL_INTERNAL,
"Internal compiler error: Unhandled destination shift %#x.", dst->vsir->shift);
if (modifiers & ~VKD3DSPDM_SATURATE)
if (modifiers)
vkd3d_glsl_compiler_error(gen, VKD3D_SHADER_ERROR_GLSL_INTERNAL,
"Internal compiler error: Unhandled destination modifier(s) %#x.", modifiers);
shader_glsl_print_indent(buffer, gen->indent);
vkd3d_string_buffer_printf(buffer, "%s%s = ", dst->register_name->buffer, dst->mask->buffer);
if (modifiers & VKD3DSPDM_SATURATE)
vkd3d_string_buffer_printf(buffer, "clamp(");
switch (data_type)
{
@@ -530,8 +528,6 @@ static void VKD3D_PRINTF_FUNC(4, 0) shader_glsl_vprint_assignment(struct vkd3d_g
if (close)
vkd3d_string_buffer_printf(buffer, ")");
if (modifiers & VKD3DSPDM_SATURATE)
vkd3d_string_buffer_printf(buffer, ", 0.0, 1.0)");
vkd3d_string_buffer_printf(buffer, ";\n");
}

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

@@ -2248,7 +2248,7 @@ static enum vkd3d_result vsir_program_lower_modifiers(struct vsir_program *progr
}
new_ins->dst[0] = *dst;
new_ins->dst[0].modifiers &= ~VKD3DSPDM_NONE;
new_ins->dst[0].modifiers &= ~VKD3DSPDM_SATURATE;
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);

8
libs/vkd3d-shader/msl.c
View File

@@ -683,23 +683,17 @@ static void VKD3D_PRINTF_FUNC(3, 4) msl_print_assignment(
if (dst->vsir->shift)
msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL,
"Internal compiler error: Unhandled destination shift %#x.", dst->vsir->shift);
if (modifiers & ~VKD3DSPDM_SATURATE)
if (modifiers)
msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL,
"Internal compiler error: Unhandled destination modifier(s) %#x.", modifiers);
msl_print_indent(gen->buffer, gen->indent);
vkd3d_string_buffer_printf(gen->buffer, "%s%s = ", dst->register_name->buffer, dst->mask->buffer);
if (modifiers & VKD3DSPDM_SATURATE)
vkd3d_string_buffer_printf(gen->buffer, "saturate(");
va_start(args, format);
vkd3d_string_buffer_vprintf(gen->buffer, format, args);
va_end(args);
if (modifiers & VKD3DSPDM_SATURATE)
vkd3d_string_buffer_printf(gen->buffer, ")");
vkd3d_string_buffer_printf(gen->buffer, ";\n");
}

6
libs/vkd3d-shader/spirv.c
View File

@@ -4986,12 +4986,6 @@ static void spirv_compiler_emit_store_dst(struct spirv_compiler *compiler,
/* It is always legitimate to ignore _pp. */
modifiers &= ~VKD3DSPDM_PARTIALPRECISION;
if (modifiers & VKD3DSPDM_SATURATE)
{
val_id = spirv_compiler_emit_sat(compiler, &dst->reg, dst->write_mask, val_id);
modifiers &= ~VKD3DSPDM_SATURATE;
}
if (dst->modifiers & VKD3DSPDM_MSAMPCENTROID)
{
FIXME("Ignoring _centroid modifier.\n");