wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/glsl: Implement VKD3DSIH_MIN.

Browse Source
This commit is contained in:
Henri Verbeet 2024-05-03 15:43:42 +02:00
parent 4f054aed48
commit 5cf8562124
Notes: Henri Verbeet 2024-10-01 17:35:47 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1134
4 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -795,6 +795,9 @@ static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *gen,
case VKD3DSIH_MAX:
shader_glsl_intrinsic(gen, ins, "max");
break;
case VKD3DSIH_MIN:
shader_glsl_intrinsic(gen, ins, "min");
break;
case VKD3DSIH_INE:
case VKD3DSIH_NEU:
shader_glsl_relop(gen, ins, "!=", "notEqual");

2
tests/hlsl/clamp.shader_test
View File

@ -8,7 +8,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 -0.3 -0.1 0.7 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (-0.1, 0.7, -0.3, 0.3)

40
tests/hlsl/inverse-trig.shader_test
View File

@ -102,23 +102,23 @@ float4 main() : sv_target
[test]
uniform 0 float4 -1.0 0.0 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (-0.785409629, 0.0, 0.0, 0.0) 512
uniform 0 float4 -0.5 0.0 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (-0.4636476, 0.0, 0.0, 0.0) 256
uniform 0 float4 0.0 0.0 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) 256
uniform 0 float4 0.5 0.0 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (0.4636476, 0.0, 0.0, 0.0) 256
uniform 0 float4 1.0 0.0 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (0.785409629, 0.0, 0.0, 0.0) 512
[pixel shader]
@ -133,64 +133,64 @@ float4 main() : sv_target
[test]
% Non-degenerate cases
uniform 0 float4 1.0 1.0 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (0.785385, 0.0, 0.0, 0.0) 512
uniform 0 float4 5.0 -5.0 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (2.356194, 0.0, 0.0, 0.0) 256
uniform 0 float4 -3.0 -3.0 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (-2.356194, 0.0, 0.0, 0.0) 256
uniform 0 float4 1.0 0.0 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (1.570796, 0.0, 0.0, 0.0) 256
uniform 0 float4 -1.0 0.0 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (-1.570796, 0.0, 0.0, 0.0) 256
uniform 0 float4 0.0 1.0 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) 256
uniform 0 float4 0.0 -1.0 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (3.1415927, 0.0, 0.0, 0.0) 256
% Degenerate cases
uniform 0 float4 0.00001 0.00002 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (0.463647, 0.0, 0.0, 0.0) 256
uniform 0 float4 0.00001 -0.00002 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (2.677945, 0.0, 0.0, 0.0) 256
uniform 0 float4 -0.00001 100000.0 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (-0.000000000099986595, 0.0, 0.0, 0.0) 2048
uniform 0 float4 10000000.0 0.00000001 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (1.570796, 0.0, 0.0, 0.0) 256
% Negative zero behavior should be to treat it the
% same as normal zero.
uniform 0 float4 1000000000.0 0.0 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (1.570796, 0.0, 0.0, 0.0) 256
uniform 0 float4 1000000000.0 -0.0 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (1.570796, 0.0, 0.0, 0.0) 256
uniform 0 float4 0.0 -1.0 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (3.1415927, 0.0, 0.0, 0.0) 256
uniform 0 float4 -0.0 -1.0 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (3.1415927, 0.0, 0.0, 0.0) 256

4
tests/hlsl/max-min.shader_test
View File

@ -64,7 +64,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 0.7 -0.1 0.0 0.0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (-0.1, 2.0, 1.0, -2.0)
@ -80,7 +80,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 0.7 -0.1 0.4 0.8
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (0.4, -0.1, -0.2, -0.1)