This is the first part of !608, which I decided to separate to ease review.
It consists of improvements to SM1 testing, mainly: - Correctly passing int and bool uniforms as IEEE 754 floats to SM1 profiles. - The introduction of the "only" qualifier to avoid abusing `[require]` blocks in case tests retrieve different results for different shader models. - Allowing some of the tests we already have for SM4/SM6 to run in SM1 after those improvements.
From: Francisco Casas fcasas@codeweavers.com
The previous [require] block makes us skip the test for SM4. --- tests/hlsl/non-const-indexing.shader_test | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tests/hlsl/non-const-indexing.shader_test b/tests/hlsl/non-const-indexing.shader_test index b0452148e..ba60367fe 100644 --- a/tests/hlsl/non-const-indexing.shader_test +++ b/tests/hlsl/non-const-indexing.shader_test @@ -216,7 +216,11 @@ draw quad probe all rgba (1, 5, 3, 4)
-[pixel shader] +[require] +% reset requirements + + +[pixel shader todo(sm<4)] uniform float4 f[4]; uniform uint4 u; uniform uint4 v;
From: Francisco Casas fcasas@codeweavers.com
When the "only" qualifier is added to a directive, the directive is skipped if the shader->minimum_shader_model is not included in the range.
This can be used on the "probe" directives for tests that have different expected results on different shader models, without having to resort to [require] blocks. --- tests/hlsl/arithmetic-int.shader_test | 8 ++--- tests/hlsl/duplicate-modifiers.shader_test | 7 ++-- .../initializer-implicit-array.shader_test | 9 ++--- tests/hlsl/initializer-numeric.shader_test | 6 ++-- tests/hlsl/non-const-indexing.shader_test | 36 +++---------------- tests/shader_runner.c | 36 +++++++++++++++++-- 6 files changed, 47 insertions(+), 55 deletions(-)
diff --git a/tests/hlsl/arithmetic-int.shader_test b/tests/hlsl/arithmetic-int.shader_test index 46b641811..2e0dc5661 100644 --- a/tests/hlsl/arithmetic-int.shader_test +++ b/tests/hlsl/arithmetic-int.shader_test @@ -104,10 +104,9 @@ float4 main() : SV_TARGET draw quad probe all rgba (0.0, 0.0, 0.0, 0.0)
+ [require] shader model >= 4.0 -% dxcompiler performs this calculation on unsigned values and emits zero. -shader model < 6.0
[pixel shader] float4 main() : SV_TARGET @@ -120,10 +119,9 @@ float4 main() : SV_TARGET
[test] draw quad -probe all rgba (-2147483648.0, -2147483648.0, -2147483648.0, -2147483648.0) +only(sm<6) probe all rgba (-2147483648.0, -2147483648.0, -2147483648.0, -2147483648.0) +only(sm>=6) probe all rgba (0.0, 0.0, 0.0, 0.0)
-[require] -shader model >= 4.0
[pixel shader] float4 main() : sv_target diff --git a/tests/hlsl/duplicate-modifiers.shader_test b/tests/hlsl/duplicate-modifiers.shader_test index bf1d9c1b8..812c0ddd5 100644 --- a/tests/hlsl/duplicate-modifiers.shader_test +++ b/tests/hlsl/duplicate-modifiers.shader_test @@ -1,7 +1,3 @@ -% Returns (0.1, 0.3, 0.2, 0.4) with dxcompiler -[require] -shader model < 6.0 - [pixel shader] typedef const precise row_major float2x2 mat_t; float4 main() : sv_target @@ -12,4 +8,5 @@ float4 main() : sv_target
[test] draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +only(sm<6) probe all rgba (0.1, 0.2, 0.3, 0.4) +only(sm>=6) probe all rgba (0.1, 0.3, 0.2, 0.4) diff --git a/tests/hlsl/initializer-implicit-array.shader_test b/tests/hlsl/initializer-implicit-array.shader_test index 25cd15644..f220fe607 100644 --- a/tests/hlsl/initializer-implicit-array.shader_test +++ b/tests/hlsl/initializer-implicit-array.shader_test @@ -11,10 +11,6 @@ draw quad probe all rgba (50, 60, 70, 80)
-% dxcompiler emits a nop shader which returns immediately. -[require] -shader model < 6.0 - [pixel shader] float4 main() : sv_target { @@ -26,10 +22,9 @@ float4 main() : sv_target
[test] draw quad -probe all rgba (5.0, 6.0, 7.0, 8.0) +% dxcompiler emits a nop shader which returns immediately. +only(sm<6) probe all rgba (5.0, 6.0, 7.0, 8.0)
-[require] -% reset requirements
[pixel shader] float4 main() : sv_target diff --git a/tests/hlsl/initializer-numeric.shader_test b/tests/hlsl/initializer-numeric.shader_test index 617b67405..ab112a546 100644 --- a/tests/hlsl/initializer-numeric.shader_test +++ b/tests/hlsl/initializer-numeric.shader_test @@ -60,9 +60,6 @@ draw quad probe all rgba (3.0, 250.0, 16.0, 4.2949673e+009) 4
-[require] -shader model < 6.0 - [pixel shader] float4 main() : sv_target { @@ -73,4 +70,5 @@ float4 main() : sv_target
[test] draw quad -probe all rgba (-1294967296.0, 3000000000.0, 0.0, 0.0) 4 +only(sm<6) probe all rgba (-1294967296.0, 3000000000.0, 0.0, 0.0) 4 +only(sm>=6) probe all rgba (3000000000.0, 3000000000.0, 0.0, 0.0) 4 diff --git a/tests/hlsl/non-const-indexing.shader_test b/tests/hlsl/non-const-indexing.shader_test index ba60367fe..e788caeeb 100644 --- a/tests/hlsl/non-const-indexing.shader_test +++ b/tests/hlsl/non-const-indexing.shader_test @@ -236,23 +236,6 @@ float4 main() : sv_target }
% FXC is incapable of compiling this correctly, but results differ for SM1-3 vs SM4-5. -[require] -shader model < 4.0 - -[test] -uniform 0 float 1.0 -uniform 4 float 2.0 -uniform 8 float 3.0 -uniform 12 float 4.0 -uniform 16 uint4 3 1 0 2 -uniform 20 uint4 0 3 1 2 -todo draw quad -todo(sm<4) probe all rgba (1.0, 1.0, 1.0, 1.0) - -[require] -shader model >= 4.0 -shader model < 6.0 - [test] uniform 0 float 1.0 uniform 4 float 2.0 @@ -260,18 +243,7 @@ uniform 8 float 3.0 uniform 12 float 4.0 uniform 16 uint4 3 1 0 2 uniform 20 uint4 0 3 1 2 -draw quad -todo probe all rgba (4.0, 4.0, 4.0, 4.0) - -[require] -shader model >= 6.0 - -[test] -uniform 0 float 1.0 -uniform 4 float 2.0 -uniform 8 float 3.0 -uniform 12 float 4.0 -uniform 16 uint4 3 1 0 2 -uniform 20 uint4 0 3 1 2 -draw quad -probe all rgba (4.0, 3.0, 2.0, 1.0) +todo(sm<4) draw quad +only(sm<4) todo probe all rgba (1.0, 1.0, 1.0, 1.0) +only(sm>=4 & sm<6) todo probe all rgba (4.0, 4.0, 4.0, 4.0) +only(sm>=6) probe all rgba (4.0, 3.0, 2.0, 1.0) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 6c5c1dba3..23a6ddd3e 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -642,14 +642,46 @@ static void read_uint64_t2(const char **line, struct u64vec2 *v)
static void parse_test_directive(struct shader_runner *runner, const char *line) { + bool skip_directive = false; + const char *line_ini; + bool match = true; char *rest; int ret;
runner->is_todo = false;
- if (match_string_with_args(line, "todo", &line, runner->minimum_shader_model)) + while (match) { - runner->is_todo = true; + match = false; + + if (match_string_with_args(line, "todo", &line, runner->minimum_shader_model)) + { + runner->is_todo = true; + match = true; + } + + line_ini = line; + if (match_string_with_args(line, "only", &line, runner->minimum_shader_model)) + { + match = true; + } + else if (line != line_ini) + { + /* Matched "only" but for other shader models. */ + skip_directive = true; + match = true; + } + } + + if (skip_directive) + { + const char *new_line; + + if ((new_line = strchr(line, '\n'))) + line = new_line + 1; + else + line += strlen(line); + return; }
if (match_string(line, "dispatch", &line))
From: Francisco Casas fcasas@codeweavers.com
NOTE: regarding non-const-indexing.shader_test,
We probably were getting in (1.0, 1.0, 1.0, 1.0) on native because we were passing:
u: 0x00000003 0x00000001 0x00000000 0x00000002 v: 0x00000000 0x00000003 0x00000001 0x00000002
to the backend. But Direct3D expects ints in float format. This results in really small floats close or equal to zero, so when used when indexing, is if as they were 0.
Once we start passing the ints correctly formatted, the result becomes (4.0, 3.0, 2.0, 1.0), same as SM6. --- tests/hlsl/non-const-indexing.shader_test | 2 +- tests/shader_runner.c | 26 +++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/tests/hlsl/non-const-indexing.shader_test b/tests/hlsl/non-const-indexing.shader_test index e788caeeb..85a5d140c 100644 --- a/tests/hlsl/non-const-indexing.shader_test +++ b/tests/hlsl/non-const-indexing.shader_test @@ -244,6 +244,6 @@ uniform 12 float 4.0 uniform 16 uint4 3 1 0 2 uniform 20 uint4 0 3 1 2 todo(sm<4) draw quad -only(sm<4) todo probe all rgba (1.0, 1.0, 1.0, 1.0) +only(sm<4) todo probe all rgba (4.0, 3.0, 2.0, 1.0) only(sm>=4 & sm<6) todo probe all rgba (4.0, 4.0, 4.0, 4.0) only(sm>=6) probe all rgba (4.0, 3.0, 2.0, 1.0) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 23a6ddd3e..8cffe20f4 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -888,6 +888,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) } else if (match_string(line, "uniform", &line)) { + bool is_d3dbc = runner->minimum_shader_model < SHADER_MODEL_4_0; unsigned int offset;
if (!sscanf(line, "%u", &offset)) @@ -921,30 +922,55 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) else if (match_string(line, "int4", &line)) { struct ivec4 v; + struct vec4 f;
read_int4(&line, &v); + set_uniforms(runner, offset, 4, &v); + if (is_d3dbc) + { + f = (struct vec4){v.x, v.y, v.z, v.w}; + set_uniforms(runner, offset, 4, &f); + } } else if (match_string(line, "uint4", &line)) { struct uvec4 v; + struct vec4 f;
read_uint4(&line, &v); set_uniforms(runner, offset, 4, &v); + if (is_d3dbc) + { + f = (struct vec4){v.x, v.y, v.z, v.w}; + set_uniforms(runner, offset, 4, &f); + } } else if (match_string(line, "int", &line)) { + float f; int i;
read_int(&line, &i); set_uniforms(runner, offset, 1, &i); + if (is_d3dbc) + { + f = i; + set_uniforms(runner, offset, 1, &f); + } } else if (match_string(line, "uint", &line)) { unsigned int u; + float f;
read_uint(&line, &u); set_uniforms(runner, offset, 1, &u); + if (is_d3dbc) + { + f = u; + set_uniforms(runner, offset, 1, &f); + } } else if (match_string(line, "int64_t2", &line)) {
From: Francisco Casas fcasas@codeweavers.com
d3dbc expects bools to be passed as either 1.0f or 0.0f, accordingly. --- tests/hlsl/cast-to-float.shader_test | 2 +- tests/hlsl/cast-to-half.shader_test | 2 +- tests/hlsl/cast-to-int.shader_test | 2 +- tests/hlsl/cast-to-uint.shader_test | 2 +- tests/shader_runner.c | 38 ++++++++++++++++++++++++++++ 5 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/tests/hlsl/cast-to-float.shader_test b/tests/hlsl/cast-to-float.shader_test index caaf98c02..010c722a3 100644 --- a/tests/hlsl/cast-to-float.shader_test +++ b/tests/hlsl/cast-to-float.shader_test @@ -15,7 +15,7 @@ float4 main() : sv_target [test] uniform 0 int -1 uniform 1 uint 3 -uniform 2 int -2 +uniform 2 bool true uniform 3 float 0.5 draw quad probe all rgba (0.5, 0.5, 0.5, 0.5) diff --git a/tests/hlsl/cast-to-half.shader_test b/tests/hlsl/cast-to-half.shader_test index b8feb6760..44f610502 100644 --- a/tests/hlsl/cast-to-half.shader_test +++ b/tests/hlsl/cast-to-half.shader_test @@ -15,7 +15,7 @@ float4 main() : sv_target [test] uniform 0 int -1 uniform 1 uint 3 -uniform 2 int -2 +uniform 2 bool true uniform 3 float 0.5 draw quad probe all rgba (0.5, 0.5, 0.5, 0.5) diff --git a/tests/hlsl/cast-to-int.shader_test b/tests/hlsl/cast-to-int.shader_test index 3e850fb5b..7d362128b 100644 --- a/tests/hlsl/cast-to-int.shader_test +++ b/tests/hlsl/cast-to-int.shader_test @@ -21,7 +21,7 @@ float4 main() : sv_target [test] uniform 0 float 2.6 uniform 1 int -2 -uniform 2 int -2 +uniform 2 bool true uniform 3 float -3.6 draw quad probe all rgba (0.5, 0.5, 0.5, 0.5) diff --git a/tests/hlsl/cast-to-uint.shader_test b/tests/hlsl/cast-to-uint.shader_test index 07479984a..e7ad30677 100644 --- a/tests/hlsl/cast-to-uint.shader_test +++ b/tests/hlsl/cast-to-uint.shader_test @@ -21,7 +21,7 @@ float4 main() : sv_target [test] uniform 0 float 2.6 uniform 1 int 2 -uniform 2 int -2 +uniform 2 bool true uniform 3 float -3.6 draw quad probe all rgba (0.5, 0.5, 0.5, 0.5) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 8cffe20f4..873f10447 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -546,6 +546,20 @@ static void set_uniforms(struct shader_runner *runner, size_t offset, size_t cou memcpy(runner->uniforms + offset, uniforms, count * sizeof(*runner->uniforms)); }
+static void read_bool(const char **line, bool *b) +{ + const char *rest; + + if (match_string(*line, "true", &rest)) + *b = true; + else if (match_string(*line, "false", &rest)) + *b = false; + else + fatal_error("Malformed bool constant '%s'.\n", *line); + + *line = rest; +} + static void read_int(const char **line, int *i) { char *rest; @@ -972,6 +986,30 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) set_uniforms(runner, offset, 1, &f); } } + else if (match_string(line, "bool4", &line)) + { + unsigned int k; + float f; + bool b; + + for (k = 0; k < 4; ++k) + { + read_bool(&line, &b); + /* SM1-SM3 expects true to be 1.0f, while SM4-SM5 allows any non-zero value. */ + f = b; + set_uniforms(runner, offset + k, 1, &f); + } + } + else if (match_string(line, "bool", &line)) + { + float f; + bool b; + + read_bool(&line, &b); + /* SM1-SM3 expects true to be 1.0f, while SM4-SM5 allows any non-zero value. */ + f = b; + set_uniforms(runner, offset, 1, &f); + } else if (match_string(line, "int64_t2", &line)) { struct i64vec2 v;
From: Francisco Casas fcasas@codeweavers.com
These tests should actually compile and run, which is possible now that we are passing the int and uint uniforms in the expected IEEE 754 float format for SM1 shaders.
Naturally, adding some todo(sm<4) qualifiers is required. --- tests/hlsl/any.shader_test | 22 ++++---- tests/hlsl/bool-cast.shader_test | 19 ++++--- tests/hlsl/cast-to-float.shader_test | 7 ++- tests/hlsl/cast-to-half.shader_test | 7 ++- tests/hlsl/cast-to-int.shader_test | 9 ++- tests/hlsl/cast-to-uint.shader_test | 4 +- tests/hlsl/ceil.shader_test | 7 +-- tests/hlsl/floor.shader_test | 6 +- tests/hlsl/function-cast.shader_test | 4 +- tests/hlsl/ldexp.shader_test | 6 +- tests/hlsl/lerp.shader_test | 6 +- tests/hlsl/sign.shader_test | 17 +++--- tests/hlsl/switch.shader_test | 84 +++++++++++++++------------- tests/hlsl/trunc.shader_test | 6 +- 14 files changed, 106 insertions(+), 98 deletions(-)
diff --git a/tests/hlsl/any.shader_test b/tests/hlsl/any.shader_test index afaf81fac..f2d6533c3 100644 --- a/tests/hlsl/any.shader_test +++ b/tests/hlsl/any.shader_test @@ -48,10 +48,8 @@ uniform 0 float4 -1.0 0.0 0.0 0.0 todo(sm<4) draw quad probe all rgba (1.0, 1.0, 1.0, 1.0)
-[require] -shader model >= 4.0
-[pixel shader] +[pixel shader todo(sm<4)] uniform uint4 b;
float4 main() : sv_target @@ -61,25 +59,25 @@ float4 main() : sv_target
[test] uniform 0 uint4 1 1 1 1 -draw quad +todo(sm<4) draw quad probe all rgba (1.0, 1.0, 1.0, 1.0) uniform 0 uint4 1 0 0 0 -draw quad +todo(sm<4) draw quad probe all rgba (1.0, 1.0, 1.0, 1.0) uniform 0 uint4 0 1 0 0 -draw quad +todo(sm<4) draw quad probe all rgba (1.0, 1.0, 1.0, 1.0) uniform 0 uint4 0 0 1 0 -draw quad +todo(sm<4) draw quad probe all rgba (1.0, 1.0, 1.0, 1.0) uniform 0 uint4 0 0 0 1 -draw quad +todo(sm<4) draw quad probe all rgba (1.0, 1.0, 1.0, 1.0) uniform 0 uint4 0 0 0 0 -draw quad +todo(sm<4) draw quad probe all rgba (0.0, 0.0, 0.0, 0.0)
-[pixel shader] +[pixel shader todo(sm<4)] uniform uint b;
float4 main() : sv_target @@ -89,8 +87,8 @@ float4 main() : sv_target
[test] uniform 0 uint4 1 0 0 0 -draw quad +todo(sm<4) draw quad probe all rgba (1.0, 1.0, 1.0, 1.0) uniform 0 uint4 0 0 0 0 -draw quad +todo(sm<4) draw quad probe all rgba (0.0, 0.0, 0.0, 0.0) diff --git a/tests/hlsl/bool-cast.shader_test b/tests/hlsl/bool-cast.shader_test index 09ca12e2b..9b2e96df6 100644 --- a/tests/hlsl/bool-cast.shader_test +++ b/tests/hlsl/bool-cast.shader_test @@ -14,11 +14,7 @@ draw quad probe all rgba (0.0, 0.0, 1.0, 1.0)
-[require] -shader model >= 4.0 - - -[pixel shader] +[pixel shader todo(sm<4)] uniform float4 x; uniform int4 y;
@@ -30,11 +26,11 @@ float4 main() : SV_TARGET [test] uniform 0 float4 0.0 0.0 2.0 4.0 uniform 4 int4 0 1 0 10 -draw quad +todo(sm<4) draw quad probe all rgba (0.0, 10.0, 1.0, 11.0)
-[pixel shader] +[pixel shader todo(sm<4)] uniform bool4 b;
float4 main() : sv_target @@ -43,6 +39,11 @@ float4 main() : sv_target }
[test] +uniform 0 bool4 true false true false +todo(sm<4) draw quad +probe all rgba (2.0, 0.0, 2.0, 0.0) + +% true cannot be passed as an arbitrary value in SM1. uniform 0 uint4 0x00000001 0x00000002 0x80000000 0x00000000 -draw quad -probe all rgba (2.0, 2.0, 2.0, 0.0) +only(sm>=4) draw quad +only(sm>=4) probe all rgba (2.0, 2.0, 2.0, 0.0) diff --git a/tests/hlsl/cast-to-float.shader_test b/tests/hlsl/cast-to-float.shader_test index 010c722a3..6f1d9d2aa 100644 --- a/tests/hlsl/cast-to-float.shader_test +++ b/tests/hlsl/cast-to-float.shader_test @@ -1,4 +1,5 @@ [require] +% The following test doesn't work on SM1 because, on it, each uniform has the whole register. shader model >= 4.0
[pixel shader] @@ -20,8 +21,12 @@ uniform 3 float 0.5 draw quad probe all rgba (0.5, 0.5, 0.5, 0.5)
-[pixel shader]
+[require] +% reset requirements + + +[pixel shader] float4 main() : sv_target { int i = -1; diff --git a/tests/hlsl/cast-to-half.shader_test b/tests/hlsl/cast-to-half.shader_test index 44f610502..76e9c680a 100644 --- a/tests/hlsl/cast-to-half.shader_test +++ b/tests/hlsl/cast-to-half.shader_test @@ -1,4 +1,5 @@ [require] +% The following test doesn't work on SM1 because, on it, each uniform has the whole register. shader model >= 4.0
[pixel shader] @@ -20,8 +21,12 @@ uniform 3 float 0.5 draw quad probe all rgba (0.5, 0.5, 0.5, 0.5)
-[pixel shader]
+[require] +% reset requirements + + +[pixel shader] float4 main() : sv_target { int i = -1; diff --git a/tests/hlsl/cast-to-int.shader_test b/tests/hlsl/cast-to-int.shader_test index 7d362128b..302919b22 100644 --- a/tests/hlsl/cast-to-int.shader_test +++ b/tests/hlsl/cast-to-int.shader_test @@ -1,4 +1,5 @@ [require] +% The following test doesn't work on SM1 because, on it, each uniform has the whole register. shader model >= 4.0
[pixel shader] @@ -26,8 +27,11 @@ uniform 3 float -3.6 draw quad probe all rgba (0.5, 0.5, 0.5, 0.5)
-[pixel shader]
+[require] +% reset requirements + +[pixel shader] float4 main() : sv_target { float f = 2.6; @@ -45,4 +49,5 @@ float4 main() : sv_target
[test] draw quad -probe all rgba (0.5, 0.5, 0.5, 0.5) +only(sm<4) todo probe all rgba (0.5, 4.2949673e+009, 0.5, 0.5) +only(sm>=4) probe all rgba (0.5, 0.5, 0.5, 0.5) diff --git a/tests/hlsl/cast-to-uint.shader_test b/tests/hlsl/cast-to-uint.shader_test index e7ad30677..08e03049e 100644 --- a/tests/hlsl/cast-to-uint.shader_test +++ b/tests/hlsl/cast-to-uint.shader_test @@ -1,6 +1,8 @@ +% On SM1, uints can only be used with known-positive values. [require] shader model >= 4.0
+ [pixel shader] uniform float f; uniform int i; @@ -26,8 +28,8 @@ uniform 3 float -3.6 draw quad probe all rgba (0.5, 0.5, 0.5, 0.5)
-[pixel shader]
+[pixel shader] float4 main() : sv_target { float f = 2.6; diff --git a/tests/hlsl/ceil.shader_test b/tests/hlsl/ceil.shader_test index 46414a92b..0082c8f4e 100644 --- a/tests/hlsl/ceil.shader_test +++ b/tests/hlsl/ceil.shader_test @@ -37,10 +37,7 @@ uniform 0 float4 -0.5 6.5 7.5 3.4 todo(sm<4) draw quad probe all rgba (7.0, 8.0, 0.0, 4.0) 4
-[require] -shader model >= 4.0 - -[pixel shader] +[pixel shader todo(sm<4)] uniform int4 u;
float4 main() : sv_target @@ -53,5 +50,5 @@ float4 main() : sv_target
[test] uniform 0 int4 -1 6 7 3 -draw quad +todo(sm<4) draw quad probe all rgba (6.0, 7.0, -1.0, 3.0) 4 diff --git a/tests/hlsl/floor.shader_test b/tests/hlsl/floor.shader_test index 89e1f12ef..dc9e31f79 100644 --- a/tests/hlsl/floor.shader_test +++ b/tests/hlsl/floor.shader_test @@ -37,10 +37,8 @@ uniform 0 float4 -0.5 6.5 7.5 3.4 todo(sm<4) draw quad probe all rgba (6.0, 7.0, -1.0, 3.0) 4
-[require] -shader model >= 4.0
-[pixel shader] +[pixel shader todo(sm<4)] uniform int4 u;
float4 main() : sv_target @@ -53,5 +51,5 @@ float4 main() : sv_target
[test] uniform 0 int4 -1 6 7 3 -draw quad +todo(sm<4) draw quad probe all rgba (6.0, 7.0, -1.0, 3.0) 4 diff --git a/tests/hlsl/function-cast.shader_test b/tests/hlsl/function-cast.shader_test index c92289863..5d43f1ddf 100644 --- a/tests/hlsl/function-cast.shader_test +++ b/tests/hlsl/function-cast.shader_test @@ -69,8 +69,6 @@ uniform 0 float4 -1.9 -1.0 2.9 4.0 todo draw quad probe all rgba (-1.0, -1.0, 2.0, 4.0)
-[require] -shader model >= 4.0
[pixel shader todo] uniform int4 i; @@ -90,4 +88,4 @@ float4 main() : sv_target [test] uniform 0 int4 -2 0 1 -3000000 todo(sm<6) draw quad -probe all rgba (-1.0, 0.0, 1.0, -3000000.0) +probe all rgba (-1.0, 0.0, 1.0, -3000000.0) 4 diff --git a/tests/hlsl/ldexp.shader_test b/tests/hlsl/ldexp.shader_test index f8ad40d8e..3becf5f60 100644 --- a/tests/hlsl/ldexp.shader_test +++ b/tests/hlsl/ldexp.shader_test @@ -13,10 +13,8 @@ uniform 4 float4 0.0 -10.0 10.0 100.0 draw quad probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) 2
-[require] -shader model >= 4.0
-[pixel shader] +[pixel shader todo(sm<4)] uniform int4 x; uniform int4 y;
@@ -28,7 +26,7 @@ float4 main() : SV_TARGET [test] uniform 0 int4 2 3 4 5 uniform 4 int4 0 -10 10 100 -draw quad +todo(sm<4) draw quad probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) 2
diff --git a/tests/hlsl/lerp.shader_test b/tests/hlsl/lerp.shader_test index 15e90cef9..e3dbc1e89 100644 --- a/tests/hlsl/lerp.shader_test +++ b/tests/hlsl/lerp.shader_test @@ -15,10 +15,8 @@ uniform 8 float4 0.0 1.0 -1.0 0.75 draw quad probe all rgba (2.0, -10.0, -2.0, 76.25)
-[require] -shader model >= 4.0
-[pixel shader] +[pixel shader todo(sm<4)] uniform int4 x; uniform int4 y; uniform int4 s; @@ -32,7 +30,7 @@ float4 main() : SV_TARGET uniform 0 int4 2 3 4 0 uniform 4 int4 0 -10 10 1000000 uniform 8 int4 0 1 -1 1000000 -draw quad +todo(sm<4) draw quad probe all rgba (2.0, -10.0, -2.0, 1e12)
diff --git a/tests/hlsl/sign.shader_test b/tests/hlsl/sign.shader_test index 6ec5a571d..b72ec27c8 100644 --- a/tests/hlsl/sign.shader_test +++ b/tests/hlsl/sign.shader_test @@ -17,6 +17,7 @@ uniform 0 float4 0.0 0.0 0.0 0.0 todo(sm<4) draw quad probe all rgba (0.0, 0.0, 0.0, 0.0)
+ [pixel shader todo(sm<4)] uniform float4 f;
@@ -30,6 +31,7 @@ uniform 0 float4 1.0 2.0 3.0 4.0 todo(sm<4) draw quad probe all rgba (1.0, 1.0, 1.0, 1.0)
+ [pixel shader todo(sm<4)] uniform float2x2 f;
@@ -44,9 +46,6 @@ uniform 4 float4 3.0 4.0 0.0 0.0 todo(sm<4) draw quad probe all rgba (1.0, 1.0, 1.0, 1.0)
-[require] -% SM1-3 doesn't support integral types -shader model >= 4.0
[pixel shader todo(sm<4)] uniform int f; @@ -58,15 +57,16 @@ float4 main() : sv_target
[test] uniform 0 int4 1 0 0 0 -draw quad +todo(sm<4) draw quad probe all rgba (1, 1, 1, 1) uniform 0 int4 -1 0 0 0 -draw quad +todo(sm<4) draw quad probe all rgba (-1, -1, -1, -1) uniform 0 int4 0 0 0 0 -draw quad +todo(sm<4) draw quad probe all rgba (0, 0, 0, 0)
+ [pixel shader todo(sm<4)] uniform int4 f;
@@ -77,9 +77,10 @@ float4 main() : sv_target
[test] uniform 0 int4 1 2 3 4 -draw quad +todo(sm<4) draw quad probe all rgba (1, 1, 1, 1)
+ [pixel shader todo(sm<4)] uniform int2x2 f;
@@ -91,5 +92,5 @@ float4 main() : sv_target [test] uniform 0 int4 1 2 0 0 uniform 4 int4 3 4 0 0 -draw quad +todo(sm<4) draw quad probe all rgba (1, 1, 1, 1) diff --git a/tests/hlsl/switch.shader_test b/tests/hlsl/switch.shader_test index 01624f97c..7b988cd7a 100644 --- a/tests/hlsl/switch.shader_test +++ b/tests/hlsl/switch.shader_test @@ -1,7 +1,4 @@ -[require] -shader model >= 4.0 - -[pixel shader] +[pixel shader todo(sm<4)] uint4 v;
float4 main() : sv_target @@ -19,17 +16,18 @@ float4 main() : sv_target
[test] uniform 0 uint4 3 0 0 0 -draw quad +todo(sm<4) draw quad probe all rgba (5.0, 5.0, 5.0, 5.0) uniform 0 uint4 1 0 0 0 -draw quad +todo(sm<4) draw quad probe all rgba (4.0, 4.0, 4.0, 4.0) uniform 0 uint4 0 0 0 0 -draw quad +todo(sm<4) draw quad probe all rgba (3.0, 3.0, 3.0, 3.0)
+ % just a default case -[pixel shader] +[pixel shader todo(sm<4)] uint4 v;
float4 main() : sv_target @@ -43,15 +41,16 @@ float4 main() : sv_target
[test] uniform 0 uint4 3 0 0 0 -draw quad +todo(sm<4) draw quad probe all rgba (5.0, 5.0, 5.0, 5.0) uniform 0 uint4 1 0 0 0 -draw quad +todo(sm<4) draw quad probe all rgba (5.0, 5.0, 5.0, 5.0) uniform 0 uint4 0 0 0 0 -draw quad +todo(sm<4) draw quad probe all rgba (5.0, 5.0, 5.0, 5.0)
+ % completely empty [pixel shader fail] uint4 v; @@ -63,8 +62,9 @@ float4 main() : sv_target } }
+ % falling through is only supported for empty case statements -[pixel shader] +[pixel shader todo(sm<4)] uint4 v;
float4 main() : sv_target @@ -84,17 +84,18 @@ float4 main() : sv_target
[test] uniform 0 uint4 2 0 0 0 -draw quad +todo(sm<4) draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) uniform 0 uint4 1 0 0 0 -draw quad +todo(sm<4) draw quad probe all rgba (1.1, 2.0, 3.0, 4.0) uniform 0 uint4 0 0 0 0 -draw quad +todo(sm<4) draw quad probe all rgba (1.1, 2.0, 3.0, 4.0)
+ % case value evaluation -[pixel shader] +[pixel shader todo(sm<4)] uint4 v;
float4 main() : sv_target @@ -116,14 +117,15 @@ float4 main() : sv_target
[test] uniform 0 uint4 2 0 0 0 -todo(sm>=6) draw quad +todo(sm<4 | sm>=6) draw quad probe all rgba (1.1, 2.1, 3.1, 4.1) uniform 0 uint4 1 0 0 0 -todo(sm>=6) draw quad +todo(sm<4 | sm>=6) draw quad probe all rgba (1.0, 2.0, 3.0, 4.0)
+ % floats are accepted -[pixel shader fail(sm>=6)] +[pixel shader fail(sm>=6) todo(sm<4)] uint4 v;
float4 main() : sv_target @@ -145,13 +147,13 @@ float4 main() : sv_target
[test] uniform 0 uint4 2 0 0 0 -todo(sm>=6) draw quad +todo(sm<4 | sm>=6) draw quad probe all rgba (1.1, 2.1, 3.1, 4.1) uniform 0 uint4 1 0 0 0 -todo(sm>=6) draw quad +todo(sm<4 | sm>=6) draw quad probe all rgba (1.0, 2.0, 3.0, 4.0)
-[pixel shader fail(sm>=6)] +[pixel shader fail(sm<4 | sm>=6) todo(sm<4)] float4 v;
float4 main() : sv_target @@ -173,10 +175,10 @@ float4 main() : sv_target
[test] uniform 0 float4 2.0 0.0 0.0 0.0 -todo(sm>=6) draw quad +todo(sm<4 | sm>=6) draw quad probe all rgba (1.1, 2.1, 3.1, 4.1) uniform 0 float4 1.0 0.0 0.0 0.0 -todo(sm>=6) draw quad +todo(sm<4 | sm>=6) draw quad probe all rgba (1.0, 2.0, 3.0, 4.0)
[pixel shader fail] @@ -347,7 +349,7 @@ float4 main() : sv_target }
% more complicated breaks -[pixel shader] +[pixel shader todo(sm<4)] uint4 v;
float4 main() : sv_target @@ -374,17 +376,17 @@ float4 main() : sv_target
[test] uniform 0 uint4 2 0 0 0 -todo(sm>=6) draw quad +todo(sm<4 | sm>=6) draw quad probe all rgba (1.1, 2.1, 3.1, 4.1) uniform 0 uint4 1 0 0 0 -todo(sm>=6) draw quad +todo(sm<4 | sm>=6) draw quad probe all rgba (1.2, 2.2, 3.2, 4.2) uniform 0 uint4 0 0 0 0 -todo(sm>=6) draw quad +todo(sm<4 | sm>=6) draw quad probe all rgba (1.0, 2.0, 3.0, 4.0)
% switch breaks within a loop -[pixel shader] +[pixel shader todo(sm<4)] uint4 v;
float4 main() : sv_target @@ -412,11 +414,12 @@ float4 main() : sv_target
[test] uniform 0 uint4 2 0 0 0 -todo(sm>=6) draw quad +todo(sm<4 | sm>=6) draw quad probe all rgba (5.0, 6.0, 7.0, 8.0)
+ % default case placement -[pixel shader] +[pixel shader todo(sm<4)] uint4 v;
float4 main() : sv_target @@ -443,16 +446,17 @@ float4 main() : sv_target
[test] uniform 0 uint4 0 0 0 0 -todo(sm>=6) draw quad +todo(sm<4 | sm>=6) draw quad probe all rgba (4.0, 5.0, 6.0, 7.0) uniform 0 uint4 2 0 0 0 -todo(sm>=6) draw quad +todo(sm<4 | sm>=6) draw quad probe all rgba (2.0, 3.0, 4.0, 5.0) uniform 0 uint4 3 0 0 0 -todo(sm>=6) draw quad +todo(sm<4 | sm>=6) draw quad probe all rgba (4.0, 5.0, 6.0, 7.0)
-[pixel shader] + +[pixel shader todo(sm<4)] uint4 v;
float4 main() : sv_target @@ -480,13 +484,13 @@ float4 main() : sv_target
[test] uniform 0 uint4 3 0 0 0 -todo(sm>=6) draw quad +todo(sm<4 | sm>=6) draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) uniform 0 uint4 0 0 0 0 -todo(sm>=6) draw quad +todo(sm<4 | sm>=6) draw quad probe all rgba (4.0, 5.0, 6.0, 7.0) uniform 0 uint4 5 0 0 0 -todo(sm>=6) draw quad +todo(sm<4 | sm>=6) draw quad probe all rgba (1.0, 2.0, 3.0, 4.0)
% 'continue' is not supported in switches @@ -515,7 +519,7 @@ float4 main() : sv_target return c; }
-[pixel shader] +[pixel shader fail(sm<4) todo(sm<4)] uint4 v;
float4 main() : sv_target @@ -553,7 +557,7 @@ todo(sm>=6) draw quad probe all rgba (7.0, 8.0, 9.0, 10.0)
% return from a switch nested in a loop -[pixel shader] +[pixel shader fail(sm<4) todo(sm<4)] uint4 v;
float4 main() : sv_target diff --git a/tests/hlsl/trunc.shader_test b/tests/hlsl/trunc.shader_test index f1d23bf82..8ea43f67b 100644 --- a/tests/hlsl/trunc.shader_test +++ b/tests/hlsl/trunc.shader_test @@ -30,10 +30,8 @@ uniform 0 float4 -0.5 6.5 7.5 3.4 todo(sm<4) draw quad probe all rgba (6.0, 7.0, 0.0, 3.0)
-[require] -shader model >= 4.0
-[pixel shader] +[pixel shader todo(sm<4)] uniform int4 u;
float4 main() : sv_target @@ -46,5 +44,5 @@ float4 main() : sv_target
[test] uniform 0 int4 -1 6 7 3 -draw quad +todo(sm<4) draw quad probe all rgba (6.0, 7.0, -1.0, 3.0)
Part of the point of passing bools as a value other than 1 or 0 there is that it validated that sm4 was doing the right thing in flushing them to 1 and 0. Why not just flush for sm1 in the shader runner like in 3/5?
Also, regardless, I don't think we need a separate "bool" type, we can just use int or uint.
```+% The following test doesn't work on SM1 because, on it, each uniform has the whole register.```
We should just change the uniform layout then.
On Wed Jan 31 09:32:17 2024 +0000, Zebediah Figura wrote:
Part of the point of passing bools as a value other than 1 or 0 there is that it validated that sm4 was doing the right thing in flushing them to 1 and 0. Why not just flush for sm1 in the shader runner like in 3/5? Also, regardless, I don't think we need a separate "bool" type, we can just use int or uint.
Yeah, I mostly see the interface between the CPU program and the shaders as binary, not typed. Specifying a type in the `.shader_test` file is a convenience for humans, but I don't think there should be any magic happening. Rather, I'd use the `only()` syntax you just introduced to specify different inputs depending on the SM: ``` only(sm<4) uniform 0 float4 1.0 2.0 3.0 4.0 only(sm>=4) uniform 0 uint4 1 2 3 4 ```
How does that feel?
From 78ecef0ccf024fa728c952c13cf0c885c61b3a6f Mon Sep 17 00:00:00 2001 From: Francisco Casas <fcasas@codeweavers.com> Date: Mon, 29 Jan 2024 20:07:39 -0300 Subject: [PATCH 2/5] tests/shader-runner: Introduce "only" qualifier. When the "only" qualifier is added to a directive, the directive is skipped if the shader->minimum_shader_model is not included in the range. This can be used on the "probe" directives for tests that have different expected results on different shader models, without having to resort to [require] blocks.
I think most languages call that "if"? I.e.: ``` if(sm<6) probe ... if(sm>=6) probe ... ``` Not that I mind doing something different, but I suppose it might make things slightly harder to pick up for someone new to writing .shader_test's.
Some possible alternatives: ``` probe(sm<6) ... probe(sm>=6) ... ``` ``` cond (sm<6) probe ... (sm>=6) probe ... ```
On Wed Jan 31 09:32:17 2024 +0000, Giovanni Mascellani wrote:
Yeah, I mostly see the interface between the CPU program and the shaders as binary, not typed. Specifying a type in the `.shader_test` file is a convenience for humans, but I don't think there should be any magic happening. Rather, I'd use the `only()` syntax you just introduced to specify different inputs depending on the SM:
only(sm<4) uniform 0 float4 1.0 2.0 3.0 4.0 only(sm>=4) uniform 0 uint4 1 2 3 4How does that feel?
This seems reasonable to me, we just have to remember to pass bools and ints as float for sm<4, and in particular, pass `true` as `float 1.0`.
-
Francisco Casas -
Francisco Casas (＠fcasas)
-
Giovanni Mascellani (＠giomasce)
-
Henri Verbeet (＠hverbeet)
-
Zebediah Figura (＠zfigura)