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

@@ -24,7 +24,7 @@ float4 main() : sv_target
uniform 0 float4 0.1 0.2 0.3 0.4
uniform 4 float4 1.1 1.2 1.3 1.4
todo(glsl) draw quad
probe all rgba (1.1, 1.4, 0.2, 0.3)
probe (0, 0) rgba (1.1, 1.4, 0.2, 0.3)
[pixel shader]
@@ -43,7 +43,7 @@ uniform 8 float4 2.1 2.2 2.3 2.4
uniform 12 float4 3.1 3.2 3.3 3.4
uniform 16 float4 4.1 4.2 4.3 4.4
todo(glsl) draw quad
probe all rgba (4.1, 4.2, 1.3, 1.4)
probe (0, 0) rgba (4.1, 4.2, 1.3, 1.4)
[require]
@@ -64,7 +64,7 @@ uniform 4 float4 1.1 1.2 1.3 1.4
uniform 8 float4 2.1 2.2 2.3 2.4
uniform 12 float4 3.1 3.2 3.3 3.4
draw quad
probe all rgba (2.1, 0.1, 0.0, 0.0)
probe (0, 0) rgba (2.1, 0.1, 0.0, 0.0)
[require]
@@ -85,7 +85,7 @@ uniform 4 float4 1.1 1.2 1.3 1.4
uniform 8 float4 2.1 2.2 2.3 2.4
uniform 12 float4 3.1 3.2 3.3 3.4
todo(glsl) draw quad
probe all rgba (2.1, 2.2, 0.0, 0.0)
probe (0, 0) rgba (2.1, 2.2, 0.0, 0.0)
[require]
@@ -106,7 +106,7 @@ uniform 0 float4 0.1 0.2 0.3 0.4
uniform 4 float4 1.1 1.2 1.3 1.4
uniform 8 float4 2.1 2.2 2.3 2.4
draw quad
probe all rgba (2.1, 2.2, 2.2, 2.3)
probe (0, 0) rgba (2.1, 2.2, 2.2, 2.3)
% Results differ between SM1 and SM4 because in the latter variables can share the same register,
@@ -132,7 +132,7 @@ uniform 4 float4 1.1 1.2 1.3 1.4
uniform 8 float4 2.1 2.2 2.3 2.4
uniform 12 float4 3.1 3.2 3.3 3.4
draw quad
probe all rgba (2.1, 2.2, 3.1, 0.0)
probe (0, 0) rgba (2.1, 2.2, 3.1, 0.0)
[require]
@@ -156,7 +156,7 @@ uniform 4 float4 1.1 1.2 1.3 1.4
uniform 8 float4 2.1 2.2 2.3 2.4
uniform 12 float4 3.1 3.2 3.3 3.4
todo(glsl) draw quad
probe all rgba (2.1, 2.2, 2.3, 0.0)
probe (0, 0) rgba (2.1, 2.2, 2.3, 0.0)
[pixel shader]
@@ -175,7 +175,7 @@ float4 main() : sv_target
uniform 0 float 100
uniform 4 float 101
todo(glsl) draw quad
probe all rgba (100, 100, 100, 100)
probe (0, 0) rgba (100, 100, 100, 100)
[pixel shader fail(sm>=6)]
@@ -189,7 +189,7 @@ float4 main(uniform float a : register(c1)) : sv_target
uniform 0 float 100
uniform 4 float 101
todo(glsl) draw quad
probe all rgba (100, 100, 100, 100)
probe (0, 0) rgba (100, 100, 100, 100)
[pixel shader todo]
cbuffer c
@@ -209,7 +209,7 @@ uniform 0 float 200
uniform 4 float 201
uniform 8 float 202
todo(sm<6) draw quad
todo(sm<6) probe all rgba (201.0, 202.0, 0.0, 0.0)
todo(sm<6) probe (0,0) rgba (201.0, 202.0, 0.0, 0.0)
[pixel shader fail(sm<4)]