From: Zebediah Figura zfigura@codeweavers.com
Signed-off-by: Giovanni Mascellani gmascellani@codeweavers.com --- Makefile.am | 37 +---------------- tests/arithmetic-float.shader_test | 2 +- tests/arithmetic-int.shader_test | 4 +- tests/cast-to-float.shader_test | 2 +- tests/cast-to-half.shader_test | 2 +- tests/cast-to-int.shader_test | 2 +- tests/cast-to-uint.shader_test | 4 +- tests/hlsl-array-dimension.shader_test | 2 +- tests/hlsl-duplicate-modifiers.shader_test | 2 +- tests/hlsl-for.shader_test | 2 +- tests/hlsl-function-cast.shader_test | 8 ++-- tests/hlsl-function-overload.shader_test | 2 +- tests/hlsl-function.shader_test | 4 +- tests/hlsl-gather.shader_test | 2 +- tests/hlsl-initializer-flatten.shader_test | 10 ++--- ...-initializer-invalid-arg-count.shader_test | 4 +- .../hlsl-initializer-local-array.shader_test | 4 +- tests/hlsl-initializer-nested.shader_test | 6 +-- tests/hlsl-initializer-numeric.shader_test | 8 ++-- .../hlsl-initializer-static-array.shader_test | 4 +- tests/hlsl-initializer-struct.shader_test | 6 +-- tests/hlsl-intrinsic-override.shader_test | 4 +- tests/hlsl-majority-pragma.shader_test | 2 +- tests/hlsl-majority-typedef.shader_test | 2 +- tests/hlsl-mul.shader_test | 36 ++++++++--------- ...numeric-constructor-truncation.shader_test | 2 +- tests/hlsl-numeric-types.shader_test | 4 +- ...lsl-return-implicit-conversion.shader_test | 28 ++++++------- tests/hlsl-return-void.shader_test | 2 +- tests/hlsl-shape.shader_test | 40 +++++++++---------- tests/hlsl-static-initializer.shader_test | 2 +- tests/hlsl-storage-qualifiers.shader_test | 2 +- .../hlsl-vector-indexing-uniform.shader_test | 2 +- tests/hlsl-vector-indexing.shader_test | 2 +- tests/logic-operations.shader_test | 24 +++++------ tests/sampler-offset.shader_test | 6 +-- tests/trigonometry.shader_test | 2 +- 37 files changed, 121 insertions(+), 156 deletions(-)
diff --git a/Makefile.am b/Makefile.am index e2a35576..d57ea2b7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -317,43 +317,8 @@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner XFAIL_TESTS = \ - tests/arithmetic-float.shader_test \ - tests/arithmetic-int.shader_test \ - tests/cast-to-float.shader_test \ - tests/cast-to-half.shader_test \ - tests/cast-to-int.shader_test \ - tests/cast-to-uint.shader_test \ - tests/hlsl-array-dimension.shader_test \ - tests/hlsl-initializer-flatten.shader_test \ - tests/hlsl-initializer-invalid-arg-count.shader_test \ - tests/hlsl-initializer-local-array.shader_test \ - tests/hlsl-initializer-nested.shader_test \ - tests/hlsl-initializer-numeric.shader_test \ - tests/hlsl-initializer-static-array.shader_test \ - tests/hlsl-initializer-struct.shader_test \ - tests/hlsl-duplicate-modifiers.shader_test \ - tests/hlsl-for.shader_test \ tests/hlsl-function.shader_test \ - tests/hlsl-function-cast.shader_test \ - tests/hlsl-function-overload.shader_test \ - tests/hlsl-gather.shader_test \ - tests/hlsl-intrinsic-override.shader_test \ - tests/hlsl-majority-pragma.shader_test \ - tests/hlsl-majority-typedef.shader_test \ - tests/hlsl-mul.shader_test \ - tests/hlsl-numeric-constructor-truncation.shader_test \ - tests/hlsl-numeric-types.shader_test \ - tests/hlsl-return-implicit-conversion.shader_test \ - tests/hlsl-return-void.shader_test \ - tests/hlsl-shape.shader_test \ - tests/hlsl-static-initializer.shader_test \ - tests/hlsl-storage-qualifiers.shader_test \ - tests/hlsl-vector-indexing.shader_test \ - tests/hlsl-vector-indexing-uniform.shader_test \ - tests/logic-operations.shader_test \ - tests/max.shader_test \ - tests/sampler-offset.shader_test \ - tests/trigonometry.shader_test + tests/hlsl-return-implicit-conversion.shader_test endif
EXTRA_DIST += $(vkd3d_shader_tests) diff --git a/tests/arithmetic-float.shader_test b/tests/arithmetic-float.shader_test index dcda1bcf..d55dc9d4 100644 --- a/tests/arithmetic-float.shader_test +++ b/tests/arithmetic-float.shader_test @@ -21,5 +21,5 @@ float4 main() : SV_TARGET }
[test] -draw quad +todo draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) diff --git a/tests/arithmetic-int.shader_test b/tests/arithmetic-int.shader_test index 959f9403..5d9cc029 100644 --- a/tests/arithmetic-int.shader_test +++ b/tests/arithmetic-int.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET }
[test] -draw quad +todo draw quad probe all rgba (20.0, -10.0, 75.0, 0.0)
[pixel shader] @@ -21,5 +21,5 @@ float4 main() : SV_TARGET }
[test] -draw quad +todo draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) diff --git a/tests/cast-to-float.shader_test b/tests/cast-to-float.shader_test index f0910020..1844b1f3 100644 --- a/tests/cast-to-float.shader_test +++ b/tests/cast-to-float.shader_test @@ -12,7 +12,7 @@ uniform 0 int -1 uniform 1 uint 3 uniform 2 int -2 uniform 3 float 0.5 -draw quad +todo draw quad probe all rgba (0.5, 0.5, 0.5, 0.5)
[pixel shader] diff --git a/tests/cast-to-half.shader_test b/tests/cast-to-half.shader_test index 81d6bc5d..ffae9556 100644 --- a/tests/cast-to-half.shader_test +++ b/tests/cast-to-half.shader_test @@ -13,7 +13,7 @@ uniform 0 int -1 uniform 1 uint 3 uniform 2 int -2 uniform 3 float 0.5 -draw quad +todo draw quad probe all rgba (0.5, 0.5, 0.5, 0.5)
[pixel shader] diff --git a/tests/cast-to-int.shader_test b/tests/cast-to-int.shader_test index fe8c79a3..ce42827b 100644 --- a/tests/cast-to-int.shader_test +++ b/tests/cast-to-int.shader_test @@ -19,7 +19,7 @@ uniform 0 float 2.6 uniform 1 int -2 uniform 2 int -2 uniform 3 float -3.6 -draw quad +todo draw quad probe all rgba (0.5, 0.5, 0.5, 0.5)
[pixel shader] diff --git a/tests/cast-to-uint.shader_test b/tests/cast-to-uint.shader_test index 93862a36..8b7964ff 100644 --- a/tests/cast-to-uint.shader_test +++ b/tests/cast-to-uint.shader_test @@ -19,7 +19,7 @@ uniform 0 float 2.6 uniform 1 int 2 uniform 2 int -2 uniform 3 float -3.6 -draw quad +todo draw quad probe all rgba (0.5, 0.5, 0.5, 0.5)
[pixel shader] @@ -41,4 +41,4 @@ float4 main() : sv_target
[test] draw quad -probe all rgba (0.5, 0.5, 0.5, 0.5) +todo probe all rgba (0.5, 0.5, 0.5, 0.5) diff --git a/tests/hlsl-array-dimension.shader_test b/tests/hlsl-array-dimension.shader_test index 469d36bf..89aae017 100644 --- a/tests/hlsl-array-dimension.shader_test +++ b/tests/hlsl-array-dimension.shader_test @@ -13,5 +13,5 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.1, 0.1, 0.2, 0.4) diff --git a/tests/hlsl-duplicate-modifiers.shader_test b/tests/hlsl-duplicate-modifiers.shader_test index 6491701a..fcae12da 100644 --- a/tests/hlsl-duplicate-modifiers.shader_test +++ b/tests/hlsl-duplicate-modifiers.shader_test @@ -7,5 +7,5 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.1, 0.2, 0.3, 0.4) diff --git a/tests/hlsl-for.shader_test b/tests/hlsl-for.shader_test index 4e91ce41..4e5048c3 100644 --- a/tests/hlsl-for.shader_test +++ b/tests/hlsl-for.shader_test @@ -22,7 +22,7 @@ float4 main(float tex : texcoord) : sv_target }
[test] -draw quad +todo draw quad probe rect rgba ( 0, 0, 159, 480) (10.0, 35.0, 0.0, 0.0) probe rect rgba (161, 0, 479, 480) (10.0, 38.0, 0.0, 0.0) probe rect rgba (481, 0, 640, 480) ( 5.0, 10.0, 0.0, 0.0) diff --git a/tests/hlsl-function-cast.shader_test b/tests/hlsl-function-cast.shader_test index 41c452e5..ae6d1499 100644 --- a/tests/hlsl-function-cast.shader_test +++ b/tests/hlsl-function-cast.shader_test @@ -18,7 +18,7 @@ float4 main() : sv_target
[test] uniform 0 float4 -1.9 -1.0 2.9 4.0 -draw quad +todo draw quad probe all rgba (-1.0, -1.0, 2.0, 4.0)
% As above, but cast "x" to float4 first. @@ -41,7 +41,7 @@ float4 main() : sv_target
[test] uniform 0 float4 -1.9 -1.0 2.9 4.0 -draw quad +todo draw quad probe all rgba (-1.0, -1.0, 2.0, 4.0)
% As above, but declare "x" as float4 and cast it to int4. @@ -64,7 +64,7 @@ float4 main() : sv_target
[test] uniform 0 float4 -1.9 -1.0 2.9 4.0 -draw quad +todo draw quad probe all rgba (-1.0, -1.0, 2.0, 4.0)
[require] @@ -86,5 +86,5 @@ float4 main(uniform int4 i) : sv_target
[test] uniform 0 int4 -2 0 1 -3000000 -draw quad +todo draw quad probe all rgba (-1.0, 0.0, 1.0, -3000000.0) diff --git a/tests/hlsl-function-overload.shader_test b/tests/hlsl-function-overload.shader_test index c6e0ccfe..2410cecc 100644 --- a/tests/hlsl-function-overload.shader_test +++ b/tests/hlsl-function-overload.shader_test @@ -36,5 +36,5 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.1, 0.2, 0.1, 0.2) diff --git a/tests/hlsl-function.shader_test b/tests/hlsl-function.shader_test index 8d17605b..586f1ab7 100644 --- a/tests/hlsl-function.shader_test +++ b/tests/hlsl-function.shader_test @@ -139,7 +139,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.5, 0.6, 0.7, 0)
[pixel shader] @@ -160,5 +160,5 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.6, 0.1, 0.5, 0) diff --git a/tests/hlsl-gather.shader_test b/tests/hlsl-gather.shader_test index 57af23d0..be717cd9 100644 --- a/tests/hlsl-gather.shader_test +++ b/tests/hlsl-gather.shader_test @@ -83,7 +83,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.1, 0.1, 0.0, 0.0)
diff --git a/tests/hlsl-initializer-flatten.shader_test b/tests/hlsl-initializer-flatten.shader_test index 6b35c6b7..439ead5e 100644 --- a/tests/hlsl-initializer-flatten.shader_test +++ b/tests/hlsl-initializer-flatten.shader_test @@ -6,7 +6,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (1, 2, 3, 4)
@@ -24,7 +24,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (4, 5, 6, 7)
@@ -37,7 +37,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (40, 10, 20, 30)
@@ -56,7 +56,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (1.0, 2.0, 3.0, 4.0)
@@ -69,5 +69,5 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) diff --git a/tests/hlsl-initializer-invalid-arg-count.shader_test b/tests/hlsl-initializer-invalid-arg-count.shader_test index 4332fbe8..acd449af 100644 --- a/tests/hlsl-initializer-invalid-arg-count.shader_test +++ b/tests/hlsl-initializer-invalid-arg-count.shader_test @@ -10,7 +10,7 @@ float4 main() : sv_target
[test] draw quad -probe all rgba (17, 18, 19, 20) +todo probe all rgba (17, 18, 19, 20)
[pixel shader fail] @@ -57,7 +57,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (22, 23, 24, 25)
diff --git a/tests/hlsl-initializer-local-array.shader_test b/tests/hlsl-initializer-local-array.shader_test index 0862d4c9..13670dc6 100644 --- a/tests/hlsl-initializer-local-array.shader_test +++ b/tests/hlsl-initializer-local-array.shader_test @@ -11,7 +11,7 @@ float4 main() : SV_TARGET
[test] draw quad -probe all rgba (21, 22, 23, 24) +todo probe all rgba (21, 22, 23, 24)
[pixel shader] @@ -32,4 +32,4 @@ float4 main() : SV_TARGET
[test] draw quad -probe all rgba (71, 72, 73, 74) +todo probe all rgba (71, 72, 73, 74) diff --git a/tests/hlsl-initializer-nested.shader_test b/tests/hlsl-initializer-nested.shader_test index b00259c9..0204afc9 100644 --- a/tests/hlsl-initializer-nested.shader_test +++ b/tests/hlsl-initializer-nested.shader_test @@ -6,7 +6,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (1, 2, 3, 4)
@@ -24,7 +24,7 @@ float4 main() : sv_target
[test] draw quad -probe all rgba (21, 22, 23, 24) +todo probe all rgba (21, 22, 23, 24)
[pixel shader] @@ -52,5 +52,5 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (21, 22, 23, 24) diff --git a/tests/hlsl-initializer-numeric.shader_test b/tests/hlsl-initializer-numeric.shader_test index 40576887..92117591 100644 --- a/tests/hlsl-initializer-numeric.shader_test +++ b/tests/hlsl-initializer-numeric.shader_test @@ -6,7 +6,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) 4
@@ -18,7 +18,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) 4
@@ -31,7 +31,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) 4
@@ -44,5 +44,5 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (10.1, 1.1, 1.2, 2.1) 4 diff --git a/tests/hlsl-initializer-static-array.shader_test b/tests/hlsl-initializer-static-array.shader_test index 57733502..f276c629 100644 --- a/tests/hlsl-initializer-static-array.shader_test +++ b/tests/hlsl-initializer-static-array.shader_test @@ -12,7 +12,7 @@ float4 main() : SV_TARGET
[test] draw quad -probe all rgba (21, 22, 23, 24) +todo probe all rgba (21, 22, 23, 24)
[pixel shader] @@ -34,4 +34,4 @@ float4 main() : SV_TARGET
[test] draw quad -probe all rgba (61, 62, 63, 64) +todo probe all rgba (61, 62, 63, 64) diff --git a/tests/hlsl-initializer-struct.shader_test b/tests/hlsl-initializer-struct.shader_test index f4028b5b..2a824e23 100644 --- a/tests/hlsl-initializer-struct.shader_test +++ b/tests/hlsl-initializer-struct.shader_test @@ -22,7 +22,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (41, 42, 43, 44)
@@ -52,7 +52,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (4311, 4312, 4313, 4314)
@@ -80,5 +80,5 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (21, 22, 23, 24) diff --git a/tests/hlsl-intrinsic-override.shader_test b/tests/hlsl-intrinsic-override.shader_test index 55a23f21..a47f8176 100644 --- a/tests/hlsl-intrinsic-override.shader_test +++ b/tests/hlsl-intrinsic-override.shader_test @@ -11,7 +11,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.3, 0.3, 0.4, 0.6)
[pixel shader] @@ -27,5 +27,5 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.3, 0.3, 0.3, 0.4) diff --git a/tests/hlsl-majority-pragma.shader_test b/tests/hlsl-majority-pragma.shader_test index e7fc75cd..a9f917ff 100644 --- a/tests/hlsl-majority-pragma.shader_test +++ b/tests/hlsl-majority-pragma.shader_test @@ -17,5 +17,5 @@ uniform 0 float4 0.1 0.2 0.0 0.0 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 -draw quad +todo draw quad probe all rgba (0.17, 0.39, 0.17, 0.39) 1 diff --git a/tests/hlsl-majority-typedef.shader_test b/tests/hlsl-majority-typedef.shader_test index 1460e9a0..192c96db 100644 --- a/tests/hlsl-majority-typedef.shader_test +++ b/tests/hlsl-majority-typedef.shader_test @@ -18,5 +18,5 @@ uniform 0 float4 0.1 0.2 0.0 0.0 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 -draw quad +todo draw quad probe all rgba (0.17, 0.39, 0.17, 0.39) 1 diff --git a/tests/hlsl-mul.shader_test b/tests/hlsl-mul.shader_test index 7b453187..1d137e69 100644 --- a/tests/hlsl-mul.shader_test +++ b/tests/hlsl-mul.shader_test @@ -12,7 +12,7 @@ float4 main(float4 pos : sv_position) : sv_target }
[test] -draw quad +todo draw quad probe all rgba (30.0, 70.0, 110.0, 150.0)
[pixel shader] @@ -28,7 +28,7 @@ float4 main(float4 pos : sv_position) : sv_target }
[test] -draw quad +todo draw quad probe all rgba (90.0, 100.0, 110.0, 120.0)
[pixel shader] @@ -44,7 +44,7 @@ float4 main(float4 pos : sv_position) : sv_target }
[test] -draw quad +todo draw quad probe all rgba (14.0, 38.0, 62.0, 86.0)
[pixel shader] @@ -60,7 +60,7 @@ float4 main(float4 pos : sv_position) : sv_target }
[test] -draw quad +todo draw quad probe all rgba (38.0, 44.0, 50.0, 56.0)
[pixel shader] @@ -75,7 +75,7 @@ float4 main(float4 pos : sv_position) : sv_target }
[test] -draw quad +todo draw quad probe all rgba (14.0, 32.0, 50.0, 0.0)
[pixel shader] @@ -90,7 +90,7 @@ float4 main(float4 pos : sv_position) : sv_target }
[test] -draw quad +todo draw quad probe all rgba (30.0, 36.0, 42.0, 0.0)
[pixel shader] @@ -106,7 +106,7 @@ float4 main(float4 pos : sv_position) : sv_target }
[test] -draw quad +todo draw quad probe all rgba (50.0, 60.0, 70.0, 80.0)
[pixel shader] @@ -122,7 +122,7 @@ float4 main(float4 pos : sv_position) : sv_target }
[test] -draw quad +todo draw quad probe all rgba (50.0, 60.0, 70.0, 80.0)
[pixel shader] @@ -138,7 +138,7 @@ float4 main(float4 pos : sv_position) : sv_target }
[test] -draw quad +todo draw quad probe all rgba (10.0, 20.0, 30.0, 40.0)
[pixel shader] @@ -154,7 +154,7 @@ float4 main(float4 pos : sv_position) : sv_target }
[test] -draw quad +todo draw quad probe all rgba (10.0, 50.0, 90.0, 130.0)
[pixel shader] @@ -170,7 +170,7 @@ float4 main(float4 pos : sv_position) : sv_target }
[test] -draw quad +todo draw quad probe all rgba (10.0, 20.0, 30.0, 40.0)
[pixel shader] @@ -186,7 +186,7 @@ float4 main(float4 pos : sv_position) : sv_target }
[test] -draw quad +todo draw quad probe all rgba (10.0, 50.0, 90.0, 130.0)
[pixel shader] @@ -202,7 +202,7 @@ float4 main(float4 pos : sv_position) : sv_target }
[test] -draw quad +todo draw quad probe all rgba (90.0, 100.0, 110.0, 120.0)
[pixel shader] @@ -218,7 +218,7 @@ float4 main(float4 pos : sv_position) : sv_target }
[test] -draw quad +todo draw quad probe all rgba (5.0, 10.0, 15.0, 20.0)
[pixel shader] @@ -234,7 +234,7 @@ float4 main(float4 pos : sv_position) : sv_target }
[test] -draw quad +todo draw quad probe all rgba (2.0, 4.0, 6.0, 8.0)
[pixel shader] @@ -250,7 +250,7 @@ float4 main(float4 pos : sv_position) : sv_target }
[test] -draw quad +todo draw quad probe all rgba (30.0, 70.0, 110.0, 150.0)
[pixel shader] @@ -268,7 +268,7 @@ float4 main(float4 pos : sv_position) : sv_target }
[test] -draw quad +todo draw quad probe all rgba (83.0, 98.0, 113.0, 128.0)
[pixel shader] @@ -286,5 +286,5 @@ float4 main(float4 pos : sv_position) : sv_target }
[test] -draw quad +todo draw quad probe all rgba (78.0, 96.0, 114.0, 0.0) diff --git a/tests/hlsl-numeric-constructor-truncation.shader_test b/tests/hlsl-numeric-constructor-truncation.shader_test index f18b34d6..27768dcc 100644 --- a/tests/hlsl-numeric-constructor-truncation.shader_test +++ b/tests/hlsl-numeric-constructor-truncation.shader_test @@ -29,5 +29,5 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (1.0, 2.0, 3.0, 5.0) diff --git a/tests/hlsl-numeric-types.shader_test b/tests/hlsl-numeric-types.shader_test index 7504f95a..58612191 100644 --- a/tests/hlsl-numeric-types.shader_test +++ b/tests/hlsl-numeric-types.shader_test @@ -56,7 +56,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (5.0, 6.0, 7.0, 8.0)
[pixel shader] @@ -68,7 +68,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (5.0, 6.0, 7.0, 0.0)
[pixel shader fail] diff --git a/tests/hlsl-return-implicit-conversion.shader_test b/tests/hlsl-return-implicit-conversion.shader_test index 654b51cf..4c07cf84 100644 --- a/tests/hlsl-return-implicit-conversion.shader_test +++ b/tests/hlsl-return-implicit-conversion.shader_test @@ -5,7 +5,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.1)
[pixel shader] @@ -15,7 +15,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.1)
[pixel shader] @@ -25,7 +25,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.1)
[pixel shader] @@ -35,7 +35,7 @@ float4x1 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.1)
[pixel shader] @@ -50,7 +50,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.0)
[pixel shader] @@ -65,7 +65,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.0)
[pixel shader] @@ -80,7 +80,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.0)
[pixel shader] @@ -95,7 +95,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.0)
[pixel shader fail] @@ -132,7 +132,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.0)
[pixel shader] @@ -147,7 +147,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.0)
[pixel shader] @@ -162,7 +162,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.0)
[pixel shader fail] @@ -188,7 +188,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.0)
[pixel shader fail] @@ -214,7 +214,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.0)
[pixel shader fail] @@ -240,5 +240,5 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.0) diff --git a/tests/hlsl-return-void.shader_test b/tests/hlsl-return-void.shader_test index 1948ec51..d7231d6c 100644 --- a/tests/hlsl-return-void.shader_test +++ b/tests/hlsl-return-void.shader_test @@ -8,4 +8,4 @@ void main(out float4 ret : sv_target)
[test] draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +todo probe all rgba (0.1, 0.2, 0.3, 0.4) diff --git a/tests/hlsl-shape.shader_test b/tests/hlsl-shape.shader_test index b96f0fd2..57d59534 100644 --- a/tests/hlsl-shape.shader_test +++ b/tests/hlsl-shape.shader_test @@ -93,7 +93,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (2.0, 4.0, 7.0, 9.0)
[pixel shader] @@ -107,7 +107,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (2.0, 4.0, 7.0, 9.0)
[pixel shader] @@ -122,7 +122,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (2.0, 4.0, 6.0, 8.0)
[pixel shader] @@ -137,7 +137,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (2.0, 4.0, 6.0, 8.0)
[pixel shader] @@ -152,7 +152,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (2.0, 7.0, 12.0, 17.0)
[pixel shader] @@ -167,7 +167,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (2.0, 7.0, 12.0, 17.0)
[pixel shader] @@ -183,7 +183,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (2.0, 4.0, 6.0, 0.0)
[pixel shader] @@ -199,7 +199,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (9.0, 11.0, 13.0, 0.0)
[pixel shader] @@ -211,7 +211,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (2.0, 4.0, 6.0, 8.0)
[pixel shader] @@ -223,7 +223,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (2.0, 4.0, 6.0, 8.0)
[pixel shader] @@ -235,7 +235,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (2.0, 4.0, 6.0, 8.0)
[pixel shader] @@ -247,7 +247,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (2.0, 4.0, 6.0, 8.0)
[pixel shader] @@ -260,7 +260,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (2.0, 4.0, 6.0, 8.0)
[pixel shader] @@ -273,7 +273,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (2.0, 4.0, 6.0, 8.0)
[pixel shader] @@ -285,7 +285,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (2.0, 3.0, 4.0, 5.0)
[pixel shader] @@ -297,7 +297,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (2.0, 3.0, 4.0, 5.0)
[pixel shader] @@ -309,7 +309,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (2.0, 4.0, 0.0, 0.0)
[pixel shader] @@ -321,7 +321,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (2.0, 4.0, 0.0, 0.0)
[pixel shader] @@ -336,7 +336,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (2.0, 3.0, 4.0, 5.0)
[pixel shader] @@ -351,5 +351,5 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (6.0, 7.0, 8.0, 9.0) diff --git a/tests/hlsl-static-initializer.shader_test b/tests/hlsl-static-initializer.shader_test index 9c486512..d8b85385 100644 --- a/tests/hlsl-static-initializer.shader_test +++ b/tests/hlsl-static-initializer.shader_test @@ -12,5 +12,5 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.8, 0.0, 0.0, 0.0) diff --git a/tests/hlsl-storage-qualifiers.shader_test b/tests/hlsl-storage-qualifiers.shader_test index 00e7b836..4c590ceb 100644 --- a/tests/hlsl-storage-qualifiers.shader_test +++ b/tests/hlsl-storage-qualifiers.shader_test @@ -17,5 +17,5 @@ void main(in uniform float4 a, uniform float4 b, out float4 o : sv_target) [test] uniform 0 float4 0.1 0.0 0.0 0.0 uniform 4 float4 0.2 0.0 0.0 0.0 -draw quad +todo draw quad probe all rgba (0.1, 0.2, 0.3, 0.4) diff --git a/tests/hlsl-vector-indexing-uniform.shader_test b/tests/hlsl-vector-indexing-uniform.shader_test index e5ffbdd0..f6991040 100644 --- a/tests/hlsl-vector-indexing-uniform.shader_test +++ b/tests/hlsl-vector-indexing-uniform.shader_test @@ -12,5 +12,5 @@ float4 main() : SV_TARGET
[test] uniform 0 float 2 -draw quad +todo draw quad probe all rgba (0.5, 0.3, 0.8, 0.2) diff --git a/tests/hlsl-vector-indexing.shader_test b/tests/hlsl-vector-indexing.shader_test index b641d7f9..f46377cf 100644 --- a/tests/hlsl-vector-indexing.shader_test +++ b/tests/hlsl-vector-indexing.shader_test @@ -10,5 +10,5 @@ float4 main() : SV_TARGET }
[test] -draw quad +todo draw quad probe all rgba (0.02, 0.245, 0.351, 1.0) diff --git a/tests/logic-operations.shader_test b/tests/logic-operations.shader_test index 360ca03b..9a5cec3f 100644 --- a/tests/logic-operations.shader_test +++ b/tests/logic-operations.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET }
[test] -draw quad +todo draw quad probe all rgba (0.0, 1.0, 1.0, 1.0)
[pixel shader] @@ -22,7 +22,7 @@ float4 main() : SV_TARGET }
[test] -draw quad +todo draw quad probe all rgba (0.0, 0.0, 0.0, 1.0)
[pixel shader] @@ -35,7 +35,7 @@ float4 main() : SV_TARGET }
[test] -draw quad +todo draw quad probe all rgba (0.0, 0.0, 0.0, 1.0)
[pixel shader] @@ -48,7 +48,7 @@ float4 main() : SV_TARGET }
[test] -draw quad +todo draw quad probe all rgba (0.0, 1.0, 1.0, 1.0)
[pixel shader] @@ -61,7 +61,7 @@ float4 main() : SV_TARGET }
[test] -draw quad +todo draw quad probe all rgba (0.0, 1.0, 1.0, 1.0)
[pixel shader] @@ -75,7 +75,7 @@ float4 main() : SV_TARGET }
[test] -draw quad +todo draw quad probe all rgba (0.0, 0.0, 0.0, 1.0)
[pixel shader] @@ -88,7 +88,7 @@ float4 main() : SV_TARGET }
[test] -draw quad +todo draw quad probe all rgba (0.0, 0.0, 0.0, 1.0)
[pixel shader] @@ -101,7 +101,7 @@ float4 main() : SV_TARGET }
[test] -draw quad +todo draw quad probe all rgba (0.0, 1.0, 1.0, 1.0)
[pixel shader] @@ -114,7 +114,7 @@ float4 main() : SV_TARGET }
[test] -draw quad +todo draw quad probe all rgba (0.0, 1.0, 1.0, 1.0)
[pixel shader] @@ -128,7 +128,7 @@ float4 main() : SV_TARGET }
[test] -draw quad +todo draw quad probe all rgba (0.0, 0.0, 0.0, 1.0)
[pixel shader] @@ -141,7 +141,7 @@ float4 main() : SV_TARGET }
[test] -draw quad +todo draw quad probe all rgba (0.0, 0.0, 0.0, 1.0)
[pixel shader] @@ -154,5 +154,5 @@ float4 main() : SV_TARGET }
[test] -draw quad +todo draw quad probe all rgba (0.0, 1.0, 1.0, 1.0) diff --git a/tests/sampler-offset.shader_test b/tests/sampler-offset.shader_test index 6f8357df..f47d5bff 100644 --- a/tests/sampler-offset.shader_test +++ b/tests/sampler-offset.shader_test @@ -22,7 +22,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.1, 0.2, 0.5, 0.0)
@@ -36,7 +36,7 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.2, 0.2, 0.0, 0.4)
@@ -50,5 +50,5 @@ float4 main() : sv_target }
[test] -draw quad +todo draw quad probe all rgba (0.0, 0.2, 0.0, 0.4) diff --git a/tests/trigonometry.shader_test b/tests/trigonometry.shader_test index cf53d7a1..e9ac3682 100644 --- a/tests/trigonometry.shader_test +++ b/tests/trigonometry.shader_test @@ -12,7 +12,7 @@ float4 main(float tex : texcoord) : sv_target }
[test] -draw quad +todo draw quad probe rgba ( 0, 0) ( 0.00000000, 1.00000000, 0.0, 0.0) probe rgba ( 1, 0) ( 0.84147098, 0.54030231, 0.0, 0.0) 1024 probe rgba ( 2, 0) ( 0.90929743, -0.41614684, 0.0, 0.0) 1024