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

@@ -13,10 +13,10 @@ uniform 0 float4 0.5 -0.1 0.2 0.3
uniform 4 float4 0.6 0.4 -0.3 1.0
uniform 8 float 0.2
todo(glsl) draw quad
probe all rgba (-0.550931, -0.453954, 0.3654653, -1.0248856) 32
probe (0, 0) rgba (-0.550931, -0.453954, 0.3654653, -1.0248856) 32
uniform 8 float 100.0
todo(glsl) draw quad
probe all rgba (0.0, 0.0, 0.0, 0.0)
probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0)
[pixel shader]
float4 r;
@@ -35,10 +35,10 @@ uniform 0 float4 0.5 -0.1 0.2 0.3
uniform 4 float4 0.6 0.4 -0.3 1.0
uniform 8 float 0.2
todo(sm<4 | glsl) draw quad
probe all rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32
probe (0, 0) rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32
uniform 8 float 100.0
todo(sm<4 | glsl) draw quad
probe all rgba (0.0, 0.0, 0.0, 0.0)
probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0)
[pixel shader]
float4 r;
@@ -56,10 +56,10 @@ uniform 0 float4 0.5 -0.1 0.2 0.3
uniform 4 float4 0.6 0.4 -0.3 1.0
uniform 8 float 0.2
todo(sm<4 | glsl) draw quad
probe all rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32
probe (0, 0) rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32
uniform 8 float 100.0
todo(sm<4 | glsl) draw quad
probe all rgba (0.0, 0.0, 0.0, 0.0)
probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0)
[pixel shader]
float4 r;
@@ -77,10 +77,10 @@ uniform 0 float4 0.5 -0.1 0.2 0.3
uniform 4 float4 0.6 0.4 -0.3 1.0
uniform 8 float 0.2
todo(sm<4 | glsl) draw quad
probe all rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32
probe (0, 0) rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32
uniform 8 float 100.0
todo(sm<4 | glsl) draw quad
probe all rgba (0.0, 0.0, 0.0, 0.0)
probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0)
[pixel shader]
float4 r;
@@ -99,10 +99,10 @@ uniform 0 float4 0.5 -0.1 0.2 0.3
uniform 4 float4 0.6 0.4 -0.3 1.0
uniform 8 float 0.2
todo(glsl) draw quad
probe all rgba (-0.524978, 0.0, 0.0, 0.0) 32
probe (0, 0) rgba (-0.524978, 0.0, 0.0, 0.0) 32
uniform 8 float 100.0
todo(glsl) draw quad
probe all rgba (0.0, 0.0, 0.0, 0.0)
probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0)
[pixel shader]
float4 r;
@@ -119,10 +119,10 @@ uniform 0 float4 0.5 -0.1 0.2 0.3
uniform 4 float4 0.6 0.4 -0.3 1.0
uniform 8 float 0.2
todo(glsl) draw quad
probe all rgba (-0.5562381, -0.6762381, -0.6162381, -0.5962381) 32
probe (0, 0) rgba (-0.5562381, -0.6762381, -0.6162381, -0.5962381) 32
uniform 8 float 100.0
todo(glsl) draw quad
probe all rgba (0.0, 0.0, 0.0, 0.0)
probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0)
[pixel shader fail(sm>=6)]
float4 r;
@@ -139,10 +139,10 @@ uniform 0 float4 0.5 -0.1 0.2 0.3
uniform 4 float4 0.6 0.4 -0.3 1.0
uniform 8 float4 0.2 0.3 0.4 0.5
if(sm<6) todo(glsl) draw quad
if(sm<6) probe all rgba (-0.550931, -0.453954, 0.3654653, -1.0248856) 32
if(sm<6) probe (0,0) rgba (-0.550931, -0.453954, 0.3654653, -1.0248856) 32
uniform 8 float 100.0
if(sm<6) todo(glsl) draw quad
if(sm<6) probe all rgba (0.0, 0.0, 0.0, 0.0)
if(sm<6) probe (0,0) rgba (0.0, 0.0, 0.0, 0.0)
[pixel shader fail]
float4x1 r;
@@ -229,5 +229,5 @@ float4 main() : sv_target
[test]
todo(sm<6) draw quad
if(sm<6) probe all rgba (2.0, 1.0, 1.0, 1.0)
if(sm>=6) probe all rgba (1.0, 1.0, 1.0, 1.0)
if(sm<6) probe (0,0) rgba (2.0, 1.0, 1.0, 1.0)
if(sm>=6) probe (0,0) rgba (1.0, 1.0, 1.0, 1.0)