mirror of
https://gitlab.winehq.org/wine/vkd3d.git
synced 2025-09-12 18:50:22 -07:00
vkd3d-shader/hlsl: Lower SLT instructions for pixel shaders.
Properly passing the inverse-trig.shader_test tests whose qualifiers have been removed requires making spirv.c capable of handling ABS. The same happens for the ps_3_0 equality test in float-comparison.shader_test.
This commit is contained in:
committed by
Alexandre Julliard
parent
4133c4d801
commit
5c986b9cde
Notes:
Alexandre Julliard
2024-03-14 23:24:02 +01:00
Approved-by: Zebediah Figura (@zfigura) Approved-by: Giovanni Mascellani (@giomasce) Approved-by: Henri Verbeet (@hverbeet) Approved-by: Alexandre Julliard (@julliard) Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/706
@@ -1,4 +1,4 @@
|
||||
[pixel shader todo(sm<4)]
|
||||
[pixel shader]
|
||||
uniform float4 f;
|
||||
|
||||
float4 main() : sv_target
|
||||
@@ -8,28 +8,28 @@ float4 main() : sv_target
|
||||
|
||||
[test]
|
||||
uniform 0 float4 1.0 1.0 1.0 1.0
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (1.0, 1.0, 1.0, 1.0)
|
||||
uniform 0 float4 1.0 0.0 0.0 0.0
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (1.0, 1.0, 1.0, 1.0)
|
||||
uniform 0 float4 0.0 1.0 0.0 0.0
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (1.0, 1.0, 1.0, 1.0)
|
||||
uniform 0 float4 0.0 0.0 1.0 0.0
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (1.0, 1.0, 1.0, 1.0)
|
||||
uniform 0 float4 0.0 0.0 0.0 1.0
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (1.0, 1.0, 1.0, 1.0)
|
||||
uniform 0 float4 0.0 0.0 0.0 0.0
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (0.0, 0.0, 0.0, 0.0)
|
||||
uniform 0 float4 -1.0 -1.0 -1.0 -1.0
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (1.0, 1.0, 1.0, 1.0)
|
||||
|
||||
[pixel shader todo(sm<4)]
|
||||
[pixel shader]
|
||||
uniform float f;
|
||||
|
||||
float4 main() : sv_target
|
||||
@@ -39,13 +39,13 @@ float4 main() : sv_target
|
||||
|
||||
[test]
|
||||
uniform 0 float4 1.0 0.0 0.0 0.0
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (1.0, 1.0, 1.0, 1.0)
|
||||
uniform 0 float4 0.0 0.0 0.0 0.0
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (0.0, 0.0, 0.0, 0.0)
|
||||
uniform 0 float4 -1.0 0.0 0.0 0.0
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (1.0, 1.0, 1.0, 1.0)
|
||||
|
||||
|
||||
|
@@ -13,7 +13,7 @@ draw quad
|
||||
probe all rgba (8.0, 8.0, 8.0, 8.0)
|
||||
|
||||
|
||||
[pixel shader todo(sm<4)]
|
||||
[pixel shader]
|
||||
float4 a, b;
|
||||
float i;
|
||||
|
||||
@@ -26,7 +26,7 @@ float4 main() : sv_target
|
||||
uniform 0 float4 1.0 2.0 3.0 4.0
|
||||
uniform 4 float4 5.0 6.0 7.0 8.0
|
||||
uniform 8 float 2
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (10.0, 10.0, 10.0, 10.0)
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ draw quad
|
||||
probe all rgba (3.0, 3.0, 3.0, 3.0)
|
||||
|
||||
|
||||
[pixel shader todo(sm<4)]
|
||||
[pixel shader]
|
||||
float4 a;
|
||||
float i;
|
||||
|
||||
@@ -56,10 +56,10 @@ float4 main() : sv_target
|
||||
[test]
|
||||
uniform 0 float4 1.0 2.0 3.0 4.0
|
||||
uniform 4 float 0
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (4.0, 4.0, 4.0, 4.0)
|
||||
uniform 4 float 2
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (1.0, 1.0, 1.0, 1.0)
|
||||
|
||||
|
||||
@@ -82,7 +82,7 @@ draw quad
|
||||
probe all rgba (4.0, 4.0, 4.0, 4.0)
|
||||
|
||||
|
||||
[pixel shader todo(sm<4)]
|
||||
[pixel shader]
|
||||
float4 a;
|
||||
float i;
|
||||
|
||||
@@ -99,5 +99,5 @@ float4 main() : sv_target
|
||||
[test]
|
||||
uniform 0 float4 1.0 2.0 3.0 4.0
|
||||
uniform 4 float 1
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (2.0, 2.0, 2.0, 2.0)
|
||||
|
@@ -1,5 +1,5 @@
|
||||
% Check that -0.0f is not less than 0.0f
|
||||
[pixel shader todo(sm<4)]
|
||||
[pixel shader]
|
||||
float a;
|
||||
|
||||
float4 main() : sv_target
|
||||
@@ -9,7 +9,7 @@ float4 main() : sv_target
|
||||
|
||||
[test]
|
||||
uniform 0 float 0.0
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (0.0, 0.0, 0.0, 0.0)
|
||||
|
||||
|
||||
@@ -77,7 +77,7 @@ if(sm>=6) probe all rgba (1010101.0, 11110000.0, 1101001.0, 1.0)
|
||||
shader model >= 2.0
|
||||
shader model < 3.0
|
||||
|
||||
[pixel shader todo(sm<4)]
|
||||
[pixel shader]
|
||||
float4 a, b;
|
||||
|
||||
float4 main() : sv_target
|
||||
@@ -88,7 +88,7 @@ float4 main() : sv_target
|
||||
[test]
|
||||
uniform 0 float4 1e-37 1e-37 1e+38 1e+38
|
||||
uniform 4 float4 0 -1e-37 1e+38 -1e+38
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (1.0, 1.0, 1.0, 0.0)
|
||||
|
||||
|
||||
@@ -96,7 +96,7 @@ probe all rgba (1.0, 1.0, 1.0, 0.0)
|
||||
shader model >= 3.0
|
||||
shader model < 4.0
|
||||
|
||||
[pixel shader todo(sm<4)]
|
||||
[pixel shader]
|
||||
float4 a, b;
|
||||
|
||||
float4 main() : sv_target
|
||||
|
@@ -3,7 +3,7 @@
|
||||
% implementations. DXIL defines intrinsics for inverse trig, to be implemented
|
||||
% by the backend.
|
||||
|
||||
[pixel shader todo(sm<4)]
|
||||
[pixel shader]
|
||||
uniform float4 a;
|
||||
|
||||
float4 main() : sv_target
|
||||
@@ -32,7 +32,7 @@ uniform 0 float4 1.0 0.0 0.0 0.0
|
||||
todo(sm<4) draw quad
|
||||
probe all rgba (0.0, 0.0, 0.0, 0.0) 128
|
||||
|
||||
[pixel shader todo(sm<4)]
|
||||
[pixel shader]
|
||||
uniform float4 a;
|
||||
|
||||
float4 main() : sv_target
|
||||
|
@@ -108,7 +108,7 @@ draw quad
|
||||
probe all rgba (3.0, 4.0, 50.0, 60.0)
|
||||
|
||||
|
||||
[pixel shader todo(sm<4)]
|
||||
[pixel shader]
|
||||
uniform float i;
|
||||
|
||||
float4 main() : sv_target
|
||||
@@ -120,8 +120,8 @@ float4 main() : sv_target
|
||||
|
||||
[test]
|
||||
uniform 0 float 2
|
||||
todo(sm<4) draw quad
|
||||
probe all rgba (8, 9, 10, 11)
|
||||
draw quad
|
||||
todo(sm<4) probe all rgba (8, 9, 10, 11)
|
||||
|
||||
|
||||
[pixel shader todo(sm<4)]
|
||||
|
@@ -25,7 +25,7 @@ todo(sm<4) draw quad
|
||||
probe all rgba (9.0, 10.0, 11.0, 12.0)
|
||||
|
||||
|
||||
[pixel shader todo(sm<4)]
|
||||
[pixel shader]
|
||||
uniform float i;
|
||||
|
||||
float4 main() : SV_TARGET
|
||||
@@ -36,16 +36,16 @@ float4 main() : SV_TARGET
|
||||
|
||||
[test]
|
||||
uniform 0 float 0
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (11.0, 11.0, 11.0, 11.0)
|
||||
uniform 0 float 1
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (12.0, 12.0, 12.0, 12.0)
|
||||
uniform 0 float 2
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (13.0, 13.0, 13.0, 13.0)
|
||||
uniform 0 float 3
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (14.0, 14.0, 14.0, 14.0)
|
||||
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
[pixel shader todo(sm<4)]
|
||||
[pixel shader]
|
||||
uniform float4 f, p;
|
||||
|
||||
float4 main() : sv_target
|
||||
@@ -9,7 +9,7 @@ float4 main() : sv_target
|
||||
[test]
|
||||
uniform 0 float4 5.0 -2.6 3.0 2.0
|
||||
uniform 4 float4 1.0 -4.3 3.0 4.0
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (0.0, 0.0, 1.0, 1.0)
|
||||
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
% Use a uniform to prevent the compiler from optimizing.
|
||||
|
||||
[pixel shader todo(sm<4)]
|
||||
[pixel shader]
|
||||
uniform float i;
|
||||
float4 main() : SV_TARGET
|
||||
{
|
||||
@@ -12,5 +12,5 @@ float4 main() : SV_TARGET
|
||||
|
||||
[test]
|
||||
uniform 0 float 2
|
||||
todo(sm<4) draw quad
|
||||
draw quad
|
||||
probe all rgba (0.5, 0.3, 0.8, 0.2)
|
||||
|
Reference in New Issue
Block a user