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/glsl: Implement support for VKD3DSPDM_SATURATE modifiers.

Browse Source
This commit is contained in:
Henri Verbeet
2024-05-04 00:48:22 +02:00
parent 49121937cf
commit 4103e76245
Notes: Henri Verbeet 2024-10-02 22:39:09 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1140
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,18 +365,21 @@ static void VKD3D_PRINTF_FUNC(3, 4) shader_glsl_print_assignment(
{ {
const struct vkd3d_shader_register *dst_reg = &dst->vsir->reg; const struct vkd3d_shader_register *dst_reg = &dst->vsir->reg;
struct vkd3d_string_buffer *buffer = gen->buffer; struct vkd3d_string_buffer *buffer = gen->buffer;
uint32_t modifiers = dst->vsir->modifiers;
bool close = true; bool close = true;
va_list args; va_list args;
if (dst->vsir->shift) if (dst->vsir->shift)
vkd3d_glsl_compiler_error(gen, VKD3D_SHADER_ERROR_GLSL_INTERNAL, vkd3d_glsl_compiler_error(gen, VKD3D_SHADER_ERROR_GLSL_INTERNAL,
"Internal compiler error: Unhandled destination shift %#x.", dst->vsir->shift); "Internal compiler error: Unhandled destination shift %#x.", dst->vsir->shift);
if (dst->vsir->modifiers) if (modifiers & ~VKD3DSPDM_SATURATE)
vkd3d_glsl_compiler_error(gen, VKD3D_SHADER_ERROR_GLSL_INTERNAL, vkd3d_glsl_compiler_error(gen, VKD3D_SHADER_ERROR_GLSL_INTERNAL,
"Internal compiler error: Unhandled destination modifier(s) %#x.", dst->vsir->modifiers); "Internal compiler error: Unhandled destination modifier(s) %#x.", modifiers);
shader_glsl_print_indent(buffer, gen->indent); shader_glsl_print_indent(buffer, gen->indent);
vkd3d_string_buffer_printf(buffer, "%s%s = ", dst->register_name->buffer, dst->mask->buffer); 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 (dst_reg->data_type) switch (dst_reg->data_type)
{ {
@@ -399,7 +402,11 @@ static void VKD3D_PRINTF_FUNC(3, 4) shader_glsl_print_assignment(
vkd3d_string_buffer_vprintf(buffer, format, args); vkd3d_string_buffer_vprintf(buffer, format, args);
va_end(args); va_end(args);
vkd3d_string_buffer_printf(buffer, "%s;\n", close ? ")" : ""); 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");
} }
static void shader_glsl_unhandled(struct vkd3d_glsl_generator *gen, const struct vkd3d_shader_instruction *ins) static void shader_glsl_unhandled(struct vkd3d_glsl_generator *gen, const struct vkd3d_shader_instruction *ins)

4
tests/hlsl/saturate.shader_test
View File

@@ -8,7 +8,7 @@ float4 main() : sv_target
[test] [test]
uniform 0 float4 0.7 -0.1 0.0 0.0 uniform 0 float4 0.7 -0.1 0.0 0.0
todo(glsl) draw quad draw quad
probe (0, 0) rgba (0.7, 0.0, 1.0, 0.0) probe (0, 0) rgba (0.7, 0.0, 1.0, 0.0)
[pixel shader] [pixel shader]
@@ -22,5 +22,5 @@ float4 main() : sv_target
[test] [test]
uniform 0 float4 -2 0 2 -1 uniform 0 float4 -2 0 2 -1
todo(glsl) draw quad draw quad
probe (0, 0) rgba (0.0, 0.0, 1.0, 0.0) probe (0, 0) rgba (0.0, 0.0, 1.0, 0.0)