tests: Stop probing all pixels when drawing a uniform colour.

This is simply unnecessary and wastes time.

As part of this, simply remove the "all" directive. Only for a couple of tests
is it even potentially interesting to validate all pixels (e.g.
nointerpolation.shader_test), and for those "all" is replaced with an explicit
(0, 0, 640, 480) rect.

In all other cases we just probe (0, 0).
This commit is contained in:
Elizabeth Figura
2024-02-10 13:16:22 -06:00
committed by Henri Verbeet
parent 021eb28584
commit d3ba810c98
Notes: Henri Verbeet 2024-06-14 00:05:14 +02:00
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/908
163 changed files with 1003 additions and 1007 deletions

View File

@@ -14,7 +14,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 1.0 2.0 3.0 4.0
todo(glsl) draw quad
probe all rgba (1.0, 2.0, 3.0, 4.0)
probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0)
[pixel shader fail(sm>=6)]
// Annotations
@@ -62,7 +62,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 1.0 2.0 3.0 4.0
todo(glsl) draw quad
probe all rgba (1.0, 2.0, 3.0, 4.0)
probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0)
[pixel shader fail(sm>=6)]
// 'single' modifier is usable when there is a variable with the same name
@@ -84,7 +84,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 1.0 2.0 3.0 4.0
todo(glsl) draw quad
probe all rgba (1.0, 2.0, 3.0, 4.0)
probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0)
[pixel shader]
typedef float4 single;
@@ -98,7 +98,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 1.0 2.0 3.0 4.0
todo(glsl) draw quad
probe all rgba (1.0, 2.0, 3.0, 4.0)
probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0)
[pixel shader fail]
typedef float4 single;
@@ -151,7 +151,7 @@ uniform 4 float4 4.0 5.0 6.0 7.0
uniform 8 float4 8.0 9.0 10.0 11.0
uniform 12 float4 12.0 13.0 14.0 15.0
todo(glsl) draw quad
probe all rgba (0.0, 2.0, 4.0, 8.0)
probe (0, 0) rgba (0.0, 2.0, 4.0, 8.0)
[pixel shader]
@@ -172,7 +172,7 @@ uniform 0 float4 0.0 1.0 2.0 3.0
uniform 4 float4 4.0 5.0 6.0 7.0
uniform 8 float4 8.0 9.0 10.0 11.0
todo(glsl) draw quad
probe all rgba (0.0, 4.0, 8.0, 9.0)
probe (0, 0) rgba (0.0, 4.0, 8.0, 9.0)
[pixel shader]
@@ -198,7 +198,7 @@ uniform 4 float4 4.0 5.0 6.0 7.0
uniform 8 float4 8.0 9.0 10.0 11.0
uniform 12 float4 12.0 13.0 14.0 15.0
todo(glsl) draw quad
probe all rgba (0.0, 4.0, 5.0, 6.0)
probe (0, 0) rgba (0.0, 4.0, 5.0, 6.0)
[pixel shader fail(sm<6)]
@@ -221,7 +221,7 @@ uniform 4 float4 2.0 0.0 0.0 0.0
uniform 8 float4 3.0 0.0 0.0 0.0
uniform 12 float4 4.0 0.0 0.0 0.0
todo(sm<6) draw quad
probe all rgba (1.0, 3.0, 3.0, 4.0)
probe (0, 0) rgba (1.0, 3.0, 3.0, 4.0)
[pixel shader]
@@ -255,7 +255,7 @@ uniform 0 float4 1.0 2.0 3.0 4.0
uniform 4 float4 5.0 6.0 7.0 8.0
uniform 8 float4 9.0 10.0 11.0 12.0
todo(glsl) draw quad
probe all rgba (509, 610, 711, 812)
probe (0, 0) rgba (509, 610, 711, 812)
[pixel shader]
@@ -283,7 +283,7 @@ uniform 4 float4 4.0 5.0 6.0 7.0
uniform 8 float4 8.0 9.0 10.0 11.0
uniform 12 float4 12.0 13.0 14.0 15.0
todo(glsl) draw quad
probe all rgba (12468.0, 13509.0, 14010.0, 15011.0)
probe (0, 0) rgba (12468.0, 13509.0, 14010.0, 15011.0)
[pixel shader]
@@ -300,7 +300,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 1.0 2.0 3.0 4.0
todo(glsl) draw quad
probe all rgba (2.0, 3.0, 2.0, 3.0)
probe (0, 0) rgba (2.0, 3.0, 2.0, 3.0)
[pixel shader fail]
@@ -405,7 +405,7 @@ uniform 0 float 1.0
uniform 1 float 2.0
uniform 4 float4 5.0 6.0 7.0 8.0
todo(glsl) draw quad
probe all rgba (512.0, 612.0, 712.0, 812.0)
probe (0, 0) rgba (512.0, 612.0, 712.0, 812.0)
[pixel shader fail(sm<6)]
@@ -436,7 +436,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 1.0 2.0 3.0 4.0
todo(glsl) draw quad
probe all rgba (3.0, 4.0, 3.0, 4.0)
probe (0, 0) rgba (3.0, 4.0, 3.0, 4.0)
[pixel shader fail]
@@ -578,7 +578,7 @@ uniform 0 float4 1.0 0.0 0.0 0.0
uniform 4 float4 0.0 2.0 0.0 0.0
uniform 8 float4 0.0 0.0 3.0 0.0
todo(glsl) draw quad
probe all rgba (1.0, 2.0, 0.0, 4.0)
probe (0, 0) rgba (1.0, 2.0, 0.0, 4.0)
% packoffset() cannot be used to specify other types of registers
@@ -628,7 +628,7 @@ float4 main() : sv_target
[test]
todo(glsl) draw quad
probe all rgba (1.0, 1.0, 1.0, 1.0)
probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0)
% Samplers cannot have packoffset(), unless register() is also specified, or they are not used.
@@ -776,7 +776,7 @@ float4 main() : sv_target
uniform 0 float4 1.0 2.0 3.0 4.0
uniform 4 float4 0.0 0.0 0.0 0.0
todo(glsl) draw quad
probe all rgba (1.0, 2.0, 3.0, 4.0)
probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0)
[pixel shader fail(sm<6)]
cbuffer buffer
@@ -822,7 +822,7 @@ float4 main() : sv_target
uniform 0 float4 1.0 2.0 3.0 4.0
uniform 4 float4 0.1 0.2 0.3 0.4
todo(glsl) draw quad
probe all rgba (1.1, 2.2, 3.3, 4.4)
probe (0, 0) rgba (1.1, 2.2, 3.3, 4.4)
[require]
@@ -859,7 +859,7 @@ uniform 8 float4 8.0 9.0 10.0 11.0
uniform 12 float4 12.0 13.0 14.0 15.0
uniform 16 float4 16.0 17.0 18.0 19.0
todo(glsl) draw quad
probe all rgba (124.0, 135.0, 146.0, 150.5)
probe (0, 0) rgba (124.0, 135.0, 146.0, 150.5)
[require]
shader model >= 5.1
@@ -904,7 +904,7 @@ float4 main() : sv_target
[test]
todo draw quad
probe all rgba (1.1, 1.1, 1.1, 1.1)
probe (0, 0) rgba (1.1, 1.1, 1.1, 1.1)
[pixel shader fail]
struct s