From: Conor McCarthy cmccarthy@codeweavers.com
Test shaders do not touch upon any unimplemented features in vkd3d-shader and/or vkd3d, and vkd3d-shader should not emit incorrect SPIR-V. If a situation arises where probes are expected to fail, a 'todo' in a 'probe' line should set a different bool flag to be applied to the readback check only. --- tests/hlsl/array-index-expr.shader_test | 16 ++++++++-------- tests/hlsl/combined-samplers.shader_test | 2 +- tests/hlsl/function-return.shader_test | 10 +++++----- tests/hlsl/matrix-indexing.shader_test | 2 +- tests/hlsl/object-parameters.shader_test | 6 +++--- tests/hlsl/object-references.shader_test | 2 +- tests/hlsl/return.shader_test | 10 +++++----- tests/hlsl/swizzle-matrix.shader_test | 4 ++-- tests/shader_runner.c | 4 ++-- 9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/tests/hlsl/array-index-expr.shader_test b/tests/hlsl/array-index-expr.shader_test index 0a83080c..705e0020 100644 --- a/tests/hlsl/array-index-expr.shader_test +++ b/tests/hlsl/array-index-expr.shader_test @@ -13,16 +13,16 @@ uniform 4 float4 5.0 6.0 7.0 8.0 uniform 8 float4 9.0 10.0 11.0 12.0 uniform 12 float4 0 0 0 0 todo draw quad -todo probe all rgba (1.0, 2.0, 3.0, 4.0) +probe all rgba (1.0, 2.0, 3.0, 4.0) uniform 12 float4 1 0 0 0 todo draw quad -todo probe all rgba (5.0, 6.0, 7.0, 8.0) +probe all rgba (5.0, 6.0, 7.0, 8.0) uniform 12 float4 0 1 0 0 todo draw quad -todo probe all rgba (5.0, 6.0, 7.0, 8.0) +probe all rgba (5.0, 6.0, 7.0, 8.0) uniform 12 float4 1 1 0 0 todo draw quad -todo probe all rgba (9.0, 10.0, 11.0, 12.0) +probe all rgba (9.0, 10.0, 11.0, 12.0)
[pixel shader] @@ -87,13 +87,13 @@ float4 main() : sv_target [test] uniform 0 float4 0 0 0 0 todo draw quad -todo probe all rgba (1.0, 2.0, 3.0, 4.0) +probe all rgba (1.0, 2.0, 3.0, 4.0) uniform 0 float4 1 0 0 0 todo draw quad -todo probe all rgba (5.0, 6.0, 7.0, 8.0) +probe all rgba (5.0, 6.0, 7.0, 8.0) uniform 0 float4 0 1 0 0 todo draw quad -todo probe all rgba (5.0, 6.0, 7.0, 8.0) +probe all rgba (5.0, 6.0, 7.0, 8.0) uniform 0 float4 1 1 0 0 todo draw quad -todo probe all rgba (9.0, 10.0, 11.0, 12.0) +probe all rgba (9.0, 10.0, 11.0, 12.0) diff --git a/tests/hlsl/combined-samplers.shader_test b/tests/hlsl/combined-samplers.shader_test index 465c11cb..f9528640 100644 --- a/tests/hlsl/combined-samplers.shader_test +++ b/tests/hlsl/combined-samplers.shader_test @@ -152,4 +152,4 @@ float4 main() : sv_target
[test] todo draw quad -todo probe all rgba (10, 10, 10, 11) +probe all rgba (10, 10, 10, 11) diff --git a/tests/hlsl/function-return.shader_test b/tests/hlsl/function-return.shader_test index cbd29749..cd996c6a 100644 --- a/tests/hlsl/function-return.shader_test +++ b/tests/hlsl/function-return.shader_test @@ -296,20 +296,20 @@ uniform 0 float4 0.3 0.0 0.0 0.0 uniform 4 float4 0.0 0.0 0.0 0.0 uniform 8 float4 0.1 0.0 0.0 0.0 todo draw quad -todo probe all rgba (0.3, 0.2, 0.6, 0.6) 1 +probe all rgba (0.3, 0.2, 0.6, 0.6) 1
uniform 4 float4 0.35 0.0 0.0 0.0 todo draw quad -todo probe all rgba (0.3, 0.3, 0.6, 0.6) 1 +probe all rgba (0.3, 0.3, 0.6, 0.6) 1
uniform 8 float4 0.5 0.0 0.0 0.0 todo draw quad -todo probe all rgba (0.3, 0.5, 0.6, 0.6) 1 +probe all rgba (0.3, 0.5, 0.6, 0.6) 1
uniform 0 float4 1.0 0.0 0.0 0.0 todo draw quad -todo probe all rgba (0.3, 0.5, 0.6, 0.6) 1 +probe all rgba (0.3, 0.5, 0.6, 0.6) 1
uniform 4 float4 2.0 0.0 0.0 0.0 todo draw quad -todo probe all rgba (0.4, 0.1, 0.6, 0.6) 1 +probe all rgba (0.4, 0.1, 0.6, 0.6) 1 diff --git a/tests/hlsl/matrix-indexing.shader_test b/tests/hlsl/matrix-indexing.shader_test index a57d8fb8..7a56c085 100644 --- a/tests/hlsl/matrix-indexing.shader_test +++ b/tests/hlsl/matrix-indexing.shader_test @@ -137,4 +137,4 @@ float4 main() : sv_target [test] uniform 0 float 3 todo draw quad -todo probe all rgba (12, 13, 14, 15) +probe all rgba (12, 13, 14, 15) diff --git a/tests/hlsl/object-parameters.shader_test b/tests/hlsl/object-parameters.shader_test index c6109aef..a469542c 100644 --- a/tests/hlsl/object-parameters.shader_test +++ b/tests/hlsl/object-parameters.shader_test @@ -110,7 +110,7 @@ float4 main(struct apple input) : sv_target
[test] todo draw quad -todo probe all rgba (416.0, 416.0, 416.0, 111.0) +probe all rgba (416.0, 416.0, 416.0, 111.0)
[pixel shader todo] @@ -133,7 +133,7 @@ float4 main(struct apple input, sampler samp) : sv_target
[test] todo draw quad -todo probe all rgba (1.0, 1.0, 0.5, 0.5) +probe all rgba (1.0, 1.0, 0.5, 0.5)
[sampler 0] @@ -179,4 +179,4 @@ float4 main(struct apple input, sampler samp) : sv_target
[test] todo draw quad -todo probe all rgba (0.5, 1.0, 0.5, 1.0) +probe all rgba (0.5, 1.0, 0.5, 1.0) diff --git a/tests/hlsl/object-references.shader_test b/tests/hlsl/object-references.shader_test index 5ed4dcd6..8e3d71c4 100644 --- a/tests/hlsl/object-references.shader_test +++ b/tests/hlsl/object-references.shader_test @@ -237,4 +237,4 @@ float4 main(struct apple input) : sv_target
[test] todo draw quad -todo probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) diff --git a/tests/hlsl/return.shader_test b/tests/hlsl/return.shader_test index 9f800d1a..81c436cd 100644 --- a/tests/hlsl/return.shader_test +++ b/tests/hlsl/return.shader_test @@ -244,20 +244,20 @@ uniform 0 float4 0.3 0.0 0.0 0.0 uniform 4 float4 0.0 0.0 0.0 0.0 uniform 8 float4 0.1 0.0 0.0 0.0 todo draw quad -todo probe all rgba (0.1, 0.1, 0.1, 0.1) 1 +probe all rgba (0.1, 0.1, 0.1, 0.1) 1
uniform 4 float4 0.35 0.0 0.0 0.0 todo draw quad -todo probe all rgba (0.2, 0.2, 0.2, 0.2) 1 +probe all rgba (0.2, 0.2, 0.2, 0.2) 1
uniform 8 float4 0.5 0.0 0.0 0.0 todo draw quad -todo probe all rgba (0.4, 0.4, 0.4, 0.4) 1 +probe all rgba (0.4, 0.4, 0.4, 0.4) 1
uniform 0 float4 1.0 0.0 0.0 0.0 todo draw quad -todo probe all rgba (0.4, 0.4, 0.4, 0.4) 1 +probe all rgba (0.4, 0.4, 0.4, 0.4) 1
uniform 4 float4 2.0 0.0 0.0 0.0 todo draw quad -todo probe all rgba (0.9, 0.9, 0.9, 0.9) 1 +probe all rgba (0.9, 0.9, 0.9, 0.9) 1 diff --git a/tests/hlsl/swizzle-matrix.shader_test b/tests/hlsl/swizzle-matrix.shader_test index bc2814eb..82112858 100644 --- a/tests/hlsl/swizzle-matrix.shader_test +++ b/tests/hlsl/swizzle-matrix.shader_test @@ -170,7 +170,7 @@ float4 main() : sv_target [test] uniform 0 float4 20 30 40 -1 todo draw quad -todo probe all rgba (10.0, 20.0, 30.0, 40.0) +probe all rgba (10.0, 20.0, 30.0, 40.0)
[pixel shader todo] @@ -188,7 +188,7 @@ float4 main() : sv_target [test] uniform 0 float4 20 30 80 -1 todo draw quad -todo probe all rgba (80.0, 30.0, 20.0, 10.0) +probe all rgba (80.0, 30.0, 20.0, 10.0)
% Cannot repeat components when assigning to a swizzle. diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 1312c44b..7d73094b 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -663,7 +663,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) fatal_error("Malformed probe arguments '%s'.\n", line); if (ret < 5) ulps = 0; - todo_if(runner->is_todo) check_readback_data_vec4(rb, &rect, &v, ulps); + check_readback_data_vec4(rb, &rect, &v, ulps); } else if (match_string(line, "r", &line)) { @@ -674,7 +674,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) fatal_error("Malformed probe arguments '%s'.\n", line); if (ret < 2) ulps = 0; - todo_if(runner->is_todo) check_readback_data_float(rb, &rect, expect, ulps); + check_readback_data_float(rb, &rect, expect, ulps); } else {