diff --git a/Makefile.am b/Makefile.am index 34f61ef9..ff42613d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -491,6 +491,13 @@ tests_shader_runner_SOURCES = \ tests/shader_runner_d3d12.c \ tests/shader_runner_gl.c \ tests/shader_runner_vulkan.c +if HAVE_METAL +tests_shader_runner_OBJCFLAGS = $(AM_CFLAGS) +tests_shader_runner_SOURCES += tests/shader_runner_metal.m +tests_shader_runner_LINK = $(OBJCLINK) -framework Foundation -framework Metal +else +tests_shader_runner_LINK = $(LINK) +endif tests_vkd3d_api_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) tests_vkd3d_api_LDADD = libvkd3d.la @DL_LIBS@ tests_vkd3d_shader_api_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) diff --git a/configure.ac b/configure.ac index f104f557..e80bff8a 100644 --- a/configure.ac +++ b/configure.ac @@ -8,6 +8,7 @@ AC_CONFIG_HEADERS(include/config.h) AC_ARG_VAR([WIDL], [widl IDL compiler]) AC_ARG_VAR([CROSSCC32], [32-bit Windows cross compiler]) AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) +AC_ARG_WITH([metal], AS_HELP_STRING([--with-metal], [Build with the Metal library (default: test)])) AC_ARG_WITH([ncurses], AS_HELP_STRING([--with-ncurses], [Build with the ncurses library (default: test)])) AC_ARG_WITH([opengl], AS_HELP_STRING([--with-opengl], [Build with the OpenGL library (default: test)])) AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools], @@ -134,6 +135,16 @@ AS_IF([test "x$SONAME_LIBDXCOMPILER" = "x"], [VKD3D_CHECK_SONAME([dxcompiler], [DxcCreateInstance], [HAVE_DXCOMPILER=yes], [HAVE_DXCOMPILER=no], [$DXCOMPILER_LIBS])], [AC_DEFINE_UNQUOTED([SONAME_LIBDXCOMPILER],["$SONAME_LIBDXCOMPILER"],[Define to the shared object name of the dxcompiler library.])]) +AS_IF([test "x$with_metal" != "xno"], + [AC_MSG_CHECKING([for Metal])] + [AC_PREPROC_IFELSE([AC_LANG_PROGRAM([#include ])], + [AC_MSG_RESULT([yes]) + AC_PROG_OBJC + AC_DEFINE([HAVE_METAL], [1], [Define to 1 if you have Metal.]) + with_metal=yes], + [AC_MSG_RESULT([no]) + AM_CONDITIONAL([am__fastdepOBJC], [false]) + with_metal=no])]) AS_IF([test "x$with_ncurses" != "xno"], [PKG_CHECK_MODULES([NCURSES], [ncurses], [AC_DEFINE([HAVE_NCURSES], [1], [Define to 1 if you have ncurses.]) with_ncurses=yes], @@ -181,6 +192,7 @@ AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_tests" != "xno"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"]) +AM_CONDITIONAL([HAVE_METAL], [test "${host_os#darwin}" != "$host_os"]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT @@ -197,11 +209,12 @@ AS_ECHO([" widl: ${WIDL} + Have dxcompiler: ${HAVE_DXCOMPILER} + Have Metal: ${with_metal} Have ncurses: ${with_ncurses} Have OpenGL: ${with_opengl} Have SPIRV-Tools: ${with_spirv_tools} Have xcb: ${HAVE_XCB} - Have dxcompiler: ${HAVE_DXCOMPILER} Building demos: ${enable_demos} Building tests: ${enable_tests} diff --git a/tests/hlsl/abs.shader_test b/tests/hlsl/abs.shader_test index 26905d6f..d35a7e2c 100644 --- a/tests/hlsl/abs.shader_test +++ b/tests/hlsl/abs.shader_test @@ -8,8 +8,8 @@ float4 main() : sv_target [test] uniform 0 float4 0.1 0.7 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.7, 0.4, 0.4) uniform 0 float4 -0.7 0.1 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.7, 0.1, 1.2, 0.4) diff --git a/tests/hlsl/all.shader_test b/tests/hlsl/all.shader_test index 51b41a3d..3aed5458 100644 --- a/tests/hlsl/all.shader_test +++ b/tests/hlsl/all.shader_test @@ -11,17 +11,17 @@ float4 main() : sv_target [test] uniform 0 float4 -1.1 1.6 1.3 0.5 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [test] uniform 0 float4 0.0 1.6 1.3 0.5 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [test] uniform 0 float4 1.0 0.0 1.3 0.5 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] @@ -34,12 +34,12 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [test] uniform 0 float4 0.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] @@ -53,11 +53,11 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 0.0 0.0 uniform 4 float4 3.0 4.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [test] uniform 0 float4 1.0 2.0 0.0 0.0 uniform 4 float4 0.0 4.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) diff --git a/tests/hlsl/angle-unit.shader_test b/tests/hlsl/angle-unit.shader_test index 4b48884b..0fd45ad9 100644 --- a/tests/hlsl/angle-unit.shader_test +++ b/tests/hlsl/angle-unit.shader_test @@ -8,7 +8,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 30.0 150.0 180.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.52359877, 2.61799387, 3.14159265) @@ -22,5 +22,5 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.78539816 1.57079632 2.35619449 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 45.0, 90.0, 135.0) diff --git a/tests/hlsl/any.shader_test b/tests/hlsl/any.shader_test index c939b7cd..949bfe19 100644 --- a/tests/hlsl/any.shader_test +++ b/tests/hlsl/any.shader_test @@ -8,25 +8,25 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 1.0 1.0 1.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) uniform 0 float4 1.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) uniform 0 float4 0.0 1.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) uniform 0 float4 0.0 0.0 1.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) uniform 0 float4 0.0 0.0 0.0 1.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) uniform 0 float4 0.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) uniform 0 float4 -1.0 -1.0 -1.0 -1.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [pixel shader] @@ -39,13 +39,13 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) uniform 0 float4 0.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) uniform 0 float4 -1.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) @@ -60,27 +60,27 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 1 1 1 1 if(sm>=4) uniform 0 uint4 1 1 1 1 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) if(sm<4) uniform 0 float4 1 0 0 0 if(sm>=4) uniform 0 uint4 1 0 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) if(sm<4) uniform 0 float4 0 1 0 0 if(sm>=4) uniform 0 uint4 0 1 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) if(sm<4) uniform 0 float4 0 0 1 0 if(sm>=4) uniform 0 uint4 0 0 1 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) if(sm<4) uniform 0 float4 0 0 0 1 if(sm>=4) uniform 0 uint4 0 0 0 1 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) if(sm<4) uniform 0 float4 0 0 0 0 if(sm>=4) uniform 0 uint4 0 0 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] @@ -94,9 +94,9 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 1 0 0 0 if(sm>=4) uniform 0 uint4 1 0 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) if(sm<4) uniform 0 float4 0 0 0 0 if(sm>=4) uniform 0 uint4 0 0 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) diff --git a/tests/hlsl/arithmetic-float-uniform.shader_test b/tests/hlsl/arithmetic-float-uniform.shader_test index b2741dd9..92b23bed 100644 --- a/tests/hlsl/arithmetic-float-uniform.shader_test +++ b/tests/hlsl/arithmetic-float-uniform.shader_test @@ -10,7 +10,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 15.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (20.0, -10.0, 75.0, 0.33333333) 1 [pixel shader] @@ -25,7 +25,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 15.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 5.0, -5.0, 3.0) 1 [pixel shader] @@ -40,7 +40,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 42.0 5.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, -2.0, 2.0, -2.0) 16 [pixel shader] @@ -55,7 +55,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 45.0 5.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] @@ -69,7 +69,7 @@ float4 main() : sv_target [test] uniform 0 float4 5.0 -42.1 4.0 45.0 uniform 4 float4 15.0 -5.0 4.1 5.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, -2.1, 4.0, 0.0) 6 [require] @@ -88,7 +88,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 1.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1e99, 1e99, 1e99, 1e99) [pixel shader] @@ -103,7 +103,7 @@ float4 main() : sv_target uniform 0 float4 1.00000007 -42.1 4.0 45.0 uniform 4 float4 1.625 -5.0 4.125 5.0 uniform 8 float4 1.00000007 -1.0 0.5 -0.5 -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.62500024, 209.5, 17.0, 224.5) 1 % precise mad() is not allowed to fuse, even though unfused is less precise. @@ -120,7 +120,7 @@ float4 main() : sv_target uniform 0 float4 1.00000007 -42.1 4.0 45.0 uniform 4 float4 1.625 -5.0 4.125 5.0 uniform 8 float4 1.00000007 -1.0 0.5 -0.5 -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.62500048, 209.5, 17.0, 224.5) 1 [require] diff --git a/tests/hlsl/arithmetic-float.shader_test b/tests/hlsl/arithmetic-float.shader_test index 866eb607..024e455f 100644 --- a/tests/hlsl/arithmetic-float.shader_test +++ b/tests/hlsl/arithmetic-float.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (20.0, -10.0, 75.0, 0.33333333) [pixel shader] @@ -21,7 +21,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 5.0, -5.0, 3.0) [pixel shader] @@ -34,7 +34,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, -2.0, 2.0, -2.0) 16 [pixel shader] @@ -47,7 +47,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] @@ -60,7 +60,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, -2.1, 4.0, 0.0) 6 [require] @@ -77,5 +77,5 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1e99, 1e99, 1e99, 1e99) diff --git a/tests/hlsl/arithmetic-int-uniform.shader_test b/tests/hlsl/arithmetic-int-uniform.shader_test index 92c6e89c..0b79d4cf 100644 --- a/tests/hlsl/arithmetic-int-uniform.shader_test +++ b/tests/hlsl/arithmetic-int-uniform.shader_test @@ -10,7 +10,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 16.0 0.0 0.0 -todo(sm<4 | glsl) draw quad +todo(sm<4 | glsl | msl) draw quad probe (0, 0) rgba (21.0, -11.0, 80.0, 0.0) [pixel shader todo(sm<4)] @@ -25,7 +25,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 16.0 0.0 0.0 -todo(sm<4 | glsl) draw quad +todo(sm<4 | glsl | msl) draw quad probe (0, 0) rgba (5.0, 5.0, -5.0, 3.0) [pixel shader todo(sm<4)] @@ -40,7 +40,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 42.0 5.0 0.0 0.0 -todo(sm<4 | glsl) draw quad +todo(sm<4 | glsl | msl) draw quad probe (0, 0) rgba (8.0, -8.0, -8.0, 8.0) [pixel shader todo(sm<4)] @@ -55,7 +55,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 42.0 5.0 0.0 0.0 -todo(sm<4 | glsl) draw quad +todo(sm<4 | glsl | msl) draw quad probe (0, 0) rgba (2.0, -2.0, 2.0, -2.0) [pixel shader todo(sm<4)] @@ -70,7 +70,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 45.0 5.0 0.0 0.0 -todo(sm<4 | glsl) draw quad +todo(sm<4 | glsl | msl) draw quad probe (0, 0) rgba (9.0, -9.0, -9.0, 9.0) [pixel shader todo(sm<4)] @@ -85,7 +85,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 45.0 5.0 0.0 0.0 -todo(sm<4 | glsl) draw quad +todo(sm<4 | glsl | msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] @@ -98,7 +98,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 -7.0 0.0 -10.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 7.0, 0.0, 10.0) [pixel shader todo(sm<4)] @@ -117,7 +117,7 @@ float4 main() : sv_target [test] uniform 0 float4 45.0 5.0 50.0 10.0 uniform 4 float4 3.0 8.0 2.0 5.0 -todo(sm<4 | glsl) draw quad +todo(sm<4 | glsl | msl) draw quad probe (0, 0) rgba (9.0, 5.0, 1.0, 3.0) [require] diff --git a/tests/hlsl/arithmetic-int.shader_test b/tests/hlsl/arithmetic-int.shader_test index 3d1b7420..ef19939a 100644 --- a/tests/hlsl/arithmetic-int.shader_test +++ b/tests/hlsl/arithmetic-int.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (20.0, -10.0, 75.0, 0.0) [pixel shader] @@ -21,7 +21,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 5.0, -5.0, 3.0) [pixel shader] @@ -34,7 +34,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (8.0, -8.0, -8.0, 8.0) [pixel shader] @@ -47,7 +47,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, -2.0, 2.0, -2.0) [pixel shader] @@ -60,7 +60,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (9.0, -9.0, -9.0, 9.0) [pixel shader] @@ -73,7 +73,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader fail(sm<6)] @@ -118,7 +118,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad if(sm<6) probe (0,0) rgba (-2147483648.0, -2147483648.0, -2147483648.0, -2147483648.0) if(sm>=6) probe (0,0) rgba (0.0, 0.0, 0.0, 0.0) @@ -134,5 +134,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 3.0, 1.0, 3.0) diff --git a/tests/hlsl/arithmetic-uint.shader_test b/tests/hlsl/arithmetic-uint.shader_test index 9c3ad646..54ffbf5e 100644 --- a/tests/hlsl/arithmetic-uint.shader_test +++ b/tests/hlsl/arithmetic-uint.shader_test @@ -11,7 +11,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (20.0, 4294967296.0, 75.0, 0.0) [pixel shader] @@ -24,7 +24,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 5.0, 4294967296.0, 3.0) [pixel shader fail(sm<6)] diff --git a/tests/hlsl/array-parameters.shader_test b/tests/hlsl/array-parameters.shader_test index e1f347fa..384639ca 100644 --- a/tests/hlsl/array-parameters.shader_test +++ b/tests/hlsl/array-parameters.shader_test @@ -12,7 +12,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (25.0, 25.0, 25.0, 25.0) @@ -78,7 +78,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (15.0, 26.0, 37.0, 48.0) @@ -153,7 +153,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (136.0, 136.0, 136.0, 136.0) @@ -171,5 +171,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (702.0, 702.0, 702.0, 702.0) diff --git a/tests/hlsl/array-size-expr.shader_test b/tests/hlsl/array-size-expr.shader_test index 34e639ba..a9bc390b 100644 --- a/tests/hlsl/array-size-expr.shader_test +++ b/tests/hlsl/array-size-expr.shader_test @@ -14,7 +14,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (21, 22, 23, 24) @@ -36,7 +36,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (61, 62, 63, 64) [pixel shader] @@ -49,7 +49,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2, 3, 6, 1) % Additional level of indirection @@ -64,7 +64,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2, 3, 6, 1) @@ -88,5 +88,5 @@ uniform 4 float 0.0 uniform 8 float 0.0 uniform 12 float 0.0 uniform 16 float 42.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (42, 42, 42, 42) diff --git a/tests/hlsl/asfloat.shader_test b/tests/hlsl/asfloat.shader_test index 2184c186..ba73aefc 100644 --- a/tests/hlsl/asfloat.shader_test +++ b/tests/hlsl/asfloat.shader_test @@ -20,7 +20,7 @@ float4 main() : sv_target [test] uniform 0 float4 123.0 -2.0 456 0.01 -draw quad +todo(msl) draw quad probe (320,240) rgba (123.0, -2.0, 456.0, 0.01) [pixel shader] @@ -36,7 +36,7 @@ float4 main() : sv_target uniform 0 float4 11 12 0 0 uniform 4 float4 13 14 0 0 uniform 8 float4 20 21 22 23 -draw quad +todo(msl) draw quad probe (320,240) rgba (13.0, 21.0, 0.0, 0.0) [pixel shader fail] diff --git a/tests/hlsl/asint.shader_test b/tests/hlsl/asint.shader_test index 9a7d8205..e4f9425e 100644 --- a/tests/hlsl/asint.shader_test +++ b/tests/hlsl/asint.shader_test @@ -20,7 +20,7 @@ float4 main() : sv_target [test] uniform 0 int4 123 0xc00000 456 0x7fd69345 -draw quad +todo(msl) draw quad probe (320,240) rgba (123.0, 12582912.0, 456.0, 2144768896.0) [pixel shader] @@ -36,7 +36,7 @@ float4 main() : sv_target uniform 0 int4 11 12 0 0 uniform 4 int4 13 14 0 0 uniform 8 int4 20 21 22 23 -draw quad +todo(msl) draw quad probe (320,240) rgba (13.0, 21.0, 0.0, 0.0) diff --git a/tests/hlsl/asuint.shader_test b/tests/hlsl/asuint.shader_test index 50b0895e..b67fd8ea 100644 --- a/tests/hlsl/asuint.shader_test +++ b/tests/hlsl/asuint.shader_test @@ -20,7 +20,7 @@ float4 main() : sv_target [test] uniform 0 uint4 123 0xc0000000 456 0x7fd69345 -draw quad +todo(msl) draw quad probe (320,240) rgba (123.0, 3221225472.0, 456.0, 2144768896.0) @@ -37,7 +37,7 @@ float4 main() : sv_target uniform 0 uint4 11 12 0 0 uniform 4 uint4 13 14 0 0 uniform 8 uint4 20 21 22 23 -draw quad +todo(msl) draw quad probe (320,240) rgba (13.0, 21.0, 0.0, 0.0) diff --git a/tests/hlsl/bitwise-assignment.shader_test b/tests/hlsl/bitwise-assignment.shader_test index 3545fcb8..b87e1c16 100644 --- a/tests/hlsl/bitwise-assignment.shader_test +++ b/tests/hlsl/bitwise-assignment.shader_test @@ -15,7 +15,7 @@ float4 main() : SV_TARGET [test] uniform 0 uint4 2 0 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (8, 8, 0, 0) [pixel shader] @@ -35,7 +35,7 @@ float4 main() : SV_TARGET [test] uniform 0 uint4 1 0 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (2, -6, 2, -6) [pixel shader] @@ -52,7 +52,7 @@ float4 main() : SV_TARGET [test] uniform 0 uint4 3 0 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (280, 280, 0, 0) [pixel shader] @@ -72,7 +72,7 @@ float4 main() : SV_TARGET [test] uniform 0 uint4 2 0 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (20, -48, 20, -48) [pixel shader fail] @@ -100,5 +100,5 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (55, 183, -16760, 0) diff --git a/tests/hlsl/bitwise.shader_test b/tests/hlsl/bitwise.shader_test index 6c0a6fc3..00d168e5 100644 --- a/tests/hlsl/bitwise.shader_test +++ b/tests/hlsl/bitwise.shader_test @@ -11,7 +11,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 163840.0, 480.0) [pixel shader] @@ -26,7 +26,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (-2147483648.0, 4.0, 2147483650.0, 4.0) [pixel shader] @@ -41,7 +41,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 536870912.0, 1.0, 1073741824.0) [pixel shader] @@ -54,7 +54,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 15.0, 10.0, -6.0) [pixel shader] @@ -67,7 +67,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] @@ -80,7 +80,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] @@ -93,7 +93,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 1.0, 1.0, 0.0) [pixel shader] @@ -113,7 +113,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 1.0, 1.0, 0.0) [pixel shader] @@ -126,7 +126,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 163840.0, 480.0) [pixel shader fail] @@ -157,7 +157,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 15.0, 10.0, 4294967296.0) [pixel shader] @@ -170,7 +170,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] @@ -183,7 +183,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] @@ -196,7 +196,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 1.0, 1.0, 0.0) [rtv 0] diff --git a/tests/hlsl/bool-cast.shader_test b/tests/hlsl/bool-cast.shader_test index daf0283d..fdc6d59f 100644 --- a/tests/hlsl/bool-cast.shader_test +++ b/tests/hlsl/bool-cast.shader_test @@ -10,7 +10,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 1.0, 1.0) @@ -27,7 +27,7 @@ float4 main() : SV_TARGET uniform 0 float4 0.0 0.0 2.0 4.0 if(sm<4) uniform 4 float4 0 1 0 10 if(sm>=4) uniform 4 int4 0 1 0 10 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.0, 10.0, 1.0, 11.0) @@ -42,5 +42,5 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 1.0 1.0 1.0 0.0 if(sm>=4) uniform 0 uint4 0x00000001 0x00000002 0x80000000 0x00000000 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (2.0, 2.0, 2.0, 0.0) diff --git a/tests/hlsl/bool-semantics.shader_test b/tests/hlsl/bool-semantics.shader_test index b04ee1a1..28100406 100644 --- a/tests/hlsl/bool-semantics.shader_test +++ b/tests/hlsl/bool-semantics.shader_test @@ -49,5 +49,5 @@ float4 main(struct input i) : sv_target } [test] -draw triangle strip 4 +todo(msl) draw triangle strip 4 probe (0, 0, 640, 480) rgba (0.0, 2.0, 2.0, 2.0) diff --git a/tests/hlsl/cast-broadcast.shader_test b/tests/hlsl/cast-broadcast.shader_test index 14f504e4..188aa9b5 100644 --- a/tests/hlsl/cast-broadcast.shader_test +++ b/tests/hlsl/cast-broadcast.shader_test @@ -19,7 +19,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (84.0, 84.0, 84.0, 84.0) @@ -94,5 +94,5 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (33.0, 33.0, 33.0, 33.0) diff --git a/tests/hlsl/cast-componentwise-compatible.shader_test b/tests/hlsl/cast-componentwise-compatible.shader_test index b5164d22..506a3410 100644 --- a/tests/hlsl/cast-componentwise-compatible.shader_test +++ b/tests/hlsl/cast-componentwise-compatible.shader_test @@ -16,7 +16,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 1.0) @@ -39,7 +39,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) @@ -55,7 +55,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) @@ -86,7 +86,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (7.0, 7.0, 7.0, 7.0) @@ -119,7 +119,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (3.0, 3.0, 3.0, 3.0) @@ -159,7 +159,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (10.0, 20.0, 30.0, 30.0) @@ -181,7 +181,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (10.0, 10.0, 11.4, 12.4) @@ -197,7 +197,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (11.0, 12.0, 13.0, 14.0) @@ -220,7 +220,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (21.0, 22.0, 23.0, 24.0) @@ -236,7 +236,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (31.0, 32.0, 33.0, 33.0) @@ -258,7 +258,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (41.0, 42.0, 43.0, 44.0) @@ -297,7 +297,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (55.0, 56.0, 57.0, 58.0) @@ -329,7 +329,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (61.0, 62.0, 63.0, 64.0) @@ -355,7 +355,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (71.0, 72.0, 73.0, 74.0) @@ -404,7 +404,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (81.0, 82.0, 83.0, 84.0) @@ -420,7 +420,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (91.0, 92.0, 93.0, 0.0) @@ -436,7 +436,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (11.0, 12.0, 13.0, 0.0) @@ -477,7 +477,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (21.0, 22.0, 23.0, 24.0) @@ -499,7 +499,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (31.0, 32.0, 33.0, 0.0) @@ -521,7 +521,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (41.0, 42.0, 43.0, 0.0) @@ -537,7 +537,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (51.0, 52.0, 53.0, 0.0) @@ -564,7 +564,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (61.0, 62.0, 63.0, 0.0) @@ -580,5 +580,5 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (71.0, 72.0, 73.0, 0.0) diff --git a/tests/hlsl/cast-componentwise-equal.shader_test b/tests/hlsl/cast-componentwise-equal.shader_test index d369e158..848b4946 100644 --- a/tests/hlsl/cast-componentwise-equal.shader_test +++ b/tests/hlsl/cast-componentwise-equal.shader_test @@ -50,7 +50,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 1.0) @@ -89,7 +89,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) @@ -120,7 +120,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (4.0, 4.0, 4.0, 4.0) @@ -154,7 +154,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 5.0, 5.0, 5.0) @@ -199,7 +199,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (71.0, 73.0, 73.0, 74.0) diff --git a/tests/hlsl/cast-to-float.shader_test b/tests/hlsl/cast-to-float.shader_test index e1f9f9cd..4b4afbbe 100644 --- a/tests/hlsl/cast-to-float.shader_test +++ b/tests/hlsl/cast-to-float.shader_test @@ -18,7 +18,7 @@ if(sm>=4) uniform 0 int -1 if(sm>=4) uniform 1 uint 3 if(sm>=4) uniform 2 int -2 if(sm>=4) uniform 3 float 0.5 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.5, 0.5, 0.5, 0.5) @@ -33,5 +33,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) 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 4df5f6ab..2b45fc7f 100644 --- a/tests/hlsl/cast-to-half.shader_test +++ b/tests/hlsl/cast-to-half.shader_test @@ -18,7 +18,7 @@ if(sm>=4) uniform 0 int -1 if(sm>=4) uniform 1 uint 3 if(sm>=4) uniform 2 int -2 if(sm>=4) uniform 3 float 0.5 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.5, 0.5, 0.5, 0.5) @@ -33,5 +33,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) 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 c982968b..76e48ea9 100644 --- a/tests/hlsl/cast-to-int.shader_test +++ b/tests/hlsl/cast-to-int.shader_test @@ -10,7 +10,7 @@ float4 main() : sv_target [test] uniform 0 float4 10.3 11.5 12.8 13.1 -draw quad +todo(msl) draw quad probe (0, 0) rgba (10, 11, 12, 0) @@ -40,7 +40,7 @@ if(sm>=4) uniform 0 float 2.6 if(sm>=4) uniform 1 int -2 if(sm>=4) uniform 2 int -2 if(sm>=4) uniform 3 float -3.6 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.5, 0.5, 0.5, 0.5) @@ -61,6 +61,6 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad if(sm<4) todo probe (0,0) rgba (0.5, 4.2949673e+009, 0.5, 0.5) if(sm>=4) probe (0,0) 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 f767b6e0..d18269f0 100644 --- a/tests/hlsl/cast-to-uint.shader_test +++ b/tests/hlsl/cast-to-uint.shader_test @@ -25,7 +25,7 @@ uniform 0 float 2.6 uniform 1 int 2 uniform 2 int -2 uniform 3 float -3.6 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.5, 0.5, 0.5, 0.5) @@ -46,5 +46,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.5, 0.5, 0.5, 0.5) diff --git a/tests/hlsl/cbuffer.shader_test b/tests/hlsl/cbuffer.shader_test index 8a83255b..43db2c47 100644 --- a/tests/hlsl/cbuffer.shader_test +++ b/tests/hlsl/cbuffer.shader_test @@ -13,7 +13,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader fail(sm>=6)] @@ -61,7 +61,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader fail(sm>=6)] @@ -83,7 +83,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader] @@ -97,7 +97,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader fail] @@ -150,7 +150,7 @@ uniform 0 float4 0.0 1.0 2.0 3.0 uniform 4 float4 4.0 5.0 6.0 7.0 uniform 8 float4 8.0 9.0 10.0 11.0 uniform 12 float4 12.0 13.0 14.0 15.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 2.0, 4.0, 8.0) @@ -171,7 +171,7 @@ float4 main() : sv_target uniform 0 float4 0.0 1.0 2.0 3.0 uniform 4 float4 4.0 5.0 6.0 7.0 uniform 8 float4 8.0 9.0 10.0 11.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 4.0, 8.0, 9.0) @@ -197,7 +197,7 @@ uniform 0 float4 0.0 1.0 2.0 3.0 uniform 4 float4 4.0 5.0 6.0 7.0 uniform 8 float4 8.0 9.0 10.0 11.0 uniform 12 float4 12.0 13.0 14.0 15.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 4.0, 5.0, 6.0) @@ -246,7 +246,7 @@ float4 main() : sv_target uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 5.0 6.0 7.0 8.0 uniform 8 float4 9.0 10.0 11.0 12.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (509, 610, 711, 812) @@ -274,7 +274,7 @@ uniform 0 float4 0.0 1.0 2.0 3.0 uniform 4 float4 4.0 5.0 6.0 7.0 uniform 8 float4 8.0 9.0 10.0 11.0 uniform 12 float4 12.0 13.0 14.0 15.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (12468.0, 13509.0, 14010.0, 15011.0) @@ -291,7 +291,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 3.0, 2.0, 3.0) @@ -396,7 +396,7 @@ float4 main() : sv_target uniform 0 float 1.0 uniform 1 float 2.0 uniform 4 float4 5.0 6.0 7.0 8.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (512.0, 612.0, 712.0, 812.0) @@ -427,7 +427,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (3.0, 4.0, 3.0, 4.0) @@ -569,7 +569,7 @@ float4 main() : sv_target uniform 0 float4 1.0 0.0 0.0 0.0 uniform 4 float4 0.0 2.0 0.0 0.0 uniform 8 float4 0.0 0.0 3.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 0.0, 4.0) @@ -619,7 +619,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) @@ -767,7 +767,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 0.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader fail(sm<6)] @@ -813,7 +813,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 0.1 0.2 0.3 0.4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.1, 2.2, 3.3, 4.4) @@ -850,7 +850,7 @@ uniform 4 float4 4.0 5.0 6.0 7.0 uniform 8 float4 8.0 9.0 10.0 11.0 uniform 12 float4 12.0 13.0 14.0 15.0 uniform 16 float4 16.0 17.0 18.0 19.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (124.0, 135.0, 146.0, 150.5) [require] diff --git a/tests/hlsl/ceil.shader_test b/tests/hlsl/ceil.shader_test index 7f3a4740..841bbeb2 100644 --- a/tests/hlsl/ceil.shader_test +++ b/tests/hlsl/ceil.shader_test @@ -5,7 +5,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 7.0, 8.0, 4.0) 4 [pixel shader] @@ -18,7 +18,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 7.0, 8.0, 4.0) 4 [pixel shader] @@ -34,7 +34,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (7.0, 8.0, 0.0, 4.0) 4 [pixel shader] @@ -51,5 +51,5 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 -1 6 7 3 if(sm>=4) uniform 0 int4 -1 6 7 3 -draw quad +todo(msl) draw quad probe (0, 0) rgba (6.0, 7.0, -1.0, 3.0) 4 diff --git a/tests/hlsl/cf-cond-types.shader_test b/tests/hlsl/cf-cond-types.shader_test index ce49600a..b21eb44c 100644 --- a/tests/hlsl/cf-cond-types.shader_test +++ b/tests/hlsl/cf-cond-types.shader_test @@ -124,8 +124,8 @@ float4 main() : sv_target [test] uniform 0 float4 -2.0 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) uniform 0 float4 -0.0 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) diff --git a/tests/hlsl/clamp.shader_test b/tests/hlsl/clamp.shader_test index 98666e2a..89fbac9a 100644 --- a/tests/hlsl/clamp.shader_test +++ b/tests/hlsl/clamp.shader_test @@ -8,7 +8,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.3 -0.1 0.7 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-0.1, 0.7, -0.3, 0.3) @@ -24,7 +24,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.5, 5.0, 4.2, 5.2) diff --git a/tests/hlsl/clip.shader_test b/tests/hlsl/clip.shader_test index bb7597cf..f253fbcb 100644 --- a/tests/hlsl/clip.shader_test +++ b/tests/hlsl/clip.shader_test @@ -9,20 +9,20 @@ float4 main() : sv_target [test] uniform 0 float4 1 2 3 4 -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (1, 2, 3, 4) uniform 0 float4 9 8 7 6 -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (9, 8, 7, 6) uniform 0 float4 -1 8 7 6 -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (9, 8, 7, 6) uniform 0 float4 9 0 7 6 -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (9, 0, 7, 6) uniform 0 float4 3 -8 3 0 -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (9, 0, 7, 6) uniform 0 float4 3 3 3 -1 -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (9, 0, 7, 6) diff --git a/tests/hlsl/combined-samplers.shader_test b/tests/hlsl/combined-samplers.shader_test index 4d3b507d..019a5251 100644 --- a/tests/hlsl/combined-samplers.shader_test +++ b/tests/hlsl/combined-samplers.shader_test @@ -45,7 +45,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0, 0, 0, 1) @@ -61,7 +61,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.5 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.5, 0.5, 0.5, 1.5) @@ -77,7 +77,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad if(sm<4) todo probe (0, 0) rgba (1, 1, 1, 11) if(sm>=4) probe (0, 0) rgba (10, 10, 10, 11) @@ -92,7 +92,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad if(sm<4) todo probe (0, 0) rgba (1, 1, 1, 11) if(sm>=4) probe (0, 0) rgba (10, 10, 10, 11) @@ -107,7 +107,7 @@ float4 main() : sv_target } [test] -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (21, 21, 21, 11) @@ -123,7 +123,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad if(sm<4) probe (0, 0) rgba (102, 102, 102, 111) if(sm>=4) probe (0, 0) rgba (12, 12, 12, 111) @@ -139,7 +139,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (104, 104, 104, 111) @@ -163,7 +163,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1, 1, 1, 11) diff --git a/tests/hlsl/comma.shader_test b/tests/hlsl/comma.shader_test index fc0aa3df..2a38ccf4 100644 --- a/tests/hlsl/comma.shader_test +++ b/tests/hlsl/comma.shader_test @@ -6,5 +6,5 @@ float4 main(): sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.6, 0.7, 0.8, 0.9) diff --git a/tests/hlsl/conditional.shader_test b/tests/hlsl/conditional.shader_test index cfc2d1e0..dd26742c 100644 --- a/tests/hlsl/conditional.shader_test +++ b/tests/hlsl/conditional.shader_test @@ -11,10 +11,10 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.9, 0.8, 0.7, 0.6) uniform 0 float4 0.1 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) [pixel shader todo(sm<4)] @@ -43,7 +43,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.9, 0.8, 0.7, 0.6) [pixel shader fail(sm<6)] @@ -87,10 +87,10 @@ float4 main() : sv_target [test] uniform 0 float -2 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1, 2, 3, 4) uniform 0 float 10 -draw quad +todo(msl) draw quad probe (0, 0) rgba (10, 20, 30, 40) @@ -108,7 +108,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.9, 0.8, 0.7, 0.6) [pixel shader] @@ -125,7 +125,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (9.0, 10.0, 11.0, 12.0) @@ -145,19 +145,19 @@ if(sm<4) uniform 0 float 8 if(sm<4) uniform 4 float 9 if(sm>=4) uniform 0 int 8 if(sm>=4) uniform 1 int 9 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-1.0, -1.0, -1.0, -1.0) if(sm<4) uniform 0 float -3 if(sm<4) uniform 4 float -4 if(sm>=4) uniform 0 int -3 if(sm>=4) uniform 1 int -4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) if(sm<4) uniform 0 float 7 if(sm<4) uniform 4 float 7 if(sm>=4) uniform 0 int 7 if(sm>=4) uniform 1 int 7 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) @@ -177,19 +177,19 @@ if(sm<4) uniform 0 float 8 if(sm<4) uniform 4 float 9 if(sm>=4) uniform 0 int 8 if(sm>=4) uniform 1 int 9 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-1.0, -1.0, -1.0, -1.0) if(sm<4) uniform 0 float -3 if(sm<4) uniform 4 float -4 if(sm>=4) uniform 0 int -3 if(sm>=4) uniform 1 int -4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) if(sm<4) uniform 0 float 7 if(sm<4) uniform 4 float 7 if(sm>=4) uniform 0 int 7 if(sm>=4) uniform 1 int 7 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-1.0, -1.0, -1.0, -1.0) @@ -209,13 +209,13 @@ if(sm<4) uniform 0 float -3 if(sm<4) uniform 4 float -2 if(sm>=4) uniform 0 int -3 if(sm>=4) uniform 1 int -2 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-1.0, -1.0, -1.0, -1.0) if(sm<4) uniform 0 float 4 if(sm<4) uniform 4 float 4 if(sm>=4) uniform 0 int 4 if(sm>=4) uniform 1 int 4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) @@ -243,10 +243,10 @@ float4 main() : sv_target [test] uniform 0 float -2 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 4.0) uniform 0 float 4 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) @@ -267,11 +267,11 @@ float4 main() : sv_target [test] uniform 0 float 2 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 4.0) uniform 0 float 1 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 0.0, 0.0, 4.0) uniform 0 float 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 1.0, 0.0, 4.0) diff --git a/tests/hlsl/const.shader_test b/tests/hlsl/const.shader_test index a7a19e8c..9a0cc410 100644 --- a/tests/hlsl/const.shader_test +++ b/tests/hlsl/const.shader_test @@ -10,7 +10,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 0.1 0.2 0.3 0.4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.1, 2.2, 3.3, 4.4) [pixel shader fail(sm<6)] diff --git a/tests/hlsl/coverage.shader_test b/tests/hlsl/coverage.shader_test index f09476c4..bcaf3aa8 100644 --- a/tests/hlsl/coverage.shader_test +++ b/tests/hlsl/coverage.shader_test @@ -14,11 +14,11 @@ float4 main(out uint sample_mask : SV_Coverage) : SV_Target [test] clear rtv 0 0.0 0.0 0.0 0.0 -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0.5, 0.5, 0.5, 0.5) sample mask 0x0b clear rtv 0 0.0 0.0 0.0 0.0 -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0.25, 0.25, 0.25, 0.25) diff --git a/tests/hlsl/cross.shader_test b/tests/hlsl/cross.shader_test index 3b16c632..837018e3 100644 --- a/tests/hlsl/cross.shader_test +++ b/tests/hlsl/cross.shader_test @@ -12,7 +12,7 @@ float4 main() : sv_target [test] uniform 0 float4 1 -2 3 4 uniform 4 float4 10 100 1000 10000 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-2300, -970, 120, 0) @@ -29,5 +29,5 @@ float4 main() : sv_target [test] uniform 0 float4 1 -2 3 4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-20, 8, 12, 3.5) diff --git a/tests/hlsl/d3dcolor-to-ubyte4.shader_test b/tests/hlsl/d3dcolor-to-ubyte4.shader_test index 3d4b59d7..e818bf22 100644 --- a/tests/hlsl/d3dcolor-to-ubyte4.shader_test +++ b/tests/hlsl/d3dcolor-to-ubyte4.shader_test @@ -11,7 +11,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1912.0, 1657.0, -127.0, 867.0) 1 [pixel shader] @@ -24,5 +24,5 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-127.0, -127.0, -127.0, -127.0) 1 diff --git a/tests/hlsl/ddxddy.shader_test b/tests/hlsl/ddxddy.shader_test index 0a057cf5..307c9063 100644 --- a/tests/hlsl/ddxddy.shader_test +++ b/tests/hlsl/ddxddy.shader_test @@ -8,7 +8,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo(sm<4 | glsl) draw quad +todo(sm<4 | glsl | msl) draw quad probe (0, 0, 640, 480) rgba (1.0, 1.0, 0.0, 0.0) @@ -29,7 +29,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo(sm<4 | glsl) draw quad +todo(sm<4 | glsl | msl) draw quad todo(sm<4) probe (10, 10) rgba (-16.0, -5.0, 3.0, 0.0) todo(sm<4) probe (11, 10) rgba (-21.0, -5.0, 3.0, 0.0) todo(sm<4) probe (10, 11) rgba (-13.0, -5.0, 3.0, 0.0) @@ -55,7 +55,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (10, 10) rgba (-16.0, -5.0, 3.0, 0.0) probe (11, 10) rgba (-21.0, -5.0, 3.0, 0.0) probe (10, 11) rgba (-13.0, -5.0, 3.0, 0.0) @@ -74,7 +74,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (10, 10) rgba (-0.524999976, -0.164999843, 0.104999900, 0.0) 16 probe (11, 10) rgba (-0.689999819, -0.164999843, 0.114999890, 0.0) 32 probe (10, 11) rgba (-0.420000076, -0.154999852, 0.104999900, 0.0) 32 diff --git a/tests/hlsl/default-values.shader_test b/tests/hlsl/default-values.shader_test index 7a759b36..73cd0440 100644 --- a/tests/hlsl/default-values.shader_test +++ b/tests/hlsl/default-values.shader_test @@ -17,7 +17,7 @@ if(sm<4) uniform 8 float4 10 20 0 0 if(sm>=4) uniform 0 float4 10 20 0 0 if(sm>=4) uniform 4 float4 10 30 50 70 if(sm>=4) uniform 8 float4 20 40 60 80 -draw quad +todo(msl) draw quad probe (0, 0) rgba (10, 20, 50, 60) @@ -57,7 +57,7 @@ float4 main() : sv_target { return b; } [test] uniform 0 float4 10.0 20.0 30.0 40.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (10, 20, 30, 40) @@ -71,7 +71,7 @@ float4 main() : sv_target [test] uniform 0 float4 10.0 20.0 30.0 40.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (20, 40, 60, 80) @@ -88,7 +88,7 @@ if(sm<4) uniform 0 float4 10 20 30 40 if(sm<4) uniform 4 float4 50 60 70 80 if(sm>=4) uniform 0 int4 10 20 30 40 if(sm>=4) uniform 4 int4 50 60 70 80 -draw quad +todo(msl) draw quad probe (0, 0) rgba (100, 120, 140, 160) @@ -111,7 +111,7 @@ if(sm<4) uniform 8 float4 70 90 0 0 if(sm<4) uniform 12 float4 80 100 0 0 if(sm>=4) uniform 8 int4 70 90 0 0 if(sm>=4) uniform 12 int4 80 100 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (70, 80, 90, 100) @@ -134,7 +134,7 @@ if(sm<4) uniform 8 float4 10 20 0 0 if(sm>=4) uniform 0 float4 10 20 0 0 if(sm>=4) uniform 4 float4 10 30 50 70 if(sm>=4) uniform 8 float4 20 40 60 80 -draw quad +todo(msl) draw quad probe (0, 0) rgba (10, 20, 50, 60) @@ -170,7 +170,7 @@ float4 main() : sv_target { return b; } [test] uniform 0 float4 10 20 30 40 -draw quad +todo(msl) draw quad probe (0, 0) rgba (10, 20, 30, 40) @@ -190,7 +190,7 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 30 50 40 40 if(sm>=4) uniform 0 float4 10 20 0 0 if(sm>=4) uniform 4 float4 30 50 40 40 -draw quad +todo(msl) draw quad probe (0, 0) rgba (60, 100, 80, 80) @@ -216,7 +216,7 @@ if(sm<4) uniform 8 float4 70 90 0 0 if(sm<4) uniform 12 float4 80 100 0 0 if(sm>=4) uniform 8 int4 70 90 0 0 if(sm>=4) uniform 12 int4 80 100 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (70, 80, 90, 100) diff --git a/tests/hlsl/depth-out.shader_test b/tests/hlsl/depth-out.shader_test index 9f99ff78..9f3d1b2c 100644 --- a/tests/hlsl/depth-out.shader_test +++ b/tests/hlsl/depth-out.shader_test @@ -16,22 +16,22 @@ float main() : SV_Depth uniform 0 float 0.0 clear dsv 1.0 depth less -draw quad +todo(msl) draw quad probe dsv (0,0) r (0.0) uniform 0 float 0.75 clear dsv 1.0 -draw quad +todo(msl) draw quad probe dsv (0,0) r (0.75) clear dsv 0.5 depth greater -draw quad +todo(msl) draw quad probe dsv (0,0) r (0.75) depth less clear dsv 0.5 -draw quad +todo(msl) draw quad probe dsv (0,0) r (0.5) diff --git a/tests/hlsl/determinant.shader_test b/tests/hlsl/determinant.shader_test index 800525b4..fbea4271 100644 --- a/tests/hlsl/determinant.shader_test +++ b/tests/hlsl/determinant.shader_test @@ -8,7 +8,7 @@ float4 main() : sv_target [test] uniform 0 float4 9.0 2.0 3.0 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (9.0, 9.0, 9.0, 9.0) [pixel shader] @@ -21,7 +21,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [pixel shader] @@ -35,7 +35,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 5.0 6.0 7.0 8.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-4.0, -4.0, -4.0, -4.0) [pixel shader] @@ -49,7 +49,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 5.0 6.0 7.0 8.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [pixel shader] @@ -64,7 +64,7 @@ float4 main() : sv_target uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 5.0 -6.0 7.0 8.0 uniform 8 float4 9.0 10.0 11.0 12.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (192.0, 192.0, 192.0, 192.0) [pixel shader] @@ -80,7 +80,7 @@ uniform 0 float4 1.0 -2.0 3.0 4.0 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 13.0 14.0 15.0 16.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-672.0, -672.0, -672.0, -672.0) [pixel shader] @@ -96,7 +96,7 @@ uniform 0 float4 1.0 2.0 3.0 0.0 uniform 4 float4 5.0 -6.0 7.0 0.0 uniform 8 float4 9.0 10.0 11.0 0.0 uniform 12 float4 0.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (192.0, 192.0, 192.0, 192.0) [pixel shader fail] diff --git a/tests/hlsl/discard.shader_test b/tests/hlsl/discard.shader_test index ea85fd76..a62f7414 100644 --- a/tests/hlsl/discard.shader_test +++ b/tests/hlsl/discard.shader_test @@ -10,10 +10,10 @@ float4 main() : sv_target [test] uniform 0 float4 1 2 3 4 -todo(sm<4 | glsl) draw quad +todo(sm<4 | glsl | msl) draw quad probe (0, 0) rgba (1, 2, 3, 4) uniform 0 float4 9 8 7 6 -todo(sm<4 | glsl) draw quad +todo(sm<4 | glsl | msl) draw quad probe (0, 0) rgba (1, 2, 3, 4) [require] @@ -30,7 +30,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo(sm<4 | glsl) draw quad +todo(sm<4 | glsl | msl) draw quad probe (0, 0) rgba (1, 0, 0, 1) probe (1, 0) rgba (1, 2, 3, 4) probe (0, 1) rgba (1, 2, 3, 4) diff --git a/tests/hlsl/distance.shader_test b/tests/hlsl/distance.shader_test index 7f6924a1..b0fa5fe4 100644 --- a/tests/hlsl/distance.shader_test +++ b/tests/hlsl/distance.shader_test @@ -10,7 +10,7 @@ float4 main() : sv_target [test] uniform 0 float4 -2.0 3.0 4.0 0.1 uniform 4 float4 2.0 -1.0 4.0 5.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (7.483983, 7.483983, 7.483983, 7.483983) 1 [pixel shader] @@ -34,7 +34,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 16 32 48 64 uniform 4 float4 1.0 0.5 0.25 0.125 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 16.0, 48.0, 0.125) [pixel shader] @@ -44,7 +44,7 @@ float4 main() : SV_TARGET } [test] -todo(sm>=6) draw quad +todo(sm>=6 | msl) draw quad probe (0, 0) rgba (1.0, 80.0, 3.0, 80.0) [pixel shader] @@ -54,7 +54,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 304.0, 76.0, 4.0) [pixel shader fail] diff --git a/tests/hlsl/dot.shader_test b/tests/hlsl/dot.shader_test index c3dae112..7362998c 100644 --- a/tests/hlsl/dot.shader_test +++ b/tests/hlsl/dot.shader_test @@ -10,7 +10,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 5.0 uniform 4 float4 10.0 11.0 12.0 13.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (166.0, 166.0, 166.0, 166.0) [pixel shader] @@ -25,7 +25,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 0.0 0.0 uniform 4 float4 10.0 11.0 12.0 13.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (53.0, 53.0, 53.0, 53.0) [pixel shader] @@ -40,7 +40,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 uniform 4 float4 10.0 11.0 12.0 13.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (92.0, 92.0, 92.0, 92.0) [pixel shader] @@ -55,7 +55,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 10.0 11.0 12.0 13.0 uniform 4 float4 2.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (92.0, 92.0, 92.0, 92.0) [pixel shader] @@ -71,7 +71,7 @@ float4 main() : SV_TARGET % Account for both the SM1 and SM4 uniform layout uniform 0 float4 2.0 3.0 0.0 0.0 uniform 4 float4 3.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (6.0, 6.0, 6.0, 6.0) [pixel shader] @@ -84,7 +84,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (110.0, 110.0, 110.0, 110.0) [pixel shader fail] diff --git a/tests/hlsl/duplicate-modifiers.shader_test b/tests/hlsl/duplicate-modifiers.shader_test index 23dfc1ef..4a95e553 100644 --- a/tests/hlsl/duplicate-modifiers.shader_test +++ b/tests/hlsl/duplicate-modifiers.shader_test @@ -7,6 +7,6 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad if(sm<6) probe (0,0) rgba (0.1, 0.2, 0.3, 0.4) if(sm>=6) probe (0,0) rgba (0.1, 0.3, 0.2, 0.4) diff --git a/tests/hlsl/early-depth-stencil.shader_test b/tests/hlsl/early-depth-stencil.shader_test index 40806416..69529f13 100644 --- a/tests/hlsl/early-depth-stencil.shader_test +++ b/tests/hlsl/early-depth-stencil.shader_test @@ -26,6 +26,6 @@ depth greater equal clear rtv 0 0.0 0.0 0.0 0.0 clear dsv 0.5 -draw quad +todo(msl) draw quad probe (0, 0) rgba(0, 0, 0, 0) probe uav 1 (0) r(0.0) diff --git a/tests/hlsl/effect-compile.shader_test b/tests/hlsl/effect-compile.shader_test index c01f7c7b..b874ff88 100644 --- a/tests/hlsl/effect-compile.shader_test +++ b/tests/hlsl/effect-compile.shader_test @@ -247,7 +247,7 @@ technique float4 main() : sv_target { return 0; } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0, 0, 0, 0) diff --git a/tests/hlsl/entry-point-semantics.shader_test b/tests/hlsl/entry-point-semantics.shader_test index f9ad158b..48a1e0e6 100644 --- a/tests/hlsl/entry-point-semantics.shader_test +++ b/tests/hlsl/entry-point-semantics.shader_test @@ -36,7 +36,7 @@ float4 main(float tex : texcoord) : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.2, 0.2, 0.2, 0.2) [pixel shader] @@ -49,7 +49,7 @@ float4 main(float tex : texcoord) : sv_target float4 main(float tex : bogus) : bogus; [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.2, 0.2, 0.2, 0.2) @@ -85,7 +85,7 @@ float4 main(in apple a) : sv_target } [test] -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (10.0, 20.0, 30.0, 40.0) @@ -102,7 +102,7 @@ float4 main(in apple a) : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (10.0, 11.0, 30.0, 31.0) @@ -126,7 +126,7 @@ float4 main(in apple aps[2][2]) : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (10.0, 10.0, 20.0, 20.0) @@ -148,7 +148,7 @@ float4 main(in banana bans[2]) : sv_target } [test] -draw quad +todo(msl) draw quad todo(sm>=6) probe (0, 0) rgba (10.0, 11.0, 20.0, 21.0) @@ -212,7 +212,7 @@ float4 main(in float4 tex0 : TEXCOORD0, in float4 tex1 : TEXCOORD1) : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 10.0, 20.0) @@ -275,7 +275,7 @@ float4 main(in float4 t1 : TEXCOORD0, in float4 t2 : TEXCOORD0) : sv_target } [test] -draw quad +todo(msl) draw quad todo(sm>=6) probe (0, 0) rgba (99.0, 99.0, 10.0, 11.0) @@ -287,7 +287,7 @@ float4 main(in float4 a : TEXCOORD0, in float3 b : TEXCOORD1) : sv_target } [test] -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (10.0, 11.0, 20.0, 21.0) diff --git a/tests/hlsl/exp.shader_test b/tests/hlsl/exp.shader_test index 8ace7418..208d24b5 100644 --- a/tests/hlsl/exp.shader_test +++ b/tests/hlsl/exp.shader_test @@ -8,7 +8,7 @@ float4 main() : sv_target [test] uniform 0 float4 -1.0 0.0 1.0 2.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.5, 1.0, 2.0, 4.0) 2 [pixel shader] @@ -21,5 +21,5 @@ float4 main() : sv_target [test] uniform 0 float4 -1.0 0.0 1.0 2.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.36787948, 1.0, 2.7182815, 7.38905573) 2 diff --git a/tests/hlsl/expr-indexing.shader_test b/tests/hlsl/expr-indexing.shader_test index ccc03605..d8f59b4b 100644 --- a/tests/hlsl/expr-indexing.shader_test +++ b/tests/hlsl/expr-indexing.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 5.0 6.0 7.0 8.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (8.0, 8.0, 8.0, 8.0) @@ -26,7 +26,7 @@ float4 main() : sv_target uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 5.0 6.0 7.0 8.0 uniform 8 float 2 -draw quad +todo(msl) draw quad probe (0, 0) rgba (10.0, 10.0, 10.0, 10.0) @@ -40,7 +40,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (3.0, 3.0, 3.0, 3.0) @@ -56,10 +56,10 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (4.0, 4.0, 4.0, 4.0) uniform 4 float 2 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) @@ -78,7 +78,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (4.0, 4.0, 4.0, 4.0) @@ -99,5 +99,5 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float 1 -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) diff --git a/tests/hlsl/f16tof32.shader_test b/tests/hlsl/f16tof32.shader_test index ed20d0bd..73b02821 100644 --- a/tests/hlsl/f16tof32.shader_test +++ b/tests/hlsl/f16tof32.shader_test @@ -11,77 +11,77 @@ float4 main() : sv_target [test] uniform 0 uint 0x5140 -draw quad +todo(msl) draw quad probe (0, 0) rgba(42.0, 42.0, 42.0, 42.0) % zero uniform 0 uint 0x0 -draw quad +todo(msl) draw quad probe (0, 0) rgba(0.0, 0.0, 0.0, 0.0) % negative zero uniform 0 uint 0x8000 -draw quad +todo(msl) draw quad probe (0, 0) rgba(-0.0, -0.0, -0.0, -0.0) % subnormal number uniform 0 uint 0x1 -draw quad +todo(msl) draw quad probe (0, 0) rgba(5.9604645e-08, 5.9604645e-08, 5.9604645e-08, 5.9604645e-08) % subnormal number uniform 0 uint 0x2 -draw quad +todo(msl) draw quad probe (0, 0) rgba(1.1920929e-07, 1.1920929e-07, 1.1920929e-07, 1.1920929e-07) % subnormal number uniform 0 uint 0x4 -draw quad +todo(msl) draw quad probe (0, 0) rgba(2.3841858e-07, 2.3841858e-07, 2.3841858e-07, 2.3841858e-07) % subnormal number uniform 0 uint 0x8 -draw quad +todo(msl) draw quad probe (0, 0) rgba(4.7683716e-07, 4.7683716e-07, 4.7683716e-07, 4.7683716e-07) % subnormal number uniform 0 uint 0x10 -draw quad +todo(msl) draw quad probe (0, 0) rgba(9.536743e-07, 9.536743e-07, 9.536743e-07, 9.536743e-07) % subnormal number uniform 0 uint 0x20 -draw quad +todo(msl) draw quad probe (0, 0) rgba(1.9073486e-06, 1.9073486e-06, 1.9073486e-06, 1.9073486e-06) % subnormal number uniform 0 uint 0x40 -draw quad +todo(msl) draw quad probe (0, 0) rgba(3.8146973e-06, 3.8146973e-06, 3.8146973e-06, 3.8146973e-06) % subnormal number uniform 0 uint 0x80 -draw quad +todo(msl) draw quad probe (0, 0) rgba(7.6293945e-06, 7.6293945e-06, 7.6293945e-06, 7.6293945e-06) % subnormal number uniform 0 uint 0x100 -draw quad +todo(msl) draw quad probe (0, 0) rgba(1.5258789e-05, 1.5258789e-05, 1.5258789e-05, 1.5258789e-05) % subnormal number uniform 0 uint 0x200 -draw quad +todo(msl) draw quad probe (0, 0) rgba(3.0517578e-05, 3.0517578e-05, 3.0517578e-05, 3.0517578e-05) % I'd love to use rgba probes here but msvc doesn't scanf infinity :( % positive infinity uniform 0 uint 0x7c00 -draw quad +todo(msl) draw quad probe (0, 0) rgbaui(0x7f800000, 0x7f800000, 0x7f800000, 0x7f800000) % negative infinity uniform 0 uint 0xfc00 -draw quad +todo(msl) draw quad probe (0, 0) rgbaui(0xff800000, 0xff800000, 0xff800000, 0xff800000) diff --git a/tests/hlsl/f32tof16.shader_test b/tests/hlsl/f32tof16.shader_test index ef8efe9b..aa4092ec 100644 --- a/tests/hlsl/f32tof16.shader_test +++ b/tests/hlsl/f32tof16.shader_test @@ -11,77 +11,77 @@ uint4 main() : sv_target [test] uniform 0 float 42.0 -draw quad +todo(msl) draw quad probe (0, 0) rgbaui (0x5140, 0x5140, 0x5140, 0x5140) % zero uniform 0 float 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgbaui (0x0, 0x0, 0x0, 0x0) % negative zero uniform 0 uint 0x8000 -draw quad +todo(msl) draw quad probe (0, 0) rgba(-0.0, -0.0, -0.0, -0.0) % subnormal number uniform 0 float 5.9604645e-08 -draw quad +todo(msl) draw quad probe (0, 0) rgbaui (0x1, 0x1, 0x1, 0x1) % subnormal number uniform 0 float 1.1920929e-07 -draw quad +todo(msl) draw quad probe (0, 0) rgbaui (0x2, 0x2, 0x2, 0x2) % subnormal number uniform 0 float 2.3841858e-07 -draw quad +todo(msl) draw quad probe (0, 0) rgbaui (0x4, 0x4, 0x4, 0x4) % subnormal number uniform 0 float 4.7683716e-07 -draw quad +todo(msl) draw quad probe (0, 0) rgbaui (0x8, 0x8, 0x8, 0x8) % subnormal number uniform 0 float 9.536743e-07 -draw quad +todo(msl) draw quad probe (0, 0) rgbaui (0x10, 0x10, 0x10, 0x10) % subnormal number uniform 0 float 1.9073486e-06 -draw quad +todo(msl) draw quad probe (0, 0) rgbaui (0x20, 0x20, 0x20, 0x20) % subnormal number uniform 0 float 3.8146973e-06 -draw quad +todo(msl) draw quad probe (0, 0) rgbaui (0x40, 0x40, 0x40, 0x40) % subnormal number uniform 0 float 7.6293945e-06 -draw quad +todo(msl) draw quad probe (0, 0) rgbaui (0x80, 0x80, 0x80, 0x80) % subnormal number uniform 0 float 1.5258789e-05 -draw quad +todo(msl) draw quad probe (0, 0) rgbaui (0x100, 0x100, 0x100, 0x100) % subnormal number uniform 0 float 3.0517578e-05 -draw quad +todo(msl) draw quad probe (0, 0) rgbaui (0x200, 0x200, 0x200, 0x200) % I'd love to use rgba probes here but msvc doesn't scanf infinity :( % positive infinity uniform 0 uint 0x7f800000 -draw quad +todo(msl) draw quad probe (0, 0) rgbaui (0x7c00, 0x7c00, 0x7c00, 0x7c00) % negative infinity uniform 0 uint 0xff800000 -draw quad +todo(msl) draw quad probe (0, 0) rgbaui (0xfc00, 0xfc00, 0xfc00, 0xfc00) diff --git a/tests/hlsl/faceforward.shader_test b/tests/hlsl/faceforward.shader_test index 283594c2..2c1bc682 100644 --- a/tests/hlsl/faceforward.shader_test +++ b/tests/hlsl/faceforward.shader_test @@ -12,41 +12,41 @@ float4 main() : sv_target uniform 0 float4 10.0 20.0 30.0 40.0 uniform 4 float4 1.0 0.0 0.0 0.0 uniform 8 float4 1.0 0.2 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-10.0, -20.0, -30.0, -40.0) uniform 0 float4 10.0 20.0 30.0 40.0 uniform 4 float4 1.0 0.0 0.0 0.0 uniform 8 float4 1.0 -0.2 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-10.0, -20.0, -30.0, -40.0) uniform 0 float4 10.0 20.0 30.0 40.0 uniform 4 float4 1.0 0.0 0.0 0.0 uniform 8 float4 -1.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (10.0, 20.0, 30.0, 40.0) uniform 0 float4 10.0 20.0 30.0 40.0 uniform 4 float4 0.0 -1.0 0.0 0.0 uniform 8 float4 0.0 1.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (10.0, 20.0, 30.0, 40.0) uniform 0 float4 10.0 20.0 30.0 40.0 uniform 4 float4 1.0 0.0 0.0 0.0 uniform 8 float4 0.0 1.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-10.0, -20.0, -30.0, -40.0) uniform 0 float4 10.0 20.0 30.0 40.0 uniform 4 float4 0.0 0.0 0.0 0.0 uniform 8 float4 0.0 1.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-10.0, -20.0, -30.0, -40.0) uniform 0 float4 10.0 20.0 30.0 40.0 uniform 4 float4 0.0 0.0 0.0 0.0 uniform 8 float4 0.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-10.0, -20.0, -30.0, -40.0) diff --git a/tests/hlsl/float-comparison.shader_test b/tests/hlsl/float-comparison.shader_test index 5244fb39..493f50ea 100644 --- a/tests/hlsl/float-comparison.shader_test +++ b/tests/hlsl/float-comparison.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [test] uniform 0 float 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) @@ -55,7 +55,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 1.5 1.5 0.0 -draw quad +todo(msl) draw quad % SM1-3 apparently treats '0/0' as zero. if(sm<4) todo probe (0,0) rgba (1010101.0, 11001100.0, 1101001.0, 11.0) % SM4-5 optimises away the 'not' by inverting the condition, even though this is invalid for NaN. diff --git a/tests/hlsl/floor.shader_test b/tests/hlsl/floor.shader_test index 96a8aca2..e7942f7b 100644 --- a/tests/hlsl/floor.shader_test +++ b/tests/hlsl/floor.shader_test @@ -5,7 +5,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (-1.0, 6.0, 7.0, 3.0) 4 [pixel shader] @@ -18,7 +18,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-1.0, 6.0, 7.0, 3.0) 4 [pixel shader] @@ -34,7 +34,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (6.0, 7.0, -1.0, 3.0) 4 @@ -52,5 +52,5 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 -1 6 7 3 if(sm>=4) uniform 0 int4 -1 6 7 3 -draw quad +todo(msl) draw quad probe (0, 0) rgba (6.0, 7.0, -1.0, 3.0) 4 diff --git a/tests/hlsl/fmod.shader_test b/tests/hlsl/fmod.shader_test index 7d51ac7f..7ff8e8b4 100644 --- a/tests/hlsl/fmod.shader_test +++ b/tests/hlsl/fmod.shader_test @@ -8,10 +8,10 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-0.5, 0.0, 0.0, 0.0) 4 uniform 0 float4 1.1 0.3 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.2, 0.0, 0.0, 0.0) 4 [pixel shader] @@ -24,8 +24,8 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 2.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-0.5, 0.5, 0.0, 0.0) 4 uniform 0 float4 1.1 0.3 3.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.1, 0.3, 0.0, 0.0) 4 diff --git a/tests/hlsl/for.shader_test b/tests/hlsl/for.shader_test index 14712f62..a8cc015c 100644 --- a/tests/hlsl/for.shader_test +++ b/tests/hlsl/for.shader_test @@ -54,7 +54,7 @@ float4 main(float tex : texcoord) : sv_target [test] uniform 0 uint4 10 0 0 0 -draw quad +todo(msl) draw quad probe ( 0, 0, 159, 480) rgba (10.0, 35.0, 0.0, 0.0) probe (161, 0, 479, 480) rgba (10.0, 38.0, 0.0, 0.0) probe (481, 0, 640, 480) rgba ( 5.0, 10.0, 0.0, 0.0) @@ -76,7 +76,7 @@ float4 main(float tex : texcoord) : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (10.0, 45.0, 0.0, 0.0) [pixel shader fail(sm<6)] diff --git a/tests/hlsl/frac.shader_test b/tests/hlsl/frac.shader_test index 89d05de4..cfd02738 100644 --- a/tests/hlsl/frac.shader_test +++ b/tests/hlsl/frac.shader_test @@ -8,5 +8,5 @@ float4 main() : sv_target [test] uniform 0 float4 -1.1 1.6 1.3 0.5 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.9, 0.6, 0.3, 0.5) 2 diff --git a/tests/hlsl/function-return.shader_test b/tests/hlsl/function-return.shader_test index b70ae706..71ab9034 100644 --- a/tests/hlsl/function-return.shader_test +++ b/tests/hlsl/function-return.shader_test @@ -29,7 +29,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.2, 0.1, 0.8, 0.5); [pixel shader todo(sm<4)] @@ -79,16 +79,16 @@ float4 main() : sv_target [test] uniform 0 float 0.1 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.3, 0.2, 0.6, 0.3) 1 uniform 0 float 0.4 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.6, 0.5, 0.6, 0.3) 1 uniform 0 float 0.6 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.6, 0.5, 0.4, 0.5) 1 uniform 0 float 0.8 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.8, 0.7, 0.4, 0.5) 1 [pixel shader todo(sm<4)] @@ -134,13 +134,13 @@ float4 main() : sv_target [test] uniform 0 float 0.1 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.2, 0.1, 0.2, 0.1) 1 uniform 0 float 0.5 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.5, 0.4, 1.0, 0.9) 1 uniform 0 float 0.9 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 0.9, 1.0, 0.6) 1 [pixel shader] @@ -181,7 +181,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.4, 0.3, 0.3, 0.9) 1 [pixel shader todo(sm<4)] @@ -235,23 +235,23 @@ float4 main() : sv_target [test] uniform 0 float 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.3, 0.2, 0.3, 0.3) 1 uniform 0 float 0.1 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.3, 0.3, 0.3, 0.3) 1 uniform 0 float 0.3 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.3, 0.5, 0.3, 0.3) 1 uniform 0 float 0.7 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.3, 0.9, 0.7, 0.6) 1 uniform 0 float 0.9 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.4, 0.1, 0.7, 0.6) 1 [pixel shader todo(sm<4)] @@ -291,21 +291,21 @@ float4 main() : sv_target 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(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.3, 0.2, 0.6, 0.6) 1 uniform 4 float4 0.35 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.3, 0.3, 0.6, 0.6) 1 uniform 8 float4 0.5 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.3, 0.5, 0.6, 0.6) 1 uniform 0 float4 1.0 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.3, 0.5, 0.6, 0.6) 1 uniform 4 float4 2.0 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.4, 0.1, 0.6, 0.6) 1 diff --git a/tests/hlsl/function.shader_test b/tests/hlsl/function.shader_test index 49dbb02f..1c77a51a 100644 --- a/tests/hlsl/function.shader_test +++ b/tests/hlsl/function.shader_test @@ -176,7 +176,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) [pixel shader] @@ -200,7 +200,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.5, 0.6, 0.7, 0) [pixel shader] @@ -221,7 +221,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.6, 0.1, 0.5, 0) % Recursion is forbidden. @@ -275,7 +275,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 3.0, 6.0, 7.0) @@ -293,7 +293,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 3.0, 6.0, 7.0) % Inline modifier @@ -312,7 +312,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 3.0, 6.0, 7.0) % Inline modifier used on entry point @@ -331,7 +331,7 @@ inline float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 3.0, 6.0, 7.0) % Export modifier @@ -343,7 +343,7 @@ export float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) % Default parameter values @@ -360,7 +360,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (10.0, 11.0, 13.0, 16.0) [pixel shader] @@ -375,7 +375,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) [pixel shader fail(sm>=6)] @@ -390,7 +390,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) @@ -408,7 +408,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) % Missing default value for parameter c. diff --git a/tests/hlsl/fwidth.shader_test b/tests/hlsl/fwidth.shader_test index 3ba116a5..3a559f90 100644 --- a/tests/hlsl/fwidth.shader_test +++ b/tests/hlsl/fwidth.shader_test @@ -18,7 +18,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo(sm<4 | glsl) draw quad +todo(sm<4 | glsl | msl) draw quad probe (10, 10) rgba (8.0, 8.0, 8.0, 8.0) probe (11, 10) rgba (8.0, 8.0, 8.0, 8.0) probe (12, 10) rgba (10.0, 10.0, 10.0, 10.0) diff --git a/tests/hlsl/gather-offset.shader_test b/tests/hlsl/gather-offset.shader_test index 76f97ecc..1c1274e5 100644 --- a/tests/hlsl/gather-offset.shader_test +++ b/tests/hlsl/gather-offset.shader_test @@ -23,7 +23,7 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.2, 0.1) @@ -37,7 +37,7 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0.0, 0.1, 0.1, 0.0) @@ -55,7 +55,7 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0.2, 0.2, 0.1, 0.1) @@ -69,7 +69,7 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0.1, 0.1, 0.0, 0.0) @@ -83,7 +83,7 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0.5, 0.0, 0.5, 0.0) @@ -97,7 +97,7 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0.0, 0.4, 0.0, 0.4) @@ -113,5 +113,5 @@ float4 main() : sv_target [test] uniform 0 int4 1 0 0 0 -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.2, 0.1) diff --git a/tests/hlsl/gather.shader_test b/tests/hlsl/gather.shader_test index fdfc05bb..7c7a8b9b 100644 --- a/tests/hlsl/gather.shader_test +++ b/tests/hlsl/gather.shader_test @@ -23,7 +23,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.1, 0.1, 0.0) @@ -37,7 +37,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.2, 0.1) @@ -55,7 +55,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.1, 0.0, 0.0) @@ -69,7 +69,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.2, 0.2, 0.1, 0.1) @@ -97,7 +97,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.5, 0.0, 0.5) @@ -111,5 +111,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.4, 0.0, 0.4, 0.0) diff --git a/tests/hlsl/getdimensions.shader_test b/tests/hlsl/getdimensions.shader_test index c421d216..f4861934 100644 --- a/tests/hlsl/getdimensions.shader_test +++ b/tests/hlsl/getdimensions.shader_test @@ -28,7 +28,7 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (2.0, 3.0, 2.0, 3.0) [srv 1] @@ -53,5 +53,5 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (2.0, 2.0, 1.0, 2.0) diff --git a/tests/hlsl/half.shader_test b/tests/hlsl/half.shader_test index a4f6f5ed..67c1a98e 100644 --- a/tests/hlsl/half.shader_test +++ b/tests/hlsl/half.shader_test @@ -19,5 +19,5 @@ float4 main() : sv_target [test] uniform 0 float 10.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (10.0, 10.0, 10.0, 10.0) diff --git a/tests/hlsl/hard-copy-prop.shader_test b/tests/hlsl/hard-copy-prop.shader_test index f6dc08c5..d6dbb055 100644 --- a/tests/hlsl/hard-copy-prop.shader_test +++ b/tests/hlsl/hard-copy-prop.shader_test @@ -17,10 +17,10 @@ float4 main() : sv_target [test] uniform 0 float 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) uniform 0 float 1.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (-2.0, -2.0, -2.0, -2.0) @@ -43,10 +43,10 @@ float4 main() : sv_target [test] uniform 0 float 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) uniform 0 float 1.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (20.0, 20.0, 20.0, 20.0) @@ -69,8 +69,8 @@ float4 main() : sv_target [test] uniform 0 float 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 4.0, 0.0, 0.0) uniform 0 float 1.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 40.0, 0.0, 0.0) diff --git a/tests/hlsl/initializer-flatten.shader_test b/tests/hlsl/initializer-flatten.shader_test index 91fc7a37..94148734 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(msl) draw quad probe (0, 0) rgba (1, 2, 3, 4) @@ -24,7 +24,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (4, 5, 6, 7) @@ -37,7 +37,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (40, 10, 20, 30) @@ -56,7 +56,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) @@ -69,5 +69,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) diff --git a/tests/hlsl/initializer-implicit-array.shader_test b/tests/hlsl/initializer-implicit-array.shader_test index d7f4094c..4ebb984c 100644 --- a/tests/hlsl/initializer-implicit-array.shader_test +++ b/tests/hlsl/initializer-implicit-array.shader_test @@ -7,7 +7,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (50, 60, 70, 80) @@ -21,7 +21,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad % dxcompiler emits a nop shader which returns immediately. if(sm<6) probe (0,0) rgba (5.0, 6.0, 7.0, 8.0) @@ -35,7 +35,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (7.0, 8.0, 9.0, 10.0) @@ -63,7 +63,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (318.0, 320.0, 322.0, 324.0) diff --git a/tests/hlsl/initializer-invalid-arg-count.shader_test b/tests/hlsl/initializer-invalid-arg-count.shader_test index e0bab46f..bb7ab083 100644 --- a/tests/hlsl/initializer-invalid-arg-count.shader_test +++ b/tests/hlsl/initializer-invalid-arg-count.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (17, 18, 19, 20) @@ -57,7 +57,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (22, 23, 24, 25) diff --git a/tests/hlsl/initializer-local-array.shader_test b/tests/hlsl/initializer-local-array.shader_test index 4aa0206a..9a0e1a09 100644 --- a/tests/hlsl/initializer-local-array.shader_test +++ b/tests/hlsl/initializer-local-array.shader_test @@ -10,7 +10,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (21, 22, 23, 24) @@ -31,5 +31,5 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (71, 72, 73, 74) diff --git a/tests/hlsl/initializer-matrix.shader_test b/tests/hlsl/initializer-matrix.shader_test index ef9f4ca6..d778f4ee 100644 --- a/tests/hlsl/initializer-matrix.shader_test +++ b/tests/hlsl/initializer-matrix.shader_test @@ -6,7 +6,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (21, 22, 23, 0) @@ -18,7 +18,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (21, 22, 23, 0) @@ -30,7 +30,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (21, 22, 23, 24) @@ -42,7 +42,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (21, 22, 31, 32) @@ -55,7 +55,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (21, 22, 31, 32) @@ -68,5 +68,5 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (21, 22, 31, 32) diff --git a/tests/hlsl/initializer-multi.shader_test b/tests/hlsl/initializer-multi.shader_test index 044e2752..adb2006e 100644 --- a/tests/hlsl/initializer-multi.shader_test +++ b/tests/hlsl/initializer-multi.shader_test @@ -7,7 +7,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2, 3, 3, 0) @@ -32,7 +32,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (7.2, 8.0, 7.2, 8.0) @@ -48,5 +48,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.2, 9.0, 5.2, 9.0) diff --git a/tests/hlsl/initializer-nested.shader_test b/tests/hlsl/initializer-nested.shader_test index d5a47f1e..d54c4c7b 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(msl) draw quad probe (0, 0) rgba (1, 2, 3, 4) @@ -23,7 +23,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (21, 22, 23, 24) @@ -52,5 +52,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (21, 22, 23, 24) diff --git a/tests/hlsl/initializer-numeric.shader_test b/tests/hlsl/initializer-numeric.shader_test index 9ed50998..d3933503 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(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) 4 @@ -18,7 +18,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) 4 @@ -31,7 +31,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) 4 @@ -44,7 +44,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (10.1, 1.1, 1.2, 2.1) 4 @@ -56,7 +56,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (3.0, 250.0, 16.0, 4.2949673e+009) 4 @@ -69,6 +69,6 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad if(sm<6) probe (0,0) rgba (-1294967296.0, 3000000000.0, 0.0, 0.0) 4 if(sm>=6) probe (0,0) rgba (3000000000.0, 3000000000.0, 0.0, 0.0) 4 diff --git a/tests/hlsl/initializer-objects.shader_test b/tests/hlsl/initializer-objects.shader_test index 6156233d..aea17154 100644 --- a/tests/hlsl/initializer-objects.shader_test +++ b/tests/hlsl/initializer-objects.shader_test @@ -25,7 +25,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.2, 0.2, 0.2, 0.1) @@ -48,7 +48,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (31.1, 41.1, 51.1, 61.1) 1 diff --git a/tests/hlsl/initializer-static-array.shader_test b/tests/hlsl/initializer-static-array.shader_test index a974886f..667c4285 100644 --- a/tests/hlsl/initializer-static-array.shader_test +++ b/tests/hlsl/initializer-static-array.shader_test @@ -11,7 +11,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (21, 22, 23, 24) @@ -33,5 +33,5 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (61, 62, 63, 64) diff --git a/tests/hlsl/initializer-struct.shader_test b/tests/hlsl/initializer-struct.shader_test index e1c4d870..e875be44 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(msl) draw quad probe (0, 0) rgba (41, 42, 43, 44) @@ -52,7 +52,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (4311, 4312, 4313, 4314) @@ -80,5 +80,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (21, 22, 23, 24) diff --git a/tests/hlsl/instance-id.shader_test b/tests/hlsl/instance-id.shader_test index fd0e7e8b..1fdad004 100644 --- a/tests/hlsl/instance-id.shader_test +++ b/tests/hlsl/instance-id.shader_test @@ -42,7 +42,7 @@ float4 main(vs_out i) : SV_Target } [test] -todo(glsl) draw triangle list 3 4 +todo(glsl | msl) draw triangle list 3 4 probe rtv 0 (160, 120) rgba (0.0, 0.25, 0.0, 0.25) probe rtv 0 (480, 120) rgba (0.0, 0.5, 0.0, 0.5) probe rtv 0 (480, 360) rgba (0.0, 0.75, 0.0, 0.75) diff --git a/tests/hlsl/interface-packing.shader_test b/tests/hlsl/interface-packing.shader_test index 05228cae..fb90b422 100644 --- a/tests/hlsl/interface-packing.shader_test +++ b/tests/hlsl/interface-packing.shader_test @@ -14,7 +14,7 @@ float4 main(float2 color_xy : COLOR0, float2 color_zw : COLOR1) : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe(320, 240) rgba(0.25, 0.5, 0.75, 1.0) % Test handling of arrays in interface blocks @@ -115,7 +115,7 @@ float4 main(data input) : SV_Target [test] clear rtv 0 -1.0 -1.0 -1.0 -1.0 -todo(mvk & vulkan) draw triangle list 3 +todo(mvk & vulkan | msl) draw triangle list 3 todo(mvk) probe (0, 0) rgba ( 0.0, 0.0, 0.0, 0.0) todo(mvk) probe (1, 0) rgba ( 1.0, 12.0, 13.0, 14.0) todo(mvk) probe (2, 0) rgba ( 2.0, 15.0, 16.0, 22.0) @@ -158,5 +158,5 @@ float4 main(float4 pos : SV_Position, float4 color : COLOR) : SV_Target } [test] -todo(mvk & sm<4) draw triangle list 3 +todo(mvk & sm<4 | msl) draw triangle list 3 probe (0, 0) rgba(1.0, 10.0, 11.0, 4.0) diff --git a/tests/hlsl/intrinsic-override.shader_test b/tests/hlsl/intrinsic-override.shader_test index 98d7f669..e4f1ac88 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(msl) draw quad probe (0, 0) rgba (0.3, 0.3, 0.4, 0.6) [pixel shader fail(sm>=6)] @@ -27,7 +27,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.3, 0.3, 0.3, 0.4) diff --git a/tests/hlsl/inverse-trig.shader_test b/tests/hlsl/inverse-trig.shader_test index dbf3ae4c..c70919fe 100644 --- a/tests/hlsl/inverse-trig.shader_test +++ b/tests/hlsl/inverse-trig.shader_test @@ -13,23 +13,23 @@ float4 main() : sv_target [test] uniform 0 float4 -1.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (3.14159274, 0.0, 0.0, 0.0) 128 uniform 0 float4 -0.5 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.094441441, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.57072878, 0.0, 0.0, 0.0) 1024 uniform 0 float4 0.5 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.04715133, 0.0, 0.0, 0.0) 512 uniform 0 float4 1.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) 128 [pixel shader] @@ -44,7 +44,7 @@ float4 main() : sv_target [test] uniform 0 float4 -1.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-31416.0, 0.0, 0.0, 0.0) [require] @@ -52,15 +52,15 @@ shader model < 6.0 [test] uniform 0 float4 -0.5 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-10473.0, 0.0, 0.0, 0.0) uniform 0 float4 0.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 0.0, 0.0, 0.0) uniform 0 float4 0.5 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (10473.0, 0.0, 0.0, 0.0) [require] @@ -88,7 +88,7 @@ probe (0, 0) rgba (10472.0, 0.0, 0.0, 0.0) 4096 [test] uniform 0 float4 1.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (31416.0, 0.0, 0.0, 0.0) @@ -102,23 +102,23 @@ float4 main() : sv_target [test] uniform 0 float4 -1.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-0.785409629, 0.0, 0.0, 0.0) 512 uniform 0 float4 -0.5 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-0.4636476, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.5 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.4636476, 0.0, 0.0, 0.0) 256 uniform 0 float4 1.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.785409629, 0.0, 0.0, 0.0) 512 [pixel shader] @@ -133,64 +133,64 @@ float4 main() : sv_target [test] % Non-degenerate cases uniform 0 float4 1.0 1.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.785385, 0.0, 0.0, 0.0) 512 uniform 0 float4 5.0 -5.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.356194, 0.0, 0.0, 0.0) 256 uniform 0 float4 -3.0 -3.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-2.356194, 0.0, 0.0, 0.0) 256 uniform 0 float4 1.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.570796, 0.0, 0.0, 0.0) 256 uniform 0 float4 -1.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-1.570796, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 1.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 -1.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (3.1415927, 0.0, 0.0, 0.0) 256 % Degenerate cases uniform 0 float4 0.00001 0.00002 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.463647, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.00001 -0.00002 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.677945, 0.0, 0.0, 0.0) 256 uniform 0 float4 -0.00001 100000.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-0.000000000099986595, 0.0, 0.0, 0.0) 2048 uniform 0 float4 10000000.0 0.00000001 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.570796, 0.0, 0.0, 0.0) 256 % Negative zero behavior should be to treat it the % same as normal zero. uniform 0 float4 1000000000.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.570796, 0.0, 0.0, 0.0) 256 uniform 0 float4 1000000000.0 -0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.570796, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 -1.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (3.1415927, 0.0, 0.0, 0.0) 256 uniform 0 float4 -0.0 -1.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (3.1415927, 0.0, 0.0, 0.0) 256 diff --git a/tests/hlsl/is-front-face.shader_test b/tests/hlsl/is-front-face.shader_test index 06be3fb9..be268b8a 100644 --- a/tests/hlsl/is-front-face.shader_test +++ b/tests/hlsl/is-front-face.shader_test @@ -22,7 +22,7 @@ float4 main(bool face : sv_isfrontface) : sv_target } [test] -draw triangle strip 4 +todo(msl) draw triangle strip 4 probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) [vb 0] @@ -32,5 +32,5 @@ probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) 2.0 2.0 [test] -draw triangle strip 4 +todo(msl) draw triangle strip 4 probe (0, 0, 640, 480) rgba (1.0, 2.0, 1.0, 2.0) diff --git a/tests/hlsl/ldexp.shader_test b/tests/hlsl/ldexp.shader_test index 5a26ffb9..073beba8 100644 --- a/tests/hlsl/ldexp.shader_test +++ b/tests/hlsl/ldexp.shader_test @@ -10,7 +10,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 5.0 uniform 4 float4 0.0 -10.0 10.0 100.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) 2 @@ -28,7 +28,7 @@ if(sm<4) uniform 0 float4 2 3 4 5 if(sm<4) uniform 4 float4 0 -10 10 100 if(sm>=4) uniform 0 int4 2 3 4 5 if(sm>=4) uniform 4 int4 0 -10 10 100 -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) 2 @@ -43,7 +43,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (64.0, 64.0, 64.0, 40.0) diff --git a/tests/hlsl/length.shader_test b/tests/hlsl/length.shader_test index 58b051cc..dad94971 100644 --- a/tests/hlsl/length.shader_test +++ b/tests/hlsl/length.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 5.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (7.34846926, 7.34846926, 7.34846926, 7.34846926) 1 [pixel shader] @@ -21,7 +21,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.38516474, 5.38516474, 5.38516474, 5.38516474) 1 [pixel shader] @@ -34,7 +34,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (3.60555124, 3.60555124, 3.60555124, 3.60555124) 1 [pixel shader] @@ -47,7 +47,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) [pixel shader] @@ -60,7 +60,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) [pixel shader fail] diff --git a/tests/hlsl/lerp.shader_test b/tests/hlsl/lerp.shader_test index dac2e051..edbf1f70 100644 --- a/tests/hlsl/lerp.shader_test +++ b/tests/hlsl/lerp.shader_test @@ -12,7 +12,7 @@ float4 main() : SV_TARGET uniform 0 float4 2.0 3.0 4.0 5.0 uniform 4 float4 0.0 -10.0 10.0 100.0 uniform 8 float4 0.0 1.0 -1.0 0.75 -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, -10.0, -2.0, 76.25) @@ -33,7 +33,7 @@ if(sm<4) uniform 8 float4 0 1 -1 1000000 if(sm>=4) uniform 0 int4 2 3 4 0 if(sm>=4) uniform 4 int4 0 -10 10 1000000 if(sm>=4) uniform 8 int4 0 1 -1 1000000 -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, -10.0, -2.0, 1e12) 4 @@ -49,7 +49,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (-6.0, -2.2, 4.48, 8.28) 1 diff --git a/tests/hlsl/lit.shader_test b/tests/hlsl/lit.shader_test index 84660415..1d47cd10 100644 --- a/tests/hlsl/lit.shader_test +++ b/tests/hlsl/lit.shader_test @@ -8,17 +8,17 @@ float4 main() : sv_target [test] uniform 0 float4 -0.1 10.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 0.0, 0.0, 1.0) [test] uniform 0 float4 1.2 -0.1 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.2, 0.0, 1.0) [test] uniform 0 float4 1.2 2.0 3.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.2, 8.0, 1.0) [pixel shader] @@ -31,7 +31,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.2 2.0 3.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 2.4, 16.0, 2.0) [pixel shader fail] diff --git a/tests/hlsl/load-level.shader_test b/tests/hlsl/load-level.shader_test index 668fe4e3..99a86d71 100644 --- a/tests/hlsl/load-level.shader_test +++ b/tests/hlsl/load-level.shader_test @@ -22,10 +22,10 @@ float4 main() : sv_target [test] uniform 0 uint 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 0.0, 1.0, 0.0) uniform 0 uint 1 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 1.0, 0.0) [pixel shader fail] @@ -47,5 +47,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 0.0, 1.0, 0.0) diff --git a/tests/hlsl/log.shader_test b/tests/hlsl/log.shader_test index eaec15e6..2d0ea412 100644 --- a/tests/hlsl/log.shader_test +++ b/tests/hlsl/log.shader_test @@ -8,7 +8,7 @@ float4 main() : sv_target [test] uniform 0 float4 2.0 4.0 5.0 0.4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 2.32192802, -1.32192802) 1 [pixel shader] @@ -21,7 +21,7 @@ float4 main() : sv_target [test] uniform 0 float4 10.0 100.0 1.0 0.1 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 0.0, -1.0) 1 [pixel shader] @@ -34,5 +34,5 @@ float4 main() : sv_target [test] uniform 0 float4 3.0 10.0 1.0 0.1 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0986123, 2.302585, 0.0, -2.302585) 2 diff --git a/tests/hlsl/logic-operations.shader_test b/tests/hlsl/logic-operations.shader_test index e6b65b18..e0e74cec 100644 --- a/tests/hlsl/logic-operations.shader_test +++ b/tests/hlsl/logic-operations.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] @@ -22,7 +22,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] @@ -35,7 +35,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] @@ -48,7 +48,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] @@ -61,7 +61,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] @@ -75,7 +75,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] @@ -88,7 +88,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] @@ -101,7 +101,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] @@ -114,7 +114,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] @@ -128,7 +128,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] @@ -141,7 +141,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] @@ -154,7 +154,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) @@ -171,11 +171,11 @@ if(sm<4) uniform 0 float 5 if(sm<4) uniform 4 float 0 if(sm>=4) uniform 0 int 5 if(sm>=4) uniform 1 int 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 0.0, 1.0) if(sm<4) uniform 0 float -1 if(sm<4) uniform 4 float 3 if(sm>=4) uniform 0 int -1 if(sm>=4) uniform 1 int 3 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 1.0, 0.0, 0.0) diff --git a/tests/hlsl/loop.shader_test b/tests/hlsl/loop.shader_test index 906c768f..aefa1c14 100644 --- a/tests/hlsl/loop.shader_test +++ b/tests/hlsl/loop.shader_test @@ -18,7 +18,7 @@ float4 main() : sv_target [test] uniform 0 float 5.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (50.0, 50.0, 50.0, 50.0) @@ -41,7 +41,7 @@ float4 main() : sv_target [test] uniform 0 float 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (20.0, 20.0, 20.0, 20.0) [pixel shader] @@ -70,7 +70,7 @@ float4 main() : sv_target [test] uniform 0 float 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (409.1, 409.1, 409.1, 409.1) [pixel shader] @@ -100,7 +100,7 @@ float4 main() : sv_target [test] uniform 0 float 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (410.1, 410.1, 410.1, 410.1) % loop attribute by itself @@ -118,7 +118,7 @@ float4 main() : sv_target } [test] -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (10.0, 10.0, 10.0, 10.0) [pixel shader todo(sm<4)] @@ -137,7 +137,7 @@ float4 main() : sv_target } [test] -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (10.0, 10.0, 10.0, 10.0) [pixel shader todo(sm<4)] @@ -156,7 +156,7 @@ float4 main() : sv_target } [test] -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (10.0, 10.0, 10.0, 10.0) % unroll can't be used with fastopt or loop diff --git a/tests/hlsl/majority-pragma.shader_test b/tests/hlsl/majority-pragma.shader_test index 8437ddf3..4f77679f 100644 --- a/tests/hlsl/majority-pragma.shader_test +++ b/tests/hlsl/majority-pragma.shader_test @@ -17,7 +17,7 @@ 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(msl) draw quad probe (0, 0) rgba (0.17, 0.39, 0.17, 0.39) 1 @@ -40,7 +40,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.1 0.2 0.0 0.0 uniform 4 float4 0.3 0.4 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) @@ -61,7 +61,7 @@ uniform 0 float4 0.0 0.0 0.0 0.0 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 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.5, 0.6, 0.7, 0.8) @@ -90,7 +90,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.1 0.2 0.0 0.0 uniform 4 float4 0.3 0.4 0.0 0.0 -draw quad +todo(msl) draw quad 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 @@ -112,7 +112,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.1 0.2 0.0 0.0 uniform 4 float4 0.3 0.4 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) @@ -150,7 +150,7 @@ uniform 0 float4 0.3 0.4 0.0 0.0 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 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.3, 0.4, 0.5, 0.6) @@ -174,7 +174,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.1 0.2 0.0 0.0 uniform 4 float4 0.3 0.4 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) @@ -202,7 +202,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.2 0.4 0.0 0.0 uniform 4 float4 0.3 0.5 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.2, 0.3, 0.4, 0.5) @@ -222,7 +222,7 @@ uniform 0 float4 0.3 0.0 0.0 0.0 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 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.3, 0.4, 0.5, 0.6) % Compiler options @@ -246,7 +246,7 @@ uniform 0 float4 0.1 0.5 0.9 1.3 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 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.2, 0.3, 0.6, 0.7) 1 [require] @@ -268,7 +268,7 @@ uniform 0 float4 0.1 0.5 0.9 1.3 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 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.2, 0.3, 0.6, 0.7) 1 [require] @@ -290,7 +290,7 @@ uniform 0 float4 0.1 0.5 0.9 1.3 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 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.5, 0.9, 0.6, 1.0) 1 [require] @@ -318,7 +318,7 @@ uniform 16 float4 1.7 2.1 2.5 2.9 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 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.3, 0.4, 2.5, 2.9) 1 [require] @@ -346,7 +346,7 @@ uniform 16 float4 1.7 2.1 2.5 2.9 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 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.2, 1.6, 3.1, 3.2) 1 [require] @@ -366,5 +366,5 @@ float4 main() : sv_target [test] uniform 0 float4 0.1 0.2 0.0 0.0 uniform 4 float4 0.3 0.4 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.3, 0.2, 0.4) 1 diff --git a/tests/hlsl/majority-syntax.shader_test b/tests/hlsl/majority-syntax.shader_test index b79d4829..c7c8af4d 100644 --- a/tests/hlsl/majority-syntax.shader_test +++ b/tests/hlsl/majority-syntax.shader_test @@ -11,7 +11,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.1 0.3 0.0 0.0 uniform 4 float4 0.2 0.4 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.3, 0.2, 0.4) [pixel shader fail(sm<6)] diff --git a/tests/hlsl/majority-typedef.shader_test b/tests/hlsl/majority-typedef.shader_test index f48191f1..3323376c 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(msl) draw quad probe (0, 0) rgba (0.17, 0.39, 0.17, 0.39) 1 diff --git a/tests/hlsl/math.shader_test b/tests/hlsl/math.shader_test index 7ab2a36f..90c4a51c 100644 --- a/tests/hlsl/math.shader_test +++ b/tests/hlsl/math.shader_test @@ -14,5 +14,5 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.5 0.3 0.2 0.7 uniform 4 float4 0.1 1.5 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-12.43, 9.833333, 1.6, 35.0) 1 diff --git a/tests/hlsl/matrix-indexing.shader_test b/tests/hlsl/matrix-indexing.shader_test index d2603514..87fe94d2 100644 --- a/tests/hlsl/matrix-indexing.shader_test +++ b/tests/hlsl/matrix-indexing.shader_test @@ -11,7 +11,7 @@ uniform 0 float4 1.0 2.0 3.0 4.0 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 13.0 14.0 15.0 16.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 10.0, 15.0) [pixel shader] @@ -27,7 +27,7 @@ uniform 0 float4 1.0 2.0 3.0 4.0 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 13.0 14.0 15.0 16.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 10.0, 15.0) [pixel shader] @@ -43,7 +43,7 @@ uniform 0 float4 1.0 2.0 3.0 4.0 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 13.0 14.0 15.0 16.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 5.0, 7.0, 12.0) [pixel shader] @@ -58,7 +58,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 1.0 2.0 3.0 0.0 uniform 4 float4 5.0 6.0 7.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 3.0, 6.0, 7.0) [pixel shader] @@ -74,7 +74,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 5.0, 7.0, 12.0) @@ -89,7 +89,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (30.0, 40.0, 5.0, 6.0) @@ -104,7 +104,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (3.0, 4.0, 50.0, 60.0) @@ -120,7 +120,7 @@ float4 main() : sv_target [test] uniform 0 float 2 -draw quad +todo(msl) draw quad probe (0, 0) rgba (8, 9, 10, 11) @@ -136,5 +136,5 @@ float4 main() : sv_target [test] uniform 0 float 3 -draw quad +todo(msl) draw quad probe (0, 0) rgba (12, 13, 14, 15) diff --git a/tests/hlsl/matrix-semantics.shader_test b/tests/hlsl/matrix-semantics.shader_test index b9efed53..8f3736c8 100644 --- a/tests/hlsl/matrix-semantics.shader_test +++ b/tests/hlsl/matrix-semantics.shader_test @@ -8,7 +8,7 @@ float4x1 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader] @@ -18,7 +18,7 @@ row_major float1x4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [rtv 0] @@ -44,7 +44,7 @@ row_major float4x1 main() : sv_target } [test] -todo(sm>=6) draw quad +todo(sm>=6 | msl) draw quad probe rtv 0 (0,0) r (1.0) probe rtv 1 (0,0) r (2.0) probe rtv 2 (0,0) r (3.0) @@ -57,7 +57,7 @@ float1x4 main() : sv_target } [test] -todo(sm>=6) draw quad +todo(sm>=6 | msl) draw quad probe rtv 0 (0,0) r (1.0) probe rtv 1 (0,0) r (2.0) probe rtv 2 (0,0) r (3.0) @@ -78,7 +78,7 @@ void main(out float1x2 x : sv_target0, out float1x2 y : sv_target2) } [test] -todo(sm>=6) draw quad +todo(sm>=6 | msl) draw quad probe rtv 0 (0,0) r (1.0) probe rtv 1 (0,0) r (2.0) probe rtv 2 (0,0) r (5.0) @@ -96,7 +96,7 @@ void main(out row_major float1x4 x : sv_target0, out float1x2 y : sv_target1) } [test] -todo(sm>=6) draw quad +todo(sm>=6 | msl) draw quad probe rtv 0 (0,0) rgba (1.0, 2.0, 3.0, 4.0) probe rtv 1 (0,0) r (5.0) probe rtv 2 (0,0) r (6.0) diff --git a/tests/hlsl/max-min.shader_test b/tests/hlsl/max-min.shader_test index 57fc028e..790c2614 100644 --- a/tests/hlsl/max-min.shader_test +++ b/tests/hlsl/max-min.shader_test @@ -8,7 +8,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.7 -0.1 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.7, 2.1, 2.0, -1.0) @@ -24,7 +24,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.7 -0.1 0.4 0.8 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.7, 0.8, 0.7, 0.2) @@ -39,7 +39,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (6.0, 5.0, 4.0, 5.0) @@ -64,7 +64,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.7 -0.1 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-0.1, 2.0, 1.0, -2.0) @@ -80,7 +80,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.7 -0.1 0.4 0.8 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.4, -0.1, -0.2, -0.1) @@ -101,7 +101,7 @@ uint4 main() : sv_target [test] uniform 0 uint4 1 2 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgbaui (2, 1, 2, 1) [rtv 0] diff --git a/tests/hlsl/minimum-precision.shader_test b/tests/hlsl/minimum-precision.shader_test index 19af64df..1cca75a5 100644 --- a/tests/hlsl/minimum-precision.shader_test +++ b/tests/hlsl/minimum-precision.shader_test @@ -17,7 +17,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (197.0, 218.0, 238.0, 257.0) [rtv 0] @@ -39,7 +39,7 @@ shader model < 6.0 [test] uniform 0 uint4 0 0 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgbaui (0x7fff, 0xffff, 0, 0) [require] diff --git a/tests/hlsl/modf.shader_test b/tests/hlsl/modf.shader_test index 5a7dc407..e4b6b9d0 100644 --- a/tests/hlsl/modf.shader_test +++ b/tests/hlsl/modf.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.2 1.7 -1.2 -1.7 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.2, 0.7, -0.2, -0.7) 4 [pixel shader todo(sm<4)] @@ -24,5 +24,5 @@ float4 main() : sv_target [test] uniform 0 float4 1.2 2.7 -1.2 -2.7 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 2.0, -1.0, -2.0) diff --git a/tests/hlsl/mul.shader_test b/tests/hlsl/mul.shader_test index a3cbf9ec..7d2fba22 100644 --- a/tests/hlsl/mul.shader_test +++ b/tests/hlsl/mul.shader_test @@ -11,7 +11,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (30.0, 70.0, 110.0, 150.0) [pixel shader] @@ -27,7 +27,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (90.0, 100.0, 110.0, 120.0) [pixel shader] @@ -43,7 +43,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (14.0, 38.0, 62.0, 86.0) [pixel shader] @@ -59,7 +59,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (38.0, 44.0, 50.0, 56.0) [pixel shader] @@ -74,7 +74,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (14.0, 32.0, 50.0, 0.0) [pixel shader] @@ -89,7 +89,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (30.0, 36.0, 42.0, 0.0) [pixel shader] @@ -105,7 +105,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (50.0, 60.0, 70.0, 80.0) [pixel shader] @@ -121,7 +121,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (50.0, 60.0, 70.0, 80.0) [pixel shader] @@ -137,7 +137,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (10.0, 20.0, 30.0, 40.0) [pixel shader] @@ -153,7 +153,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (10.0, 50.0, 90.0, 130.0) [pixel shader] @@ -169,7 +169,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (10.0, 20.0, 30.0, 40.0) [pixel shader] @@ -185,7 +185,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (10.0, 50.0, 90.0, 130.0) [pixel shader] @@ -201,7 +201,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (90.0, 100.0, 110.0, 120.0) [pixel shader] @@ -217,7 +217,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 10.0, 15.0, 20.0) [pixel shader] @@ -233,7 +233,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -249,7 +249,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (30.0, 70.0, 110.0, 150.0) [pixel shader] @@ -267,7 +267,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (83.0, 98.0, 113.0, 128.0) [pixel shader] @@ -285,7 +285,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (78.0, 96.0, 114.0, 0.0) @@ -300,7 +300,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (20.0, 14.0, 56.0, 41.0) @@ -315,5 +315,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 11.0, 0.0, 0.0) diff --git a/tests/hlsl/multiple-rt.shader_test b/tests/hlsl/multiple-rt.shader_test index 2bb19112..344928e8 100644 --- a/tests/hlsl/multiple-rt.shader_test +++ b/tests/hlsl/multiple-rt.shader_test @@ -14,6 +14,6 @@ void main(out float4 o0 : sv_target0, out float4 o1 : sv_target1) } [test] -draw quad +todo(msl) draw quad probe rtv 0 (0,0) rgba (0.1, 0.2, 0.3, 0.4) probe rtv 1 (0,0) rgba (0.5, 0.6, 0.7, 0.8) diff --git a/tests/hlsl/nested-arrays.shader_test b/tests/hlsl/nested-arrays.shader_test index 871ec4fb..963c91a8 100644 --- a/tests/hlsl/nested-arrays.shader_test +++ b/tests/hlsl/nested-arrays.shader_test @@ -21,5 +21,5 @@ uniform 8 float4 0.3 0.0 0.0 0.0 uniform 12 float4 0.4 0.0 0.0 0.0 uniform 16 float4 0.5 0.0 0.0 0.0 uniform 20 float4 0.6 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.4, 0.1, 0.6, 0.3) diff --git a/tests/hlsl/nointerpolation.shader_test b/tests/hlsl/nointerpolation.shader_test index b40526b4..03cab0f0 100644 --- a/tests/hlsl/nointerpolation.shader_test +++ b/tests/hlsl/nointerpolation.shader_test @@ -23,7 +23,7 @@ float4 main(nointerpolation float4 t : texcoord) : sv_target } [test] -draw triangle list 3 +todo(msl) draw triangle list 3 probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) [vertex shader] @@ -50,7 +50,7 @@ float4 main(ps_input input) : sv_target } [test] -draw triangle list 3 +todo(msl) draw triangle list 3 probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) [vertex shader] @@ -77,7 +77,7 @@ float4 main(nointerpolation ps_input input) : sv_target } [test] -draw triangle list 3 +todo(msl) draw triangle list 3 probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) [vertex shader] @@ -104,7 +104,7 @@ float4 main(centroid ps_input input) : sv_target } [test] -draw triangle list 3 +todo(msl) draw triangle list 3 probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) [vertex shader] @@ -135,7 +135,7 @@ shader model >= 4.0 shader model < 6.0 [test] -draw triangle list 3 +todo(msl) draw triangle list 3 probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) % Centroid for SM 6. diff --git a/tests/hlsl/non-const-indexing.shader_test b/tests/hlsl/non-const-indexing.shader_test index 399dd022..6a5a0f69 100644 --- a/tests/hlsl/non-const-indexing.shader_test +++ b/tests/hlsl/non-const-indexing.shader_test @@ -12,16 +12,16 @@ uniform 0 float4 1.0 2.0 3.0 4.0 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 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) uniform 12 float4 1 0 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) uniform 12 float4 0 1 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) uniform 12 float4 1 1 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (9.0, 10.0, 11.0, 12.0) @@ -36,16 +36,16 @@ float4 main() : SV_TARGET [test] uniform 0 float 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (11.0, 11.0, 11.0, 11.0) uniform 0 float 1 -draw quad +todo(msl) draw quad probe (0, 0) rgba (12.0, 12.0, 12.0, 12.0) uniform 0 float 2 -draw quad +todo(msl) draw quad probe (0, 0) rgba (13.0, 13.0, 13.0, 13.0) uniform 0 float 3 -draw quad +todo(msl) draw quad probe (0, 0) rgba (14.0, 14.0, 14.0, 14.0) @@ -61,7 +61,7 @@ float4 main() : sv_target [test] uniform 0 float 2.3 -draw quad +todo(msl) draw quad probe (0, 0) rgba (3, 3, 3, 3) @@ -77,16 +77,16 @@ float4 main() : SV_TARGET [test] uniform 0 float 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (21.0, 1.0, 24.0, 0.0) uniform 0 float 1 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (22.0, 0.0, 23.0, 1.0) uniform 0 float 2 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (23.0, 1.0, 22.0, 0.0) uniform 0 float 3 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (24.0, 0.0, 21.0, 1.0) @@ -102,16 +102,16 @@ float4 main() : sv_target [test] uniform 0 float4 0 0 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) uniform 0 float4 1 0 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) uniform 0 float4 0 1 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) uniform 0 float4 1 1 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (9.0, 10.0, 11.0, 12.0) @@ -130,7 +130,7 @@ float4 main() : sv_target [test] uniform 0 float4 0 0 2.4 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 120.0, 90.0, 4.0) @@ -148,12 +148,12 @@ float4 main() : sv_target if(sm<4) uniform 0 float 3 if(sm<4) uniform 4 float 1 if(sm>=4) uniform 0 float4 3 1 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (7, 7, 7, 7) if(sm<4) uniform 0 float 5 if(sm<4) uniform 4 float 0 if(sm>=4) uniform 0 float4 5 0 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (10, 10, 10, 10) @@ -186,13 +186,13 @@ if(sm<4) uniform 0 float 2 if(sm<4) uniform 4 float 1 if(sm<4) uniform 8 float -1 if(sm>=4) uniform 0 float4 2 1 -1 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (30, 31, 32, 33) if(sm<4) uniform 0 float 1 if(sm<4) uniform 4 float 0 if(sm<4) uniform 8 float 1 if(sm>=4) uniform 0 float4 1 0 1 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (70, 71, 72, 73) @@ -214,12 +214,12 @@ float4 main() : sv_target if(sm<4) uniform 0 float 11 if(sm<4) uniform 4 float 12 if(sm>=4) uniform 0 float4 11 12 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (5, 5, 5, 5) if(sm<4) uniform 0 float 13 if(sm<4) uniform 4 float 10 if(sm>=4) uniform 0 float4 13 10 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (9, 9, 9, 9) @@ -244,15 +244,15 @@ float4 main() : sv_target [test] uniform 0 int 0 uniform 1 int 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (100, 6, 7, 8) uniform 0 int 2 uniform 1 int 2 -draw quad +todo(msl) draw quad probe (0, 0) rgba (5, 6, 100, 8) uniform 0 int 1 uniform 1 int 3 -draw quad +todo(msl) draw quad probe (0, 0) rgba (5, 6, 7, 4) @@ -281,7 +281,7 @@ uniform 0 float4 1 2 3 4 uniform 4 float4 5 6 7 8 uniform 8 int 3 uniform 9 int 4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1126, 3344, 5566, 3788) @@ -301,7 +301,7 @@ float4 main() : sv_target [test] uniform 0 uint 1 uniform 1 uint 0x40a00000 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1, 5, 3, 4) @@ -332,7 +332,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(msl) draw quad if(sm<4) probe (0,0) rgba (1.0, 1.0, 1.0, 1.0) if(sm>=4 & sm<6) todo probe (0,0) rgba (4.0, 4.0, 4.0, 4.0) if(sm>=6) probe (0,0) rgba (4.0, 3.0, 2.0, 1.0) diff --git a/tests/hlsl/normalize.shader_test b/tests/hlsl/normalize.shader_test index 18815c93..e26aada6 100644 --- a/tests/hlsl/normalize.shader_test +++ b/tests/hlsl/normalize.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 5.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.272165537, 0.408248305, 0.544331074, 0.680413842) 2 [pixel shader] @@ -21,7 +21,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.371390700, 0.557086051, 0.742781401, 0.0) 1 [pixel shader] @@ -34,7 +34,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.554700196, 0.832050323, 0.0, 0.0) 1 [pixel shader] @@ -47,7 +47,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [pixel shader] @@ -60,7 +60,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [pixel shader fail] diff --git a/tests/hlsl/numeric-constructor-truncation.shader_test b/tests/hlsl/numeric-constructor-truncation.shader_test index 159ca922..348b1fa6 100644 --- a/tests/hlsl/numeric-constructor-truncation.shader_test +++ b/tests/hlsl/numeric-constructor-truncation.shader_test @@ -6,7 +6,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (71.0, 72.0, 73.0, 75.0) @@ -29,5 +29,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) 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 b39fa612..2d093c5b 100644 --- a/tests/hlsl/numeric-types.shader_test +++ b/tests/hlsl/numeric-types.shader_test @@ -6,7 +6,7 @@ vector main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader] @@ -17,7 +17,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader] @@ -28,7 +28,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 0.0) [pixel shader fail] @@ -56,7 +56,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) [pixel shader] @@ -68,7 +68,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 6.0, 7.0, 0.0) [pixel shader fail(sm<6)] diff --git a/tests/hlsl/object-field-offsets.shader_test b/tests/hlsl/object-field-offsets.shader_test index 3909f7ca..f322d7f9 100644 --- a/tests/hlsl/object-field-offsets.shader_test +++ b/tests/hlsl/object-field-offsets.shader_test @@ -19,7 +19,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 5.0 6.0 7.0 8.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 0.0) @@ -45,7 +45,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 5.0 6.0 7.0 8.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 5.0, 0.0) @@ -66,5 +66,5 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 5.0 6.0 7.0 8.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 5.0, 0.0) diff --git a/tests/hlsl/object-references.shader_test b/tests/hlsl/object-references.shader_test index 4409ba77..f33133ed 100644 --- a/tests/hlsl/object-references.shader_test +++ b/tests/hlsl/object-references.shader_test @@ -46,7 +46,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (77.77, 77.77, 77.77, 77.77) @@ -73,7 +73,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) probe (1, 0) rgba (0.5, 0.7, 0.6, 0.8) probe (0, 1) rgba (0.6, 0.5, 0.2, 0.1) @@ -111,7 +111,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (312, 312, 312, 111) @@ -134,7 +134,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2132, 2132, 2132, 1111) @@ -202,7 +202,7 @@ float4 main() : sv_target [test] uniform 0 float 10.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (11.0, 12.0, 13.0, 11.0) diff --git a/tests/hlsl/pow.shader_test b/tests/hlsl/pow.shader_test index 41ae0d4f..1adb99c0 100644 --- a/tests/hlsl/pow.shader_test +++ b/tests/hlsl/pow.shader_test @@ -8,7 +8,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.4 0.8 2.5 2.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.512, 0.101192884, 0.64, 0.25) 4 @@ -23,7 +23,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 32.0, 256.0, 125.0) 2 diff --git a/tests/hlsl/precise-modifier.shader_test b/tests/hlsl/precise-modifier.shader_test index 0758ad0e..ee57ea0e 100644 --- a/tests/hlsl/precise-modifier.shader_test +++ b/tests/hlsl/precise-modifier.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.1 0.2 0.3 0.4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) [pixel shader fail(sm>=6)] @@ -23,7 +23,7 @@ precise main() : sv_target [test] uniform 0 float4 0.1 0.2 0.3 0.4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) [pixel shader] @@ -37,5 +37,5 @@ float4 main() : sv_target [test] uniform 0 float4 0.1 0.2 0.3 0.4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) diff --git a/tests/hlsl/rcp.shader_test b/tests/hlsl/rcp.shader_test index 51753d19..3166de83 100644 --- a/tests/hlsl/rcp.shader_test +++ b/tests/hlsl/rcp.shader_test @@ -8,24 +8,24 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 0.5, 0.3333333, 0.25) 8 uniform 0 float4 -1.0 -2.0 -3.0 -4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-1.0, -0.5, -0.3333333, -0.25) 8 uniform 0 float4 12.34 56.78 -90.12 -34.56 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.081037275, 0.017611835, -0.011096316, -0.028935184) 8 uniform 0 float4 0.25 0.125 0.0625 0.3333333 -draw quad +todo(msl) draw quad probe (0, 0) rgba (4.0, 8.0, 16.0, 3.0) 8 % Degenerate cases uniform 0 float4 0.0 -0.0 1.0e39 -1.0e39 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0e39, -1.0e39, 0.0, -0.0) 8 @@ -40,15 +40,15 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) 8 uniform 0 float4 7.604 3.1415 2.72 9.876 -draw quad +todo(msl) draw quad probe (0, 0) rgba (7.604, 3.1415, 2.72, 9.876) 8 uniform 0 float4 0.0 -0.0 1.0e39 -1.0e39 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, -0.0, 1.0e39, -1.0e39) @@ -68,9 +68,9 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 0.5, 0.3333333, 0.25) 8 uniform 0 float4 -1.0 -2.0 -3.0 -4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-1.0, -0.5, -0.3333333, -0.25) 8 diff --git a/tests/hlsl/reflect.shader_test b/tests/hlsl/reflect.shader_test index c0ac201f..c7ea92f3 100644 --- a/tests/hlsl/reflect.shader_test +++ b/tests/hlsl/reflect.shader_test @@ -10,7 +10,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.5 -0.1 0.2 0.3 uniform 4 float4 0.6 0.4 -0.3 1.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-0.1, -0.5, 0.5, -0.7) 4 [pixel shader] @@ -27,7 +27,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.5 0.0 0.0 0.0 uniform 4 float4 0.6 0.4 -0.3 1.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-0.52, -0.18, 1.01, -1.2) 4 [pixel shader] @@ -44,7 +44,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.5 -0.1 0.2 0.3 uniform 4 float4 0.6 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-0.148, -0.748, -0.448, -0.348) 4 [pixel shader] @@ -62,7 +62,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.5 0.0 0.0 0.0 uniform 4 float4 0.6 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.14, 0.14, 0.14, 0.14) 4 [pixel shader] @@ -79,7 +79,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.5 -0.1 0.0 0.0 uniform 4 float4 0.6 0.4 -0.3 1.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.188, -0.308, 0.0, 0.0) 4 [pixel shader] @@ -97,5 +97,5 @@ float4 main() : sv_target [test] uniform 0 float4 0.5 -0.1 0.2 0.0 uniform 4 float4 0.6 0.4 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.188, -0.308, 0.0, 0.0) 4 diff --git a/tests/hlsl/refract.shader_test b/tests/hlsl/refract.shader_test index 0b6c34cd..7ebc3d77 100644 --- a/tests/hlsl/refract.shader_test +++ b/tests/hlsl/refract.shader_test @@ -12,10 +12,10 @@ float4 main() : sv_target uniform 0 float4 0.5 -0.1 0.2 0.3 uniform 4 float4 0.6 0.4 -0.3 1.0 uniform 8 float 0.2 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-0.550931, -0.453954, 0.3654653, -1.0248856) 32 uniform 8 float 100.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] @@ -34,10 +34,10 @@ float4 main() : sv_target uniform 0 float4 0.5 -0.1 0.2 0.3 uniform 4 float4 0.6 0.4 -0.3 1.0 uniform 8 float 0.2 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32 uniform 8 float 100.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] @@ -55,10 +55,10 @@ float4 main() : sv_target uniform 0 float4 0.5 -0.1 0.2 0.3 uniform 4 float4 0.6 0.4 -0.3 1.0 uniform 8 float 0.2 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32 uniform 8 float 100.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] @@ -76,10 +76,10 @@ float4 main() : sv_target uniform 0 float4 0.5 -0.1 0.2 0.3 uniform 4 float4 0.6 0.4 -0.3 1.0 uniform 8 float 0.2 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32 uniform 8 float 100.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] @@ -98,10 +98,10 @@ float4 main() : sv_target uniform 0 float4 0.5 -0.1 0.2 0.3 uniform 4 float4 0.6 0.4 -0.3 1.0 uniform 8 float 0.2 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-0.524978, 0.0, 0.0, 0.0) 32 uniform 8 float 100.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] @@ -118,10 +118,10 @@ float4 main() : sv_target uniform 0 float4 0.5 -0.1 0.2 0.3 uniform 4 float4 0.6 0.4 -0.3 1.0 uniform 8 float 0.2 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-0.5562381, -0.6762381, -0.6162381, -0.5962381) 32 uniform 8 float 100.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader fail(sm>=6)] @@ -138,10 +138,10 @@ float4 main() : sv_target uniform 0 float4 0.5 -0.1 0.2 0.3 uniform 4 float4 0.6 0.4 -0.3 1.0 uniform 8 float4 0.2 0.3 0.4 0.5 -if(sm<6) draw quad +if(sm<6) todo(msl) draw quad if(sm<6) probe (0,0) rgba (-0.550931, -0.453954, 0.3654653, -1.0248856) 32 uniform 8 float 100.0 -if(sm<6) draw quad +if(sm<6) todo(msl) draw quad if(sm<6) probe (0,0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader fail] diff --git a/tests/hlsl/register-reservations-numeric.shader_test b/tests/hlsl/register-reservations-numeric.shader_test index 4117dac8..19ff5628 100644 --- a/tests/hlsl/register-reservations-numeric.shader_test +++ b/tests/hlsl/register-reservations-numeric.shader_test @@ -56,7 +56,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.1 0.2 0.3 0.4 uniform 4 float4 1.1 1.2 1.3 1.4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.1, 1.4, 0.2, 0.3) @@ -75,7 +75,7 @@ uniform 4 float4 1.1 1.2 1.3 1.4 uniform 8 float4 2.1 2.2 2.3 2.4 uniform 12 float4 3.1 3.2 3.3 3.4 uniform 16 float4 4.1 4.2 4.3 4.4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (4.1, 4.2, 1.3, 1.4) @@ -117,7 +117,7 @@ uniform 0 float4 0.1 0.2 0.3 0.4 uniform 4 float4 1.1 1.2 1.3 1.4 uniform 8 float4 2.1 2.2 2.3 2.4 uniform 12 float4 3.1 3.2 3.3 3.4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.1, 2.2, 0.0, 0.0) @@ -188,7 +188,7 @@ uniform 0 float4 0.1 0.2 0.3 0.4 uniform 4 float4 1.1 1.2 1.3 1.4 uniform 8 float4 2.1 2.2 2.3 2.4 uniform 12 float4 3.1 3.2 3.3 3.4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.1, 2.2, 2.3, 0.0) @@ -207,7 +207,7 @@ float4 main() : sv_target [test] uniform 0 float 100 uniform 4 float 101 -draw quad +todo(msl) draw quad probe (0, 0) rgba (100, 100, 100, 100) @@ -221,7 +221,7 @@ float4 main(uniform float a : register(c1)) : sv_target [test] uniform 0 float 100 uniform 4 float 101 -draw quad +todo(msl) draw quad probe (0, 0) rgba (100, 100, 100, 100) [pixel shader todo] @@ -326,7 +326,7 @@ float4 main() : sv_target [test] uniform 0 float 1.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [pixel shader] @@ -341,7 +341,7 @@ float4 main() : sv_target [test] uniform 0 float 1.0 uniform 4 float 2.0 -draw quad +todo(msl) draw quad if(sm<6) probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) if(sm>=6) probe (0, 0) rgba(1.0, 1.0, 1.0, 1.0) @@ -357,7 +357,7 @@ float4 main() : sv_target [test] uniform 0 float 0.0 uniform 4 float 1.0 -draw quad +todo(msl) draw quad if(sm<6) probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) if(sm>=6) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) @@ -373,7 +373,7 @@ float4 main() : sv_target [test] uniform 0 float 0.0 uniform 4 float 1.0 -draw quad +todo(msl) draw quad if(sm<6) probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) if(sm>=6) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) @@ -389,7 +389,7 @@ float4 main() : sv_target [test] uniform 0 float 0.0 uniform 4 float 1.0 -draw quad +todo(msl) draw quad if(sm<6) probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) if(sm>=6) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) @@ -404,7 +404,7 @@ float4 main() : sv_target [test] uniform 4 float 1.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) % Weird FXC behavior. @@ -420,7 +420,7 @@ float4 main() : sv_target [test] uniform 0 float 1.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba(1.0, 1.0, 1.0, 1.0) % Testing other reservation types. This is a parse failure, i.e "X3530: register sa not valid" @@ -460,7 +460,7 @@ float4 main() : sv_target [test] uniform 0 float 0.0 uniform 4 float 2.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba(2.0, 2.0, 2.0, 2.0) [require] @@ -527,7 +527,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad if(sm<6) probe (0, 0) rgba(2.0, 2.0, 2.0, 2.0) if(sm>=6) probe (0, 0) rgba(0.5, 0.5, 0.5, 0.5) diff --git a/tests/hlsl/register-reservations-resources.shader_test b/tests/hlsl/register-reservations-resources.shader_test index 44693818..a1313499 100644 --- a/tests/hlsl/register-reservations-resources.shader_test +++ b/tests/hlsl/register-reservations-resources.shader_test @@ -34,7 +34,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (41.0, 41.0, 41.0, 1089.0) @@ -50,7 +50,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 99.0) @@ -65,7 +65,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 99.0) @@ -84,7 +84,7 @@ shader model >= 4.0 shader model < 6.0 [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 99.0) [require] @@ -110,7 +110,7 @@ float4 main() : sv_target [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 99.0) [pixel shader] @@ -123,7 +123,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (4.0, 4.0, 4.0, 99.0) @@ -139,7 +139,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 99.0) @@ -154,7 +154,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 2.0, 2.0, 99.0) @@ -168,7 +168,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 2.0, 2.0, 99.0) @@ -241,5 +241,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 99.0) diff --git a/tests/hlsl/return-implicit-conversion.shader_test b/tests/hlsl/return-implicit-conversion.shader_test index 185c84e8..6b699183 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(msl) draw quad probe (0, 0) rgba (0.4, 0.3, 0.2, 0.1) [pixel shader] @@ -15,7 +15,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.4, 0.3, 0.2, 0.1) [pixel shader] @@ -25,7 +25,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.4, 0.3, 0.2, 0.1) [pixel shader] @@ -35,7 +35,7 @@ float4x1 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.4, 0.3, 0.2, 0.1) [pixel shader] @@ -50,7 +50,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.4, 0.3, 0.2, 0.0) [pixel shader] @@ -65,7 +65,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.4, 0.3, 0.2, 0.0) [pixel shader] @@ -80,7 +80,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.4, 0.3, 0.2, 0.0) [pixel shader] @@ -95,7 +95,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.4, 0.3, 0.2, 0.0) [pixel shader fail] @@ -132,7 +132,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.4, 0.3, 0.2, 0.0) [pixel shader] @@ -147,7 +147,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.4, 0.3, 0.2, 0.0) [pixel shader] @@ -162,7 +162,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.4, 0.3, 0.2, 0.0) [pixel shader fail(sm<6) todo] @@ -188,7 +188,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.4, 0.3, 0.2, 0.0) [pixel shader fail] @@ -214,7 +214,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.4, 0.3, 0.2, 0.0) [pixel shader fail] @@ -240,5 +240,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.4, 0.3, 0.2, 0.0) diff --git a/tests/hlsl/return.shader_test b/tests/hlsl/return.shader_test index 6c6ae843..4022de6b 100644 --- a/tests/hlsl/return.shader_test +++ b/tests/hlsl/return.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) [pixel shader] @@ -22,7 +22,7 @@ void main(out float4 ret : sv_target) } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) [pixel shader todo(sm<4)] @@ -37,10 +37,10 @@ float4 main() : sv_target [test] uniform 0 float 0.2 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) uniform 0 float 0.8 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.5, 0.6, 0.7, 0.8) [pixel shader todo(sm<4)] @@ -63,10 +63,10 @@ void main(out float4 ret : sv_target) [test] uniform 0 float 0.2 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.3, 0.4, 0.5, 0.6) uniform 0 float 0.8 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) [pixel shader todo(sm<4)] @@ -89,13 +89,13 @@ void main(out float4 ret : sv_target) [test] uniform 0 float 0.1 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) 1 uniform 0 float 0.5 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.2, 0.3, 0.4, 0.5) 1 uniform 0 float 0.9 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.5, 0.6, 0.7, 0.8) 1 [pixel shader todo(sm<4)] @@ -115,13 +115,13 @@ void main(out float4 ret : sv_target) [test] uniform 0 float 0.1 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) 1 uniform 0 float 0.5 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.5, 0.6, 0.7, 0.8) 1 uniform 0 float 0.9 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.4, 0.5, 0.6, 0.7) 1 [pixel shader] @@ -138,7 +138,7 @@ void main(out float4 ret : sv_target) } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.2, 0.4, 0.6, 0.8) [pixel shader todo(sm<4)] @@ -160,23 +160,23 @@ void main(out float4 ret : sv_target) [test] uniform 0 float 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.1, 0.1, 0.1, 0.1) 1 uniform 0 float 0.1 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.2, 0.2, 0.2, 0.2) 1 uniform 0 float 0.3 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.4, 0.4, 0.4, 0.4) 1 uniform 0 float 0.7 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.8, 0.8, 0.8, 0.8) 1 uniform 0 float 0.9 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.9, 0.9, 0.9, 0.9) 1 [pixel shader todo(sm<4)] @@ -204,10 +204,10 @@ void main(out float4 ret : sv_target) [test] uniform 0 float 0.2 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.2, 0.2, 0.2, 0.2) uniform 0 float 0.8 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.5, 0.5, 0.5, 0.5) [pixel shader todo(sm<4)] @@ -236,21 +236,21 @@ void main(out float4 ret : sv_target) 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(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.1, 0.1, 0.1, 0.1) 1 uniform 4 float4 0.35 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.2, 0.2, 0.2, 0.2) 1 uniform 8 float4 0.5 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.4, 0.4, 0.4, 0.4) 1 uniform 0 float4 1.0 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.4, 0.4, 0.4, 0.4) 1 uniform 4 float4 2.0 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.9, 0.9, 0.9, 0.9) 1 diff --git a/tests/hlsl/round.shader_test b/tests/hlsl/round.shader_test index 201acbdb..d3269856 100644 --- a/tests/hlsl/round.shader_test +++ b/tests/hlsl/round.shader_test @@ -8,7 +8,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.4 -6.6 7.6 3.4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, -7.0, 8.0, 3.0) 4 @@ -26,7 +26,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.4 -6.6 7.6 3.4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-7.0, 8.0, 0.0, 3.0) 4 @@ -42,5 +42,5 @@ float4 main() : sv_target [test] uniform 0 float4 -1 0 2 10 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-1.0, 0.0, 2.0, 10.0) 4 diff --git a/tests/hlsl/rt-format-mismatch.shader_test b/tests/hlsl/rt-format-mismatch.shader_test index 4b0a28ed..b63dea52 100644 --- a/tests/hlsl/rt-format-mismatch.shader_test +++ b/tests/hlsl/rt-format-mismatch.shader_test @@ -19,7 +19,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (22.0, -22.0, 1.0e100, -1.0e100) [pixel shader] @@ -29,7 +29,7 @@ uint4 main() : sv_target } [test] -todo(mvk & vulkan) draw quad +todo(mvk & vulkan | msl) draw quad todo(mvk) probe (0, 0) rgbaui (0, 22, 0xfeedcafe, 0xffffffff) [pixel shader] @@ -39,7 +39,7 @@ int4 main() : sv_target } [test] -todo(mvk & vulkan | glsl) draw quad +todo(mvk & vulkan | glsl | msl) draw quad todo(mvk) probe (0, 0) rgbai (0, 22, -22, -1000) [pixel shader] @@ -49,7 +49,7 @@ float2 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rg (22.0, -22.0) [rtv 0] @@ -63,7 +63,7 @@ float4 main() : sv_target } [test] -todo(mvk & vulkan) draw quad +todo(mvk & vulkan | msl) draw quad todo(mvk) probe (0, 0) rgba (22.0, -22.0, 1.0e100, -1.0e100) [pixel shader] @@ -73,7 +73,7 @@ uint4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgbaui (0, 22, 0xfeedcafe, 0xffffffff) [pixel shader] @@ -83,7 +83,7 @@ int4 main() : sv_target } [test] -todo(mvk & vulkan | glsl) draw quad +todo(mvk & vulkan | glsl | msl) draw quad todo(mvk) probe (0, 0) rgbai (0, 22, -22, -1000) [pixel shader] @@ -93,7 +93,7 @@ float2 main() : sv_target } [test] -todo(mvk & vulkan) draw quad +todo(mvk & vulkan | msl) draw quad todo(mvk) probe (0, 0) rg (22.0, -22.0) [rtv 0] @@ -107,7 +107,7 @@ float4 main() : sv_target } [test] -todo(mvk & vulkan) draw quad +todo(mvk & vulkan | msl) draw quad todo(mvk) probe (0, 0) rgba (22.0, -22.0, 1.0e100, -1.0e100) [pixel shader] @@ -117,7 +117,7 @@ uint4 main() : sv_target } [test] -todo(mvk & vulkan) draw quad +todo(mvk & vulkan | msl) draw quad todo(mvk) probe (0, 0) rgbaui (0, 22, 0xfeedcafe, 0xffffffff) [pixel shader] @@ -127,7 +127,7 @@ int4 main() : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgbai (0, 22, -22, -1000) [pixel shader] @@ -137,7 +137,7 @@ float2 main() : sv_target } [test] -todo(mvk & vulkan) draw quad +todo(mvk & vulkan | msl) draw quad todo(mvk) probe (0, 0) rg (22.0, -22.0) [rtv 0] @@ -151,7 +151,7 @@ float4 main() : sv_target } [test] -todo(mvk & vulkan) draw quad +todo(mvk & vulkan | msl) draw quad todo(mvk) probe (0, 0) r (22.0) [pixel shader] @@ -161,7 +161,7 @@ uint4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rui (22) [pixel shader] @@ -171,7 +171,7 @@ int4 main() : sv_target } [test] -todo(mvk & vulkan | glsl) draw quad +todo(mvk & vulkan | glsl | msl) draw quad todo(mvk) probe (0, 0) ri (-22) [pixel shader] @@ -181,7 +181,7 @@ float2 main() : sv_target } [test] -todo(mvk & vulkan) draw quad +todo(mvk & vulkan | msl) draw quad todo(mvk) probe (0, 0) r (22.0) % For the avoidance of doubt, 64 bit types cannot be used as target outputs. diff --git a/tests/hlsl/rt-get-sample-info.shader_test b/tests/hlsl/rt-get-sample-info.shader_test index 1cf8e2f9..2878f14b 100644 --- a/tests/hlsl/rt-get-sample-info.shader_test +++ b/tests/hlsl/rt-get-sample-info.shader_test @@ -13,7 +13,7 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (4.0, 0.0, 0.0, 0.0) diff --git a/tests/hlsl/sample-bias.shader_test b/tests/hlsl/sample-bias.shader_test index 1a6a6710..b6249284 100644 --- a/tests/hlsl/sample-bias.shader_test +++ b/tests/hlsl/sample-bias.shader_test @@ -32,15 +32,15 @@ float4 main(float2 coord : texcoord) : sv_target [test] uniform 0 float4 6.5 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (10.0, 0.0, 10.0, 0.0) uniform 0 float4 7.5 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (4.0, 0.0, 10.0, 0.0) uniform 0 float4 8.5 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.0, 0.0, 10.0, 0.0) [require] @@ -60,13 +60,13 @@ float4 main(float2 coord : texcoord) : sv_target [test] uniform 0 float4 6.5 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (10.0, 0.0, 10.0, 0.0) uniform 0 float4 7.5 0.0 0.0 0.0 -draw quad +todo(msl) draw quad todo(sm<4) probe (0,0) rgba (4.0, 0.0, 10.0, 0.0) uniform 0 float4 8.5 0.0 0.0 0.0 -draw quad +todo(msl) draw quad todo(sm<4) probe (0,0) rgba (0.0, 0.0, 10.0, 0.0) diff --git a/tests/hlsl/sample-cmp.shader_test b/tests/hlsl/sample-cmp.shader_test index d82490ee..ed3d116e 100644 --- a/tests/hlsl/sample-cmp.shader_test +++ b/tests/hlsl/sample-cmp.shader_test @@ -27,7 +27,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0) [sampler 0] @@ -36,7 +36,7 @@ address clamp clamp clamp comparison less [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 0.0, 0.0, 1.0) [sampler 0] @@ -45,7 +45,7 @@ address clamp clamp clamp comparison equal [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 1.0, 0.0, 1.0) [sampler 0] @@ -54,7 +54,7 @@ address clamp clamp clamp comparison less equal [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 0.0, 1.0) [sampler 0] @@ -63,7 +63,7 @@ address clamp clamp clamp comparison greater [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 1.0, 1.0) [sampler 0] @@ -72,7 +72,7 @@ address clamp clamp clamp comparison not equal [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 0.0, 1.0, 1.0) [sampler 0] @@ -81,7 +81,7 @@ address clamp clamp clamp comparison greater equal [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) [sampler 0] @@ -90,7 +90,7 @@ address clamp clamp clamp comparison always [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) @@ -118,7 +118,7 @@ float4 main() : sv_target [test] uniform 0 float 0.5 uniform 1 float 0.00000007 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 1.0, 1.0) @@ -140,5 +140,5 @@ float4 main() : sv_target [test] uniform 0 float 0.5 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 1.0, 1.0) diff --git a/tests/hlsl/sample-grad.shader_test b/tests/hlsl/sample-grad.shader_test index e0c88b70..a5872fd7 100644 --- a/tests/hlsl/sample-grad.shader_test +++ b/tests/hlsl/sample-grad.shader_test @@ -26,13 +26,13 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0,0) rgba (1.0, 0.0, 1.0, 0.0) uniform 0 float4 1.0 1.0 1.0 1.0 -draw quad +todo(msl) draw quad probe (0,0) rgba (0.0, 0.0, 1.0, 0.0) uniform 0 float4 2.0 2.0 2.0 2.0 -draw quad +todo(msl) draw quad probe (0,0) rgba (0.0, 0.0, 1.0, 0.0) [pixel shader fail(sm>=6)] @@ -46,13 +46,13 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0,0) rgba (1.0, 0.0, 1.0, 0.0) uniform 0 float4 1.0 1.0 1.0 1.0 -draw quad +todo(msl) draw quad probe (0,0) rgba (0.0, 0.0, 1.0, 0.0) uniform 0 float4 2.0 2.0 2.0 2.0 -draw quad +todo(msl) draw quad probe (0,0) rgba (0.0, 0.0, 1.0, 0.0) [require] @@ -70,11 +70,11 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 0.0, 1.0, 0.0) uniform 0 float4 1.0 1.0 1.0 1.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 1.0, 0.0) uniform 0 float4 2.0 2.0 2.0 2.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 1.0, 0.0) diff --git a/tests/hlsl/sample-level.shader_test b/tests/hlsl/sample-level.shader_test index 60730e3a..090dac42 100644 --- a/tests/hlsl/sample-level.shader_test +++ b/tests/hlsl/sample-level.shader_test @@ -26,13 +26,13 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 0.0, 1.0, 0.0) uniform 0 float4 0.5 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.5, 0.0, 1.0, 0.0) uniform 0 float4 1.0 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.0, 0.0, 1.0, 0.0) [require] @@ -50,11 +50,11 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 0.0, 1.0, 0.0) uniform 0 float4 0.5 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.5, 0.0, 1.0, 0.0) uniform 0 float4 1.0 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.0, 0.0, 1.0, 0.0) diff --git a/tests/hlsl/sampler-offset.shader_test b/tests/hlsl/sampler-offset.shader_test index 75016ce4..fc1f25fc 100644 --- a/tests/hlsl/sampler-offset.shader_test +++ b/tests/hlsl/sampler-offset.shader_test @@ -22,7 +22,7 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.5, 0.0) @@ -36,7 +36,7 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0.2, 0.2, 0.0, 0.4) @@ -50,5 +50,5 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0.0, 0.2, 0.0, 0.4) diff --git a/tests/hlsl/sampler.shader_test b/tests/hlsl/sampler.shader_test index 13e47731..2d800dc3 100644 --- a/tests/hlsl/sampler.shader_test +++ b/tests/hlsl/sampler.shader_test @@ -17,7 +17,7 @@ float4 main() : sv_target } [test] -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.25, 0, 0.25, 0) [pixel shader todo(sm<4)] @@ -30,7 +30,7 @@ float4 main() : sv_target } [test] -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.25, 0, 0.25, 0) [pixel shader fail] diff --git a/tests/hlsl/saturate.shader_test b/tests/hlsl/saturate.shader_test index c10a32dd..cc6b3d30 100644 --- a/tests/hlsl/saturate.shader_test +++ b/tests/hlsl/saturate.shader_test @@ -8,7 +8,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.7 -0.1 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.7, 0.0, 1.0, 0.0) [pixel shader] @@ -22,5 +22,5 @@ float4 main() : sv_target [test] uniform 0 float4 -2 0 2 -1 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 1.0, 0.0) diff --git a/tests/hlsl/shader-interstage-interface.shader_test b/tests/hlsl/shader-interstage-interface.shader_test index bb8bd575..ac641c32 100644 --- a/tests/hlsl/shader-interstage-interface.shader_test +++ b/tests/hlsl/shader-interstage-interface.shader_test @@ -52,5 +52,5 @@ void main(float4 position : SV_Position, float2 t0 : TEXCOORD0, } [test] -draw triangle strip 4 +todo(msl) draw triangle strip 4 probe (0, 0) rgba (10.0, 8.0, 7.0, 3.0) diff --git a/tests/hlsl/shape.shader_test b/tests/hlsl/shape.shader_test index cb2cd988..c772cf64 100644 --- a/tests/hlsl/shape.shader_test +++ b/tests/hlsl/shape.shader_test @@ -7,7 +7,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (3.0, 0.0, 0.0, 0.0) [pixel shader] @@ -19,7 +19,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 3.0, 0.0, 0.0) [pixel shader] @@ -31,7 +31,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) [pixel shader] @@ -43,7 +43,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 4.0, 0.0, 0.0) [pixel shader] @@ -55,7 +55,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 2.0, 0.0, 0.0) [pixel shader] @@ -67,7 +67,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) [pixel shader] @@ -79,7 +79,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) [pixel shader] @@ -93,7 +93,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 4.0, 7.0, 9.0) [pixel shader] @@ -107,7 +107,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 4.0, 7.0, 9.0) [pixel shader] @@ -122,7 +122,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -137,7 +137,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -152,7 +152,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 7.0, 12.0, 17.0) [pixel shader] @@ -167,7 +167,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 7.0, 12.0, 17.0) [pixel shader] @@ -183,7 +183,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 4.0, 6.0, 0.0) [pixel shader] @@ -199,7 +199,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (9.0, 11.0, 13.0, 0.0) [pixel shader] @@ -211,7 +211,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -223,7 +223,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -235,7 +235,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -247,7 +247,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -260,7 +260,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -273,7 +273,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] @@ -285,7 +285,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) [pixel shader] @@ -297,7 +297,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) [pixel shader] @@ -309,7 +309,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 4.0, 0.0, 0.0) [pixel shader] @@ -321,7 +321,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 4.0, 0.0, 0.0) [pixel shader] @@ -336,7 +336,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) [pixel shader] @@ -351,5 +351,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (6.0, 7.0, 8.0, 9.0) diff --git a/tests/hlsl/side-effects.shader_test b/tests/hlsl/side-effects.shader_test index 7c41b531..306188f8 100644 --- a/tests/hlsl/side-effects.shader_test +++ b/tests/hlsl/side-effects.shader_test @@ -7,7 +7,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) @@ -23,7 +23,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (11.0, 11.0, 11.0, 11.0) @@ -48,5 +48,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.2, 2.2, 2.2, 2.2) diff --git a/tests/hlsl/sign.shader_test b/tests/hlsl/sign.shader_test index 0841f20c..b31e35c0 100644 --- a/tests/hlsl/sign.shader_test +++ b/tests/hlsl/sign.shader_test @@ -8,13 +8,13 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) uniform 0 float4 -1.0 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (-1.0, -1.0, -1.0, -1.0) uniform 0 float4 0.0 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) @@ -28,7 +28,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) @@ -43,7 +43,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 0.0 0.0 uniform 4 float4 3.0 4.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) @@ -58,15 +58,15 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 1 0 0 0 if(sm>=4) uniform 0 int4 1 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1, 1, 1, 1) if(sm<4) uniform 0 float4 -1 0 0 0 if(sm>=4) uniform 0 int4 -1 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (-1, -1, -1, -1) if(sm<4) uniform 0 float4 0 0 0 0 if(sm>=4) uniform 0 int4 0 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0, 0, 0, 0) @@ -81,7 +81,7 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 1 2 3 4 if(sm>=4) uniform 0 int4 1 2 3 4 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1, 1, 1, 1) @@ -98,5 +98,5 @@ if(sm<4) uniform 0 float4 1 2 0 0 if(sm<4) uniform 4 float4 3 4 0 0 if(sm>=4) uniform 0 int4 1 2 0 0 if(sm>=4) uniform 4 int4 3 4 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1, 1, 1, 1) diff --git a/tests/hlsl/single-numeric-initializer.shader_test b/tests/hlsl/single-numeric-initializer.shader_test index 077d7f44..6971dfe9 100644 --- a/tests/hlsl/single-numeric-initializer.shader_test +++ b/tests/hlsl/single-numeric-initializer.shader_test @@ -6,7 +6,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (7.0, 7.0, 7.0, 7.0) @@ -22,5 +22,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (7.0, 7.0, 7.0, 8.0) diff --git a/tests/hlsl/sm1-const-folding.shader_test b/tests/hlsl/sm1-const-folding.shader_test index 5c57bd37..a5fab02c 100644 --- a/tests/hlsl/sm1-const-folding.shader_test +++ b/tests/hlsl/sm1-const-folding.shader_test @@ -9,7 +9,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (3.0e+009, 0.0, 0.0, 0.0) % The uint value is never casted to int on SM1-3, just casted to float and treated as such @@ -21,7 +21,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad if(sm<4) todo probe (0,0) rgba (3.0e+009, 0.0, 0.0, 0.0) if(sm>=4) probe (0,0) rgba (-1.29496730e+009, 0.0, 0.0, 0.0) @@ -35,7 +35,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad if(sm>=4) probe (0,0) rgba (3.0e+009, 0.0, 0.0, 0.0) [pixel shader] @@ -46,7 +46,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (-1.29496730e+009, 0.0, 0.0, 0.0) [pixel shader] @@ -56,7 +56,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (3.0e+009, 0.0, 0.0, 0.0) % Unsuffixed literals can instead be considered unsigned on SM6 @@ -67,7 +67,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad if(sm<6) probe (0,0) rgba (-1.29496730e+009, 0.0, 0.0, 0.0) if(sm>=6) probe (0,0) rgba (3.0e+009, 0.0, 0.0, 0.0) @@ -81,7 +81,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.70503270e+009, 0.0, 0.0, 0.0) % SM1-3 complains that uint values must be positive, but it's not clear why this is a problem here: @@ -96,7 +96,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad todo probe (0,0) rgba (2.14748365e+009, 0.0, 0.0, 0.0) % Again, no idea of what's happening here @@ -108,7 +108,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad todo probe (0,0) rgba (-2.14748365e+009, 0.0, 0.0, 0.0) % This makes sense @@ -119,7 +119,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.70503270e+009, 0.0, 0.0, 0.0) % This does not again @@ -130,7 +130,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad todo probe (0,0) rgba (-2.14748365e+009, 0.0, 0.0, 0.0) % Explicit float literals use float semantics, at least @@ -142,5 +142,5 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (6.0e+009, 0.0, 0.0, 0.0) diff --git a/tests/hlsl/smoothstep.shader_test b/tests/hlsl/smoothstep.shader_test index bdec1f11..6605caab 100644 --- a/tests/hlsl/smoothstep.shader_test +++ b/tests/hlsl/smoothstep.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0, 0.784, 1.0, 0.559872) 1 @@ -24,7 +24,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0, 0.104, 0.896, 1.000000) 6 @@ -39,7 +39,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 0.352, 0, 0) 1 @@ -55,7 +55,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.352, 0.352, 0, 0) 1 @@ -71,7 +71,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.352, 0.352, 0, 0) 1 @@ -87,7 +87,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 0, 0) 1 @@ -103,7 +103,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.028, 0.104, 0.216, 0.352) 6 @@ -132,7 +132,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.5, 0.5, 0.5, 0.0) @@ -148,7 +148,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.5, 0.5, 0.5, 0.5) diff --git a/tests/hlsl/sqrt.shader_test b/tests/hlsl/sqrt.shader_test index d576bf17..896c493b 100644 --- a/tests/hlsl/sqrt.shader_test +++ b/tests/hlsl/sqrt.shader_test @@ -8,7 +8,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 9.0 32.3 46.5 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 3.0, 5.683309, 6.819091) 1 [pixel shader] @@ -21,5 +21,5 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 9.0 4.0 16.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 0.33333333, 0.5, 0.25) 1 diff --git a/tests/hlsl/srv-buffers.shader_test b/tests/hlsl/srv-buffers.shader_test index db87b49c..83940bae 100644 --- a/tests/hlsl/srv-buffers.shader_test +++ b/tests/hlsl/srv-buffers.shader_test @@ -23,7 +23,7 @@ float4 main() : sv_target [test] uniform 0 float4 100 200 300 400 uniform 4 float4 1000 2000 3000 4000 -draw quad +todo(msl) draw quad probe (0, 0) rgba (200, 3000, 4, 7) @@ -40,7 +40,7 @@ float4 main() : sv_target [test] uniform 0 float4 100 200 300 400 uniform 4 float4 1000 2000 3000 4000 -draw quad +todo(msl) draw quad probe (0, 0) rgba (4000.0, 8.0, 9.0, 10.0) @@ -67,7 +67,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (3.0, 4.0, -1.0, -1.0) @@ -88,7 +88,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (4.0, 5.0, 6.0, 7.0) @@ -101,7 +101,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (8.0, 9.0, 10.0, 11.0) @@ -138,10 +138,10 @@ float4 main() : sv_target [test] uniform 0 int 2 -draw quad +todo(msl) draw quad probe (0, 0) rgba (8.0, 9.0, 10.0, 11.0) uniform 0 int 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 1.0, 2.0, 3.0) diff --git a/tests/hlsl/state-block-syntax.shader_test b/tests/hlsl/state-block-syntax.shader_test index 8d409a8a..16e66377 100644 --- a/tests/hlsl/state-block-syntax.shader_test +++ b/tests/hlsl/state-block-syntax.shader_test @@ -169,7 +169,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0, 1, 0, 1) diff --git a/tests/hlsl/static-initializer.shader_test b/tests/hlsl/static-initializer.shader_test index 8c3b95eb..a559603c 100644 --- a/tests/hlsl/static-initializer.shader_test +++ b/tests/hlsl/static-initializer.shader_test @@ -12,7 +12,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.8, 0.0, 0.0, 0.0) @@ -52,7 +52,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) @@ -147,7 +147,7 @@ float4 main() : sv_target } [test] -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1, 2, 3, 4) @@ -163,7 +163,7 @@ float4 main() : sv_target } [test] -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1, 2, 3, 4) diff --git a/tests/hlsl/step.shader_test b/tests/hlsl/step.shader_test index c1bb14ec..57d1afc3 100644 --- a/tests/hlsl/step.shader_test +++ b/tests/hlsl/step.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [test] uniform 0 float4 5.0 -2.6 3.0 2.0 uniform 4 float4 1.0 -4.3 3.0 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 1.0, 1.0) @@ -23,7 +23,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 0.0) @@ -51,5 +51,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 1.0, 1.0, 0.0) diff --git a/tests/hlsl/storage-qualifiers.shader_test b/tests/hlsl/storage-qualifiers.shader_test index 9defe8e8..bf5f228d 100644 --- a/tests/hlsl/storage-qualifiers.shader_test +++ b/tests/hlsl/storage-qualifiers.shader_test @@ -17,7 +17,7 @@ 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 -todo(sm>=6) draw quad +todo(sm>=6 | msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) [pixel shader] @@ -42,5 +42,5 @@ void main(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(msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) diff --git a/tests/hlsl/struct-array.shader_test b/tests/hlsl/struct-array.shader_test index b37747ac..9ca4ea17 100644 --- a/tests/hlsl/struct-array.shader_test +++ b/tests/hlsl/struct-array.shader_test @@ -18,5 +18,5 @@ 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 uniform 8 float4 0.5 0.6 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.2, 0.3, 0.6, 0.5) diff --git a/tests/hlsl/struct-assignment.shader_test b/tests/hlsl/struct-assignment.shader_test index 69cf7f3b..4aa37192 100644 --- a/tests/hlsl/struct-assignment.shader_test +++ b/tests/hlsl/struct-assignment.shader_test @@ -19,5 +19,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.6, 0.3, 0.7, 0.9) 1 diff --git a/tests/hlsl/struct-inheritance.shader_test b/tests/hlsl/struct-inheritance.shader_test index 581d743d..b4b24243 100644 --- a/tests/hlsl/struct-inheritance.shader_test +++ b/tests/hlsl/struct-inheritance.shader_test @@ -28,7 +28,7 @@ uniform 0 float4 1 0 0 0 uniform 4 float4 0 2 0 0 uniform 8 float4 0 0 3 0 uniform 12 float4 0 0 0 4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1, 0, 3, 4) % Test writing to a field derived from a base class. @@ -66,7 +66,7 @@ uniform 0 float4 1 0 0 0 uniform 4 float4 0 2 0 0 uniform 8 float4 0 0 3 0 uniform 12 float4 0 0 0 4 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-1, 0, 3, -4) diff --git a/tests/hlsl/struct-semantics.shader_test b/tests/hlsl/struct-semantics.shader_test index f51e95e7..6a028d5a 100644 --- a/tests/hlsl/struct-semantics.shader_test +++ b/tests/hlsl/struct-semantics.shader_test @@ -59,5 +59,5 @@ struct output main(struct input i) } [test] -draw triangle strip 4 +todo(msl) draw triangle strip 4 probe (0, 0) rgba (0.0, 1.0, 0.0, 1.0) diff --git a/tests/hlsl/switch.shader_test b/tests/hlsl/switch.shader_test index dfdcdb99..3898c777 100644 --- a/tests/hlsl/switch.shader_test +++ b/tests/hlsl/switch.shader_test @@ -17,15 +17,15 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 3 0 0 0 if(sm>=4) uniform 0 uint4 3 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (5.0, 5.0, 5.0, 5.0) if(sm<4) uniform 0 float4 1 0 0 0 if(sm>=4) uniform 0 uint4 1 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (4.0, 4.0, 4.0, 4.0) if(sm<4) uniform 0 float4 0 0 0 0 if(sm>=4) uniform 0 uint4 0 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (3.0, 3.0, 3.0, 3.0) @@ -45,15 +45,15 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 3 0 0 0 if(sm>=4) uniform 0 uint4 3 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (5.0, 5.0, 5.0, 5.0) if(sm<4) uniform 0 float4 1 0 0 0 if(sm>=4) uniform 0 uint4 1 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (5.0, 5.0, 5.0, 5.0) if(sm<4) uniform 0 float4 0 0 0 0 if(sm>=4) uniform 0 uint4 0 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (5.0, 5.0, 5.0, 5.0) @@ -91,15 +91,15 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 2 0 0 0 if(sm>=4) uniform 0 uint4 2 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) if(sm<4) uniform 0 float4 1 0 0 0 if(sm>=4) uniform 0 uint4 1 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.1, 2.0, 3.0, 4.0) if(sm<4) uniform 0 float4 0 0 0 0 if(sm>=4) uniform 0 uint4 0 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.1, 2.0, 3.0, 4.0) @@ -127,11 +127,11 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 2 0 0 0 if(sm>=4) uniform 0 uint4 2 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.1, 2.1, 3.1, 4.1) if(sm<4) uniform 0 float4 1 0 0 0 if(sm>=4) uniform 0 uint4 1 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) @@ -159,11 +159,11 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 2 0 0 0 if(sm>=4) uniform 0 uint4 2 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.1, 2.1, 3.1, 4.1) if(sm<4) uniform 0 float4 1 0 0 0 if(sm>=4) uniform 0 uint4 1 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader fail(sm<4 | sm>=6) todo(sm<4)] @@ -188,10 +188,10 @@ float4 main() : sv_target [test] uniform 0 float4 2.0 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.1, 2.1, 3.1, 4.1) uniform 0 float4 1.0 0.0 0.0 0.0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader fail] @@ -390,15 +390,15 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 2 0 0 0 if(sm>=4) uniform 0 uint4 2 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.1, 2.1, 3.1, 4.1) if(sm<4) uniform 0 float4 1 0 0 0 if(sm>=4) uniform 0 uint4 1 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.2, 2.2, 3.2, 4.2) if(sm<4) uniform 0 float4 0 0 0 0 if(sm>=4) uniform 0 uint4 0 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) % switch breaks within a loop @@ -431,7 +431,7 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 2 0 0 0 if(sm>=4) uniform 0 uint4 2 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) @@ -464,15 +464,15 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 0 0 0 0 if(sm>=4) uniform 0 uint4 0 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (4.0, 5.0, 6.0, 7.0) if(sm<4) uniform 0 float4 2 0 0 0 if(sm>=4) uniform 0 uint4 2 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) if(sm<4) uniform 0 float4 3 0 0 0 if(sm>=4) uniform 0 uint4 3 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (4.0, 5.0, 6.0, 7.0) @@ -505,15 +505,15 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 3 0 0 0 if(sm>=4) uniform 0 uint4 3 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) if(sm<4) uniform 0 float4 0 0 0 0 if(sm>=4) uniform 0 uint4 0 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (4.0, 5.0, 6.0, 7.0) if(sm<4) uniform 0 float4 5 0 0 0 if(sm>=4) uniform 0 uint4 5 0 0 0 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) % 'continue' is not supported in switches @@ -574,11 +574,11 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 1 0 3 1 if(sm>=4) uniform 0 uint4 1 0 3 1 -draw quad +todo(msl) draw quad probe (0, 0) rgba (10.0, 11.0, 12.0, 13.0) if(sm<4) uniform 0 float4 0 0 3 1 if(sm>=4) uniform 0 uint4 0 0 3 1 -draw quad +todo(msl) draw quad probe (0, 0) rgba (7.0, 8.0, 9.0, 10.0) % return from a switch nested in a loop @@ -610,11 +610,11 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 0 0 3 1 if(sm>=4) uniform 0 uint4 0 0 3 1 -draw quad +todo(msl) draw quad probe (0, 0) rgba (304.0, 305.0, 306.0, 307.0) if(sm<4) uniform 0 float4 1 0 3 1 if(sm>=4) uniform 0 uint4 1 0 3 1 -draw quad +todo(msl) draw quad probe (0, 0) rgba (3.0, 4.0, 5.0, 6.0) [require] diff --git a/tests/hlsl/swizzle-constant-prop.shader_test b/tests/hlsl/swizzle-constant-prop.shader_test index 6dc22988..4019382e 100644 --- a/tests/hlsl/swizzle-constant-prop.shader_test +++ b/tests/hlsl/swizzle-constant-prop.shader_test @@ -25,7 +25,7 @@ float4 main() : sv_target [test] uniform 0 int 4 -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (110, 210, 410, 410) @@ -43,7 +43,7 @@ float4 main() : sv_target [test] uniform 0 int 3 -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (105, 5, 305, 305) @@ -59,5 +59,5 @@ float4 main() : sv_target [test] uniform 0 int 1 -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (14.0, 14.0, 14.0, 14.0) diff --git a/tests/hlsl/swizzle-matrix.shader_test b/tests/hlsl/swizzle-matrix.shader_test index b7d6cf91..43780b69 100644 --- a/tests/hlsl/swizzle-matrix.shader_test +++ b/tests/hlsl/swizzle-matrix.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [test] uniform 0 float4 11 21 31 -1 uniform 4 float4 12 22 32 -1 -draw quad +todo(msl) draw quad probe (0, 0) rgba (21.0, 31.0, 11.0, 12.0) @@ -24,7 +24,7 @@ float4 main() : sv_target [test] uniform 0 float4 11 21 31 -1 uniform 4 float4 12 22 32 -1 -draw quad +todo(msl) draw quad probe (0, 0) rgba (11.0, 31.0, 12.0, 32.0) @@ -40,7 +40,7 @@ float4 main() : sv_target uniform 0 float4 11 12 -1 -1 uniform 4 float4 21 22 -1 -1 uniform 8 float4 31 32 -1 -1 -draw quad +todo(msl) draw quad probe (0, 0) rgba (11.0, 31.0, 12.0, 32.0) @@ -54,7 +54,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 6.0, 1.0, 6.0) @@ -151,7 +151,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (40.0, 40.0, 40.0, 40.0) @@ -169,7 +169,7 @@ float4 main() : sv_target [test] uniform 0 float4 20 30 40 -1 -draw quad +todo(msl) draw quad probe (0,0) rgba (10.0, 20.0, 30.0, 40.0) @@ -187,7 +187,7 @@ float4 main() : sv_target [test] uniform 0 float4 20 30 80 -1 -draw quad +todo(msl) draw quad probe (0,0) rgba (80.0, 30.0, 20.0, 10.0) diff --git a/tests/hlsl/swizzles.shader_test b/tests/hlsl/swizzles.shader_test index af08750c..f602d39d 100644 --- a/tests/hlsl/swizzles.shader_test +++ b/tests/hlsl/swizzles.shader_test @@ -11,7 +11,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.0303 0.08 0.07 0.0202 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0101, 0.0303, 0.0202, 0.0404) @@ -24,7 +24,7 @@ float4 main() : SV_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.6, 0.3, 0.5) @@ -37,7 +37,7 @@ float4 main() : SV_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.4, 0.3, 0.1, 0.2) @@ -53,7 +53,7 @@ float4 main() : SV_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.3, 0.2, 0.4, 0.1) @@ -68,7 +68,7 @@ float4 main() : SV_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.4, 0.3) @@ -80,7 +80,7 @@ float4 main() : SV_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.4, 0.4, 0.1) @@ -94,7 +94,7 @@ float4 main() : SV_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.3, 0.1, 0.4, 0.2) @@ -107,7 +107,7 @@ float4 main() : SV_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) @@ -120,7 +120,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (20.0, 20.0, 20.0, 20.0) @@ -133,7 +133,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 3.0) @@ -149,7 +149,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) @@ -166,5 +166,5 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 4.0, 2.0, 3.0) diff --git a/tests/hlsl/ternary.shader_test b/tests/hlsl/ternary.shader_test index fd1b3efd..583acb62 100644 --- a/tests/hlsl/ternary.shader_test +++ b/tests/hlsl/ternary.shader_test @@ -13,10 +13,10 @@ float4 main() : sv_target [test] uniform 0 float4 2.0 3.0 4.0 5.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) uniform 0 float4 0.0 10.0 11.0 12.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-1.0, 9.0, 10.0, 11.0) @@ -35,7 +35,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.1 3.0 4.0 5.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.1, 2.0, 0.0, 0.0) @@ -51,7 +51,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.5, 0.6, 0.7, 0.0) @@ -67,7 +67,7 @@ float4 main() : sv_target uniform 0 float4 0.0 1.0 0.0 -3.0 uniform 4 float4 1.0 2.0 3.0 4.0 uniform 8 float4 5.0 6.0 7.0 8.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 2.0, 7.0, 4.0) @@ -97,7 +97,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 1.0, 3.0, 4.0) @@ -112,7 +112,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 6.0, 7.0, 1.0) @@ -157,7 +157,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 6.0, 7.0, 4.0) @@ -199,7 +199,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 6.0, 7.0, 4.0) @@ -215,7 +215,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) @@ -242,7 +242,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (3.0, 3.0, 3.0, 3.0) @@ -258,7 +258,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) @@ -288,7 +288,7 @@ float4 main() : sv_target uniform 0 float4 1.0 0.0 0.0 0.0 uniform 4 float4 1.0 2.0 3.0 4.0 uniform 8 float4 5.0 6.0 7.0 8.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) @@ -305,7 +305,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) @@ -323,7 +323,7 @@ float4 main() : sv_target uniform 0 float4 1.0 0.0 1.0 0.0 uniform 4 float4 1.0 2.0 3.0 4.0 uniform 8 float4 5.0 6.0 7.0 8.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 5.0, 1.0, 5.0) @@ -340,7 +340,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 3.0, 3.0, 2.0) diff --git a/tests/hlsl/texture-load-offset.shader_test b/tests/hlsl/texture-load-offset.shader_test index d1542608..ca64421f 100644 --- a/tests/hlsl/texture-load-offset.shader_test +++ b/tests/hlsl/texture-load-offset.shader_test @@ -18,7 +18,7 @@ float4 main(float4 pos : sv_position) : sv_target [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0, 1, 0, 1) probe (1, 0) rgba (1, 1, 0, 1) probe (0, 1) rgba (0, 2, 0, 1) @@ -35,7 +35,7 @@ float4 main(float4 pos : sv_position) : sv_target [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (3, 0) rgba (1, 0, 0, 1) probe (4, 0) rgba (2, 0, 0, 1) probe (3, 1) rgba (1, 1, 0, 1) diff --git a/tests/hlsl/texture-load-typed.shader_test b/tests/hlsl/texture-load-typed.shader_test index 9fc47a4b..ec9a4479 100644 --- a/tests/hlsl/texture-load-typed.shader_test +++ b/tests/hlsl/texture-load-typed.shader_test @@ -48,7 +48,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.8, -3.0, 4294967295.0, 123.0) % lowercase 'texture2D' @@ -65,5 +65,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.8, -3.0, 4294967295.0, 123.0) diff --git a/tests/hlsl/texture-load.shader_test b/tests/hlsl/texture-load.shader_test index 759e9342..9d57a0d0 100644 --- a/tests/hlsl/texture-load.shader_test +++ b/tests/hlsl/texture-load.shader_test @@ -15,7 +15,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) probe (1, 0) rgba (0.5, 0.7, 0.6, 0.8) probe (0, 1) rgba (0.6, 0.5, 0.2, 0.1) @@ -30,7 +30,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) probe (1, 0) rgba (0.6, 0.5, 0.2, 0.1) probe (0, 1) rgba (0.5, 0.7, 0.6, 0.8) @@ -47,7 +47,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) probe (1, 0) rgba (0.6, 0.5, 0.2, 0.1) probe (0, 1) rgba (0.5, 0.7, 0.6, 0.8) @@ -71,7 +71,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) probe (1, 0) rgba (0.6, 0.5, 0.2, 0.1) probe (0, 1) rgba (0.5, 0.7, 0.6, 0.8) @@ -88,7 +88,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) probe (1, 0) rgba (0.6, 0.5, 0.2, 0.1) probe (0, 1) rgba (0.5, 0.7, 0.6, 0.8) @@ -140,7 +140,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) probe (1, 0) rgba (0.5, 0.7, 0.6, 0.8) probe (0, 1) rgba (0.6, 0.5, 0.2, 0.1) @@ -167,9 +167,9 @@ float4 main(uint id : sv_sampleindex) : sv_target [test] clear rtv 0 0.0 0.0 0.0 0.0 -todo(glsl | sm>=6) draw quad +todo(glsl | sm>=6 | msl) draw quad probe (32, 32) rgba(3.75, 0.25, 0.5, 1.0) -copy rtv 0 srv 0 +todo(msl) copy rtv 0 srv 0 [rtv 0] format r32g32b32a32-float @@ -187,14 +187,14 @@ float4 main(float4 position : sv_position) : sv_target [test] uniform 0 uint 0 -todo(glsl) draw quad +todo(glsl | msl) draw quad todo(sm>=6) probe (32, 32) rgba(1.0, 0.25, 0.5, 1.0) uniform 0 uint 1 -todo(glsl) draw quad +todo(glsl | msl) draw quad todo(sm>=6) probe (32, 32) rgba(2.0, 0.25, 0.5, 1.0) uniform 0 uint 2 -todo(glsl) draw quad +todo(glsl | msl) draw quad todo(sm>=6) probe (32, 32) rgba(4.0, 0.25, 0.5, 1.0) uniform 0 uint 3 -todo(glsl) draw quad +todo(glsl | msl) draw quad todo(sm>=6) probe (32, 32) rgba(8.0, 0.25, 0.5, 1.0) diff --git a/tests/hlsl/texture-ordering.shader_test b/tests/hlsl/texture-ordering.shader_test index 6486bdb1..ae8dbbcd 100644 --- a/tests/hlsl/texture-ordering.shader_test +++ b/tests/hlsl/texture-ordering.shader_test @@ -136,7 +136,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (450, 139, 876, 333) @@ -189,7 +189,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (450, 138, 796, 333) @@ -242,7 +242,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (478, 913, 256, 333) @@ -275,7 +275,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (215, 215, 215, 111) @@ -305,5 +305,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5, 4, 2, 0) diff --git a/tests/hlsl/transpose.shader_test b/tests/hlsl/transpose.shader_test index aedbef6c..3450d834 100644 --- a/tests/hlsl/transpose.shader_test +++ b/tests/hlsl/transpose.shader_test @@ -5,7 +5,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 5.0, 5.0, 5.0) @@ -18,7 +18,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (5.0, 5.0, 5.0, 5.0) @@ -39,7 +39,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) @@ -55,7 +55,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 5.0, 8.0, 11.0) @@ -71,5 +71,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 5.0, 8.0, 11.0) diff --git a/tests/hlsl/trigonometry.shader_test b/tests/hlsl/trigonometry.shader_test index 1b44c168..7b17c9e6 100644 --- a/tests/hlsl/trigonometry.shader_test +++ b/tests/hlsl/trigonometry.shader_test @@ -13,7 +13,7 @@ float4 main(float tex : texcoord) : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe ( 0, 0) rgba ( 0.00000000, 1.00000000, 0.00000000, 0.0) probe ( 1, 0) rgba ( 0.84147098, 0.54030231, 1.55740772, 0.0) 1024 probe ( 2, 0) rgba ( 0.90929743, -0.41614684, -2.18503986, 0.0) 1024 @@ -42,7 +42,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.52359877 2.61799387 3.14159265 -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0.0, 500.0, 500.0, 0.0) @@ -56,7 +56,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.78539816 1.57079632 2.35619449 -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (1000.0, 707.0, -0.0, -707.0) @@ -72,7 +72,7 @@ float4 main() : sv_target % tan(pi/2) is an asymtote and therefore undefined % so check 0, pi/4, 3pi/4, pi uniform 0 float4 0.0 0.78539816 2.35619449 3.14159265 -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0, 1000, -1000.0, 0) @@ -86,10 +86,10 @@ float4 main() : sv_target [test] uniform 0 float4 -6.28318531 -0.88137359 0.88137359 6.28318531 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-267.744894, -1.0, 1.0, 267.744894) 2 uniform 0 float4 -0.0 0.0 -90.0 90.0 -draw quad +todo(msl) draw quad % mingw does not support "inf" for scanf(), but numbers beyond FLOAT_MAX consistently result in inf. probe (0, 0) rgba (0.0, 0.0, -1.0e39, 1.0e39) 1 @@ -104,10 +104,10 @@ float4 main() : sv_target [test] uniform 0 float4 -1.76274717 -1.3169579 1.3169579 1.76274717 -draw quad +todo(msl) draw quad probe (0, 0) rgba (3.0, 2.0, 2.0, 3.0) 2 uniform 0 float4 -0.0 0.0 -90.0 90.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0e39, 1.0e39) 1 @@ -121,10 +121,10 @@ float4 main() : sv_target [test] uniform 0 float4 -1.57079633 -0.54930614 0.54930614 1.57079633 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-0.91715234, -0.5, 0.5, 0.91715234) 2 uniform 0 float4 -10.0 -0.0 0.0 10.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-1.0, 0.0, 0.0, 1.0) 1 @@ -140,10 +140,10 @@ float4 main() : sv_target [test] uniform 0 float4 7.604 0 0 0 -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0.968916833, 0.2473865, 0, 0) 1024 uniform 0 float4 -10.0 0 0 0 -todo(glsl) draw quad +todo(glsl | msl) draw quad probe (0, 0) rgba (0.544020891, -0.839071631, 0.0, 0.0) 1024 [pixel shader fail] diff --git a/tests/hlsl/trunc.shader_test b/tests/hlsl/trunc.shader_test index 9568023f..2ce9ac54 100644 --- a/tests/hlsl/trunc.shader_test +++ b/tests/hlsl/trunc.shader_test @@ -8,10 +8,10 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (0.0, 6.0, 7.0, 3.0) uniform 0 float4 -1.5 6.5 7.5 3.4 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (-1.0, 6.0, 7.0, 3.0) [pixel shader todo(sm<4)] @@ -27,7 +27,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (6.0, 7.0, 0.0, 3.0) @@ -45,5 +45,5 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 -1 6 7 3 if(sm>=4) uniform 0 int4 -1 6 7 3 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0, 0) rgba (6.0, 7.0, -1.0, 3.0) diff --git a/tests/hlsl/type-names.shader_test b/tests/hlsl/type-names.shader_test index 97159774..c5750ebe 100644 --- a/tests/hlsl/type-names.shader_test +++ b/tests/hlsl/type-names.shader_test @@ -37,7 +37,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) % The "dword" alias is pre-defined as lowercase diff --git a/tests/hlsl/uav-out-param.shader_test b/tests/hlsl/uav-out-param.shader_test index 68a11612..4bfe8b37 100644 --- a/tests/hlsl/uav-out-param.shader_test +++ b/tests/hlsl/uav-out-param.shader_test @@ -26,7 +26,7 @@ void main() } [test] -dispatch 1 1 1 +todo(msl) dispatch 1 1 1 probe uav 0 (0, 0) rgba (0.4, 0.1, 0.2, 0.3) [uav 0] @@ -51,5 +51,5 @@ void main() } [test] -dispatch 1 1 1 +todo(msl) dispatch 1 1 1 probe uav 0 (0, 0) r (0.2) diff --git a/tests/hlsl/uav-rwbuffer.shader_test b/tests/hlsl/uav-rwbuffer.shader_test index 455ead2e..7e7b918a 100644 --- a/tests/hlsl/uav-rwbuffer.shader_test +++ b/tests/hlsl/uav-rwbuffer.shader_test @@ -184,7 +184,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe uav 1 (0) rgbai (11, -12, 13, -14) probe uav 1 (1) rgbai (-15, 16, -17, 18) @@ -203,5 +203,5 @@ float4 main() : sv_target1 } [test] -draw quad +todo(msl) draw quad probe uav 2 (0) rgba (11.1, 12.2, 13.3, 14.4) diff --git a/tests/hlsl/uav-rwbyteaddressbuffer.shader_test b/tests/hlsl/uav-rwbyteaddressbuffer.shader_test index 6b0ca6ff..956e0cb9 100644 --- a/tests/hlsl/uav-rwbyteaddressbuffer.shader_test +++ b/tests/hlsl/uav-rwbyteaddressbuffer.shader_test @@ -18,7 +18,7 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe uav 1 (0) ri (10) if(sm<6) probe uav 1 (1) ri (11) if(sm>=6) probe uav 1 (1) r (11.1) @@ -34,7 +34,7 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe uav 1 (0) rgbaui(10, 11, 12, 13) [pixel shader] @@ -48,7 +48,7 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe uav 1 (0) rgbaui(20, 21, 22, 23) [pixel shader] @@ -62,7 +62,7 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +todo(glsl | msl) draw quad probe uav 1 (0) rgbaui(20, 21, 22, 23) [require] diff --git a/tests/hlsl/uniform-parameters.shader_test b/tests/hlsl/uniform-parameters.shader_test index 1951987f..465e3c90 100644 --- a/tests/hlsl/uniform-parameters.shader_test +++ b/tests/hlsl/uniform-parameters.shader_test @@ -18,7 +18,7 @@ float4 main(uniform float f, uniform int i, uniform uint u, uniform half h) : sv [test] uniform 0 float4 123.0 -2.0 456 0.01 -draw quad +todo(msl) draw quad probe (320,240) rgba (123.0, -2.0, 456.0, 0.01) [pixel shader] @@ -31,5 +31,5 @@ float4 main(uniform float2x2 m, uniform float4 v) : sv_target uniform 0 float4 11 12 0 0 uniform 4 float4 13 14 0 0 uniform 8 float4 20 21 22 23 -draw quad +todo(msl) draw quad probe (320,240) rgba (13.0, 21.0, 0.0, 0.0) diff --git a/tests/hlsl/uniform-semantics.shader_test b/tests/hlsl/uniform-semantics.shader_test index 31e42641..3e625b26 100644 --- a/tests/hlsl/uniform-semantics.shader_test +++ b/tests/hlsl/uniform-semantics.shader_test @@ -10,7 +10,7 @@ float4 main() : sv_target [test] uniform 0 float 3.5 -draw quad +todo(msl) draw quad probe (0, 0) rgba (3.5, 3.5, 3.5, 3.5) @@ -24,5 +24,5 @@ float4 main() : sv_target [test] uniform 0 float4 4.0 5.0 6.0 7.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (4.0, 5.0, 4.0, 5.0) diff --git a/tests/hlsl/unroll.shader_test b/tests/hlsl/unroll.shader_test index d7f71f6c..c9d7949c 100644 --- a/tests/hlsl/unroll.shader_test +++ b/tests/hlsl/unroll.shader_test @@ -19,7 +19,7 @@ float4 main() : sv_target [test] uniform 0 float 1 -todo(sm<4) draw quad +todo(sm<4 | msl) draw quad probe (0,0) rgba(10.0, 1.0, 2.0, 3.0) [pixel shader] @@ -33,7 +33,7 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0,0) rgba(4.0, 0.0, 0.0, 0.0) [pixel shader fail(sm<6)] @@ -61,5 +61,5 @@ float4 main() : sv_target } [test] -draw quad +todo(msl) draw quad probe (0,0) rgba(1337.0, 0, 0, 0) diff --git a/tests/hlsl/vector-indexing-uniform.shader_test b/tests/hlsl/vector-indexing-uniform.shader_test index b57165fd..e0b20f22 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(msl) draw quad probe (0, 0) 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 988c6608..7ba36c77 100644 --- a/tests/hlsl/vector-indexing.shader_test +++ b/tests/hlsl/vector-indexing.shader_test @@ -10,7 +10,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.02, 0.245, 0.351, 1.0) [pixel shader] @@ -23,7 +23,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 1.0 2.0 3.0 4.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 2.0, 2.0, 3.0) @@ -47,7 +47,7 @@ float4 main() : SV_TARGET } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) diff --git a/tests/hlsl/vertex-shader-ops.shader_test b/tests/hlsl/vertex-shader-ops.shader_test index 0bbbf706..8d2c0821 100644 --- a/tests/hlsl/vertex-shader-ops.shader_test +++ b/tests/hlsl/vertex-shader-ops.shader_test @@ -28,7 +28,7 @@ void main(out float4 res : COLOR1, in float4 pos : position, out float4 out_pos [test] if(sm<4) uniform 0 float 0.0 if(sm>=4) uniform 0 float4 0.0 0.0 0.0 0.0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) @@ -49,12 +49,12 @@ void main(out float4 res : COLOR1, in float4 pos : position, out float4 out_pos if(sm<4) uniform 0 float 3 if(sm<4) uniform 4 float 4 if(sm>=4) uniform 0 int4 3 4 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 1.0, 0.0, 1.0) if(sm<4) uniform 0 float -2 if(sm<4) uniform 4 float -2 if(sm>=4) uniform 0 int4 -2 -2 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 0.0, 0.0, 1.0) @@ -75,12 +75,12 @@ void main(out float4 res : COLOR1, in float4 pos : position, out float4 out_pos if(sm<4) uniform 0 float 0 if(sm<4) uniform 4 float 2 if(sm>=4) uniform 0 int4 0 2 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.0, 1.0, 0.0, 1.0) if(sm<4) uniform 0 float -2 if(sm<4) uniform 4 float 8 if(sm>=4) uniform 0 int4 -2 8 0 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) @@ -103,11 +103,11 @@ if(sm<4) uniform 0 float 0 if(sm<4) uniform 4 float 100 if(sm<4) uniform 8 float 200 if(sm>=4) uniform 0 int4 0 100 200 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.2, 0.2, 0.2, 0.2) if(sm<4) uniform 0 float -4 if(sm<4) uniform 4 float 100 if(sm<4) uniform 8 float 200 if(sm>=4) uniform 0 int4 -4 100 200 0 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.1, 0.1, 0.1, 0.1) diff --git a/tests/hlsl/writemask-assignop-0.shader_test b/tests/hlsl/writemask-assignop-0.shader_test index 58771e80..a387f36b 100644 --- a/tests/hlsl/writemask-assignop-0.shader_test +++ b/tests/hlsl/writemask-assignop-0.shader_test @@ -11,5 +11,5 @@ float4 main() : SV_target [test] uniform 0 float4 0.0303 0.08 0.07 0.0202 -draw quad +todo(msl) draw quad probe (0, 0) rgba (-0.4697, -0.02, 0.57, 0.3202) 2 diff --git a/tests/hlsl/writemask-assignop-1.shader_test b/tests/hlsl/writemask-assignop-1.shader_test index d43c9e21..e9eef452 100644 --- a/tests/hlsl/writemask-assignop-1.shader_test +++ b/tests/hlsl/writemask-assignop-1.shader_test @@ -12,5 +12,5 @@ float4 main() : SV_target [test] uniform 0 float4 0.0303 0.08 0.07 0.0202 -draw quad +todo(msl) draw quad probe (0, 0) rgba (0.5697, -0.08, -0.27, -0.4202) diff --git a/tests/hlsl/writemask-assignop-2.shader_test b/tests/hlsl/writemask-assignop-2.shader_test index 4524f3b3..c2bfef70 100644 --- a/tests/hlsl/writemask-assignop-2.shader_test +++ b/tests/hlsl/writemask-assignop-2.shader_test @@ -9,5 +9,5 @@ float4 main() : SV_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (2.1, 2.2, 0.8, 1.7) diff --git a/tests/hlsl/writemask-assignop-3.shader_test b/tests/hlsl/writemask-assignop-3.shader_test index ca8aa01d..801010e0 100644 --- a/tests/hlsl/writemask-assignop-3.shader_test +++ b/tests/hlsl/writemask-assignop-3.shader_test @@ -7,5 +7,5 @@ float4 main() : SV_target } [test] -draw quad +todo(msl) draw quad probe (0, 0) rgba (1.9, 1.8, 1.7, 1.6) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 54e38f92..c754410b 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -149,8 +149,9 @@ static bool check_qualifier_args_conjunction(struct shader_runner *runner, const {"sm>=6", SHADER_MODEL_6_0, SHADER_MODEL_6_0}, {"sm<4", SHADER_MODEL_2_0, SHADER_MODEL_4_0 - 1}, {"sm<6", SHADER_MODEL_2_0, SHADER_MODEL_6_0 - 1}, - {"glsl", 0, 0, true}, {"d3d12", 0, 0, true}, + {"glsl", 0, 0, true}, + {"msl", 0, 0, true}, {"mvk", 0, 0, true}, {"vulkan", 0, 0, true}, }; @@ -2423,7 +2424,9 @@ START_TEST(shader_runner) # ifdef HAVE_OPENGL run_shader_tests_gl(); # endif - +# ifdef HAVE_METAL + run_shader_tests_metal(); +# endif run_shader_tests_vulkan(); dxc_compiler = dxcompiler_create(); diff --git a/tests/shader_runner.h b/tests/shader_runner.h index d79bc95f..7cf69a33 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -257,6 +257,7 @@ void run_shader_tests_d3d9(void); void run_shader_tests_d3d11(void); #else void run_shader_tests_gl(void); +void run_shader_tests_metal(void); void run_shader_tests_vulkan(void); #endif void run_shader_tests_d3d12(void *dxc_compiler); diff --git a/tests/shader_runner_metal.m b/tests/shader_runner_metal.m new file mode 100644 index 00000000..2475649c --- /dev/null +++ b/tests/shader_runner_metal.m @@ -0,0 +1,138 @@ +/* + * Copyright 2024 Feifan He for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#import +#define VKD3D_TEST_NO_DEFS +/* Avoid conflicts with the Objective C BOOL definition. */ +#define BOOL VKD3D_BOOLEAN +#include "shader_runner.h" +#undef BOOL + +struct metal_runner +{ + struct shader_runner r; + struct shader_runner_caps caps; +}; + +static struct resource *metal_runner_create_resource(struct shader_runner *r, const struct resource_params *params) +{ + struct resource *resource; + + resource = calloc(1, sizeof(*resource)); + init_resource(resource, params); + + return resource; +}; + +static void metal_runner_destroy_resource(struct shader_runner *r, struct resource *res) +{ + free(res); +}; + +static bool metal_runner_dispatch(struct shader_runner *r, unsigned int x, unsigned int y, unsigned int z) +{ + return false; +}; + +static void metal_runner_clear(struct shader_runner *r, struct resource *res, const struct vec4 *clear_value) +{ + return; +}; + +static bool metal_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY primitive_topology, + unsigned int vertex_count, unsigned int instance_count) +{ + return false; +}; + +static bool metal_runner_copy(struct shader_runner *r, struct resource *src, struct resource *dst) +{ + return false; +}; + +static struct resource_readback *metal_runner_get_resource_readback(struct shader_runner *r, struct resource *res) +{ + return NULL; +} + +static void metal_runner_release_readback(struct shader_runner *r, struct resource_readback *rb) +{ + free(rb->data); + free(rb); +} + +static const struct shader_runner_ops metal_runner_ops = +{ + .create_resource = metal_runner_create_resource, + .destroy_resource = metal_runner_destroy_resource, + .dispatch = metal_runner_dispatch, + .clear = metal_runner_clear, + .draw = metal_runner_draw, + .copy = metal_runner_copy, + .get_resource_readback = metal_runner_get_resource_readback, + .release_readback = metal_runner_release_readback, +}; + +static bool metal_runner_init(struct metal_runner *runner) +{ + NSArray> *devices; + id device; + + static const char *const tags[] = + { + "msl", + }; + + memset(runner, 0, sizeof(*runner)); + + devices = MTLCopyAllDevices(); + if (![devices count]) + { + skip("Failed to find a usable Metal device.\n"); + [devices release]; + return false; + } + device = [devices objectAtIndex:0]; + [devices release]; + + trace("GPU: %s\n", [[device name] UTF8String]); + + runner->caps.runner = "Metal"; + runner->caps.tags = tags; + runner->caps.tag_count = ARRAY_SIZE(tags); + runner->caps.minimum_shader_model = SHADER_MODEL_4_0; + runner->caps.maximum_shader_model = SHADER_MODEL_5_0; + + return true; +} + +static void metal_runner_cleanup(struct metal_runner *runner) +{ + /* Nothing to do. */ +} + +void run_shader_tests_metal(void) +{ + struct metal_runner runner; + + if (!metal_runner_init(&runner)) + return; + run_shader_tests(&runner.r, &runner.caps, &metal_runner_ops, NULL); + metal_runner_cleanup(&runner); +}