Zebediah Figura : tests: Import HLSL return statement tests from Wine.

Alexandre Julliard julliard at winehq.org
Fri Oct 2 14:49:22 CDT 2020


Module: vkd3d
Branch: master
Commit: e04b917322bc0371404caaed946e49d8010ab18b
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=e04b917322bc0371404caaed946e49d8010ab18b

Author: Zebediah Figura <zfigura at codeweavers.com>
Date:   Thu Oct  1 23:09:46 2020 -0500

tests: Import HLSL return statement tests from Wine.

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 Makefile.am                                       |  4 ++++
 tests/hlsl-return-implicit-conversion.shader_test |  9 +++++++++
 tests/hlsl-return-void.shader_test                | 11 +++++++++++
 3 files changed, 24 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index c6d9b06..efe0c7c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,6 +52,8 @@ vkd3d_shader_runners = \
 vkd3d_shader_tests = \
 	tests/conditional.shader_test \
 	tests/hlsl-comma.shader_test \
+	tests/hlsl-return-implicit-conversion.shader_test \
+	tests/hlsl-return-void.shader_test \
 	tests/hlsl-vector-indexing.shader_test \
 	tests/hlsl-vector-indexing-uniform.shader_test \
 	tests/math.shader_test \
@@ -185,6 +187,8 @@ SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12
 XFAIL_TESTS = \
 	tests/conditional.shader_test \
 	tests/hlsl-comma.shader_test \
+	tests/hlsl-return-implicit-conversion.shader_test \
+	tests/hlsl-return-void.shader_test \
 	tests/hlsl-vector-indexing.shader_test \
 	tests/hlsl-vector-indexing-uniform.shader_test \
 	tests/math.shader_test \
diff --git a/tests/hlsl-return-implicit-conversion.shader_test b/tests/hlsl-return-implicit-conversion.shader_test
new file mode 100644
index 0000000..527387b
--- /dev/null
+++ b/tests/hlsl-return-implicit-conversion.shader_test
@@ -0,0 +1,9 @@
+[pixel shader]
+float4 main() : sv_target
+{
+    return float2x2(0.4, 0.3, 0.2, 0.1);
+}
+
+[test]
+draw quad
+probe all rgba (0.4, 0.3, 0.2, 0.1)
diff --git a/tests/hlsl-return-void.shader_test b/tests/hlsl-return-void.shader_test
new file mode 100644
index 0000000..1948ec5
--- /dev/null
+++ b/tests/hlsl-return-void.shader_test
@@ -0,0 +1,11 @@
+[pixel shader]
+void main(out float4 ret : sv_target)
+{
+    ret = float4(0.1, 0.2, 0.3, 0.4);
+    return;
+    ret = float4(0.5, 0.6, 0.7, 0.8);
+}
+
+[test]
+draw quad
+probe all rgba (0.1, 0.2, 0.3, 0.4)




More information about the wine-cvs mailing list