wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

32
tests/hlsl/majority-pragma.shader_test
View File

@@ -18,7 +18,7 @@ uniform 4 float4 0.3 0.4 0.0 0.0
uniform 8 float4 0.1 0.3 0.0 0.0
uniform 12 float4 0.2 0.4 0.0 0.0
todo(glsl) draw quad
probe all rgba (0.17, 0.39, 0.17, 0.39) 1
probe (0, 0) rgba (0.17, 0.39, 0.17, 0.39) 1
%% Test with a struct.
@@ -41,7 +41,7 @@ float4 main() : sv_target
uniform 0 float4 0.1 0.2 0.0 0.0
uniform 4 float4 0.3 0.4 0.0 0.0
todo(glsl) draw quad
probe all rgba (0.1, 0.2, 0.3, 0.4)
probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4)
%% Test with an array.
@@ -62,7 +62,7 @@ uniform 4 float4 0.0 0.0 0.0 0.0
uniform 8 float4 0.5 0.6 0.0 0.0
uniform 12 float4 0.7 0.8 0.0 0.0
todo(glsl) draw quad
probe all rgba (0.5, 0.6, 0.7, 0.8)
probe (0, 0) rgba (0.5, 0.6, 0.7, 0.8)
% The documentation claims these strings are subject to macro expansion.
@@ -91,8 +91,8 @@ float4 main() : sv_target
uniform 0 float4 0.1 0.2 0.0 0.0
uniform 4 float4 0.3 0.4 0.0 0.0
todo(glsl) draw quad
if(sm<6) probe all rgba (0.23, 0.34, 0.5, 0.5) 1
if(sm>=6) probe all rgba (0.17, 0.39, 0.5, 0.5) 1
if(sm<6) probe (0,0) rgba (0.23, 0.34, 0.5, 0.5) 1
if(sm>=6) probe (0,0) rgba (0.17, 0.39, 0.5, 0.5) 1
% The majority that applies to a typedef is the latent majority at the time
@@ -113,7 +113,7 @@ float4 main() : sv_target
uniform 0 float4 0.1 0.2 0.0 0.0
uniform 4 float4 0.3 0.4 0.0 0.0
todo(glsl) draw quad
probe all rgba (0.1, 0.2, 0.3, 0.4)
probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4)
% In fact, it's illegal to specify a contradictory majority.
@@ -151,7 +151,7 @@ uniform 4 float4 0.0 0.0 0.0 0.0
uniform 8 float4 0.0 0.0 0.0 0.0
uniform 12 float4 0.5 0.6 0.0 0.0
todo(glsl) draw quad
probe all rgba (0.3, 0.4, 0.5, 0.6)
probe (0, 0) rgba (0.3, 0.4, 0.5, 0.6)
% However, if no pack_matrix directive has been used yet, a typedef has no
@@ -175,7 +175,7 @@ float4 main() : sv_target
uniform 0 float4 0.1 0.2 0.0 0.0
uniform 4 float4 0.3 0.4 0.0 0.0
todo(glsl) draw quad
probe all rgba (0.1, 0.2, 0.3, 0.4)
probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4)
% This does not apply recursively to struct or array members, however. Members
@@ -203,7 +203,7 @@ float4 main() : sv_target
uniform 0 float4 0.2 0.4 0.0 0.0
uniform 4 float4 0.3 0.5 0.0 0.0
todo(glsl) draw quad
probe all rgba (0.2, 0.3, 0.4, 0.5)
probe (0, 0) rgba (0.2, 0.3, 0.4, 0.5)
[pixel shader]
@@ -223,7 +223,7 @@ uniform 4 float4 0.4 0.0 0.0 0.0
uniform 8 float4 0.0 0.5 0.0 0.0
uniform 12 float4 0.0 0.6 0.0 0.0
todo(glsl) draw quad
probe all rgba (0.3, 0.4, 0.5, 0.6)
probe (0, 0) rgba (0.3, 0.4, 0.5, 0.6)
% Compiler options
[require]
@@ -247,7 +247,7 @@ uniform 4 float4 0.2 0.6 1.0 1.4
uniform 8 float4 0.3 0.7 1.1 1.5
uniform 12 float4 0.4 0.8 1.2 1.6
todo(glsl) draw quad
probe all rgba (0.2, 0.3, 0.6, 0.7) 1
probe (0, 0) rgba (0.2, 0.3, 0.6, 0.7) 1
[require]
options: column-major
@@ -269,7 +269,7 @@ uniform 4 float4 0.2 0.6 1.0 1.4
uniform 8 float4 0.3 0.7 1.1 1.5
uniform 12 float4 0.4 0.8 1.2 1.6
todo(glsl) draw quad
probe all rgba (0.2, 0.3, 0.6, 0.7) 1
probe (0, 0) rgba (0.2, 0.3, 0.6, 0.7) 1
[require]
options: row-major
@@ -291,7 +291,7 @@ uniform 4 float4 0.2 0.6 1.0 1.4
uniform 8 float4 0.3 0.7 1.1 1.5
uniform 12 float4 0.4 0.8 1.2 1.6
todo(glsl) draw quad
probe all rgba (0.5, 0.9, 0.6, 1.0) 1
probe (0, 0) rgba (0.5, 0.9, 0.6, 1.0) 1
[require]
options: column-major
@@ -319,7 +319,7 @@ uniform 20 float4 1.8 2.2 2.6 3.0
uniform 24 float4 1.9 2.3 2.7 3.1
uniform 28 float4 2.0 2.4 2.8 3.2
todo(glsl) draw quad
probe all rgba (0.3, 0.4, 2.5, 2.9) 1
probe (0, 0) rgba (0.3, 0.4, 2.5, 2.9) 1
[require]
options: row-major
@@ -347,7 +347,7 @@ uniform 20 float4 1.8 2.2 2.6 3.0
uniform 24 float4 1.9 2.3 2.7 3.1
uniform 28 float4 2.0 2.4 2.8 3.2
todo(glsl) draw quad
probe all rgba (1.2, 1.6, 3.1, 3.2) 1
probe (0, 0) rgba (1.2, 1.6, 3.1, 3.2) 1
[require]
options: column-major row-major
@@ -367,4 +367,4 @@ float4 main() : sv_target
uniform 0 float4 0.1 0.2 0.0 0.0
uniform 4 float4 0.3 0.4 0.0 0.0
todo(glsl) draw quad
probe all rgba (0.1, 0.3, 0.2, 0.4) 1
probe (0, 0) rgba (0.1, 0.3, 0.2, 0.4) 1