From fd1beedc07becc7e5e49b64273f7bde7f9a8b2a0 Mon Sep 17 00:00:00 2001 From: Feifan He Date: Fri, 22 Nov 2024 15:45:54 +0800 Subject: [PATCH] vkd3d-shader/msl: Implement support for VSIR_DIMENSION_VEC4 immediate constants. --- libs/vkd3d-shader/msl.c | 27 ++++++++++ tests/hlsl/all.shader_test | 6 +-- tests/hlsl/arithmetic-float.shader_test | 12 ++--- tests/hlsl/arithmetic-int.shader_test | 16 +++--- tests/hlsl/arithmetic-uint.shader_test | 4 +- tests/hlsl/array-parameters.shader_test | 8 +-- tests/hlsl/array-size-expr.shader_test | 8 +-- tests/hlsl/bitwise-assignment.shader_test | 2 +- tests/hlsl/bitwise.shader_test | 26 ++++----- tests/hlsl/bool-cast.shader_test | 2 +- tests/hlsl/cast-broadcast.shader_test | 4 +- .../cast-componentwise-compatible.shader_test | 46 ++++++++-------- .../hlsl/cast-componentwise-equal.shader_test | 10 ++-- tests/hlsl/cast-to-float.shader_test | 2 +- tests/hlsl/cast-to-half.shader_test | 2 +- tests/hlsl/cast-to-int.shader_test | 2 +- tests/hlsl/cast-to-uint.shader_test | 2 +- tests/hlsl/ceil.shader_test | 2 +- tests/hlsl/clamp.shader_test | 2 +- tests/hlsl/comma.shader_test | 2 +- tests/hlsl/conditional.shader_test | 2 +- tests/hlsl/distance.shader_test | 4 +- tests/hlsl/dot.shader_test | 2 +- tests/hlsl/duplicate-modifiers.shader_test | 2 +- tests/hlsl/effect-compile.shader_test | 2 +- tests/hlsl/floor.shader_test | 2 +- tests/hlsl/for.shader_test | 2 +- tests/hlsl/function-return.shader_test | 4 +- tests/hlsl/function.shader_test | 24 ++++----- tests/hlsl/initializer-flatten.shader_test | 10 ++-- .../initializer-implicit-array.shader_test | 8 +-- .../initializer-invalid-arg-count.shader_test | 4 +- .../hlsl/initializer-local-array.shader_test | 4 +- tests/hlsl/initializer-matrix.shader_test | 12 ++--- tests/hlsl/initializer-multi.shader_test | 6 +-- tests/hlsl/initializer-nested.shader_test | 6 +-- tests/hlsl/initializer-numeric.shader_test | 12 ++--- .../hlsl/initializer-static-array.shader_test | 4 +- tests/hlsl/initializer-struct.shader_test | 6 +-- tests/hlsl/intrinsic-override.shader_test | 4 +- tests/hlsl/ldexp.shader_test | 2 +- tests/hlsl/lerp.shader_test | 2 +- tests/hlsl/logic-operations.shader_test | 24 ++++----- tests/hlsl/matrix-indexing.shader_test | 6 +-- tests/hlsl/matrix-semantics.shader_test | 6 +-- tests/hlsl/max-min.shader_test | 2 +- tests/hlsl/minimum-precision.shader_test | 2 +- tests/hlsl/mul.shader_test | 40 +++++++------- tests/hlsl/multiple-rt.shader_test | 2 +- ...numeric-constructor-truncation.shader_test | 4 +- tests/hlsl/numeric-types.shader_test | 10 ++-- tests/hlsl/object-references.shader_test | 2 +- tests/hlsl/pow.shader_test | 2 +- .../return-implicit-conversion.shader_test | 28 +++++----- tests/hlsl/return.shader_test | 6 +-- tests/hlsl/rt-format-mismatch.shader_test | 10 ++-- tests/hlsl/shape.shader_test | 54 +++++++++---------- tests/hlsl/side-effects.shader_test | 6 +-- .../single-numeric-initializer.shader_test | 4 +- tests/hlsl/sm1-const-folding.shader_test | 24 ++++----- tests/hlsl/smoothstep.shader_test | 18 +++---- tests/hlsl/state-block-syntax.shader_test | 2 +- tests/hlsl/static-initializer.shader_test | 4 +- tests/hlsl/step.shader_test | 4 +- tests/hlsl/struct-assignment.shader_test | 2 +- tests/hlsl/struct-inheritance.shader_test | 2 +- tests/hlsl/swizzle-matrix.shader_test | 4 +- tests/hlsl/swizzles.shader_test | 20 +++---- tests/hlsl/ternary.shader_test | 18 +++---- tests/hlsl/transpose.shader_test | 10 ++-- tests/hlsl/type-names.shader_test | 2 +- tests/hlsl/unroll.shader_test | 4 +- tests/hlsl/vector-indexing.shader_test | 4 +- tests/hlsl/writemask-assignop-0.shader_test | 2 +- tests/hlsl/writemask-assignop-2.shader_test | 2 +- tests/hlsl/writemask-assignop-3.shader_test | 2 +- 76 files changed, 334 insertions(+), 307 deletions(-) diff --git a/libs/vkd3d-shader/msl.c b/libs/vkd3d-shader/msl.c index 8ff5bfba..73c27bc8 100644 --- a/libs/vkd3d-shader/msl.c +++ b/libs/vkd3d-shader/msl.c @@ -176,6 +176,33 @@ static void msl_print_register_name(struct vkd3d_string_buffer *buffer, } break; + case VSIR_DIMENSION_VEC4: + switch (reg->data_type) + { + case VKD3D_DATA_INT: + vkd3d_string_buffer_printf(buffer, "as_type(uint4(%#xu, %#xu, %#xu, %#xu))", + reg->u.immconst_u32[0], reg->u.immconst_u32[1], + reg->u.immconst_u32[2], reg->u.immconst_u32[3]); + break; + case VKD3D_DATA_UINT: + vkd3d_string_buffer_printf(buffer, "uint4(%#xu, %#xu, %#xu, %#xu)", + reg->u.immconst_u32[0], reg->u.immconst_u32[1], + reg->u.immconst_u32[2], reg->u.immconst_u32[3]); + vkd3d_string_buffer_printf(buffer, "%#xu", reg->u.immconst_u32[0]); + break; + case VKD3D_DATA_FLOAT: + vkd3d_string_buffer_printf(buffer, "as_type(uint4(%#xu, %#xu, %#xu, %#xu))", + reg->u.immconst_u32[0], reg->u.immconst_u32[1], + reg->u.immconst_u32[2], reg->u.immconst_u32[3]); + break; + default: + msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL, + "Internal compiler error: Unhandled immconst datatype %#x.", reg->data_type); + vkd3d_string_buffer_printf(buffer, "", reg->data_type); + break; + } + break; + default: vkd3d_string_buffer_printf(buffer, "", reg->dimension); msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL, diff --git a/tests/hlsl/all.shader_test b/tests/hlsl/all.shader_test index 6e8e6171..51b41a3d 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 -todo(msl) draw quad +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 -todo(msl) draw quad +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 -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] diff --git a/tests/hlsl/arithmetic-float.shader_test b/tests/hlsl/arithmetic-float.shader_test index 024e455f..866eb607 100644 --- a/tests/hlsl/arithmetic-float.shader_test +++ b/tests/hlsl/arithmetic-float.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1e99, 1e99, 1e99, 1e99) diff --git a/tests/hlsl/arithmetic-int.shader_test b/tests/hlsl/arithmetic-int.shader_test index ef19939a..3d1b7420 100644 --- a/tests/hlsl/arithmetic-int.shader_test +++ b/tests/hlsl/arithmetic-int.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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 54ffbf5e..9c3ad646 100644 --- a/tests/hlsl/arithmetic-uint.shader_test +++ b/tests/hlsl/arithmetic-uint.shader_test @@ -11,7 +11,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +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] -todo(msl) draw quad +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 384639ca..e1f347fa 100644 --- a/tests/hlsl/array-parameters.shader_test +++ b/tests/hlsl/array-parameters.shader_test @@ -12,7 +12,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (25.0, 25.0, 25.0, 25.0) @@ -78,7 +78,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (15.0, 26.0, 37.0, 48.0) @@ -153,7 +153,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (136.0, 136.0, 136.0, 136.0) @@ -171,5 +171,5 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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 e3ce257d..34e639ba 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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (21, 22, 23, 24) @@ -36,7 +36,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (61, 62, 63, 64) [pixel shader] @@ -49,7 +49,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (2, 3, 6, 1) % Additional level of indirection @@ -64,7 +64,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (2, 3, 6, 1) diff --git a/tests/hlsl/bitwise-assignment.shader_test b/tests/hlsl/bitwise-assignment.shader_test index b87e1c16..a83b92ff 100644 --- a/tests/hlsl/bitwise-assignment.shader_test +++ b/tests/hlsl/bitwise-assignment.shader_test @@ -100,5 +100,5 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +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 00d168e5..6c0a6fc3 100644 --- a/tests/hlsl/bitwise.shader_test +++ b/tests/hlsl/bitwise.shader_test @@ -11,7 +11,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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 a1731a9b..e56722d1 100644 --- a/tests/hlsl/bool-cast.shader_test +++ b/tests/hlsl/bool-cast.shader_test @@ -10,7 +10,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.0, 0.0, 1.0, 1.0) diff --git a/tests/hlsl/cast-broadcast.shader_test b/tests/hlsl/cast-broadcast.shader_test index 188aa9b5..14f504e4 100644 --- a/tests/hlsl/cast-broadcast.shader_test +++ b/tests/hlsl/cast-broadcast.shader_test @@ -19,7 +19,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (84.0, 84.0, 84.0, 84.0) @@ -94,5 +94,5 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +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 506a3410..b5164d22 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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 1.0) @@ -39,7 +39,7 @@ float4 main() : sv_target [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) @@ -55,7 +55,7 @@ float4 main() : sv_target [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) @@ -86,7 +86,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (7.0, 7.0, 7.0, 7.0) @@ -119,7 +119,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (3.0, 3.0, 3.0, 3.0) @@ -159,7 +159,7 @@ float4 main() : sv_target [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (10.0, 20.0, 30.0, 30.0) @@ -181,7 +181,7 @@ float4 main() : sv_target [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (10.0, 10.0, 11.4, 12.4) @@ -197,7 +197,7 @@ float4 main() : sv_target [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (11.0, 12.0, 13.0, 14.0) @@ -220,7 +220,7 @@ float4 main() : sv_target [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (21.0, 22.0, 23.0, 24.0) @@ -236,7 +236,7 @@ float4 main() : sv_target [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (31.0, 32.0, 33.0, 33.0) @@ -258,7 +258,7 @@ float4 main() : sv_target [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (41.0, 42.0, 43.0, 44.0) @@ -297,7 +297,7 @@ float4 main() : sv_target [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (55.0, 56.0, 57.0, 58.0) @@ -329,7 +329,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (61.0, 62.0, 63.0, 64.0) @@ -355,7 +355,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (71.0, 72.0, 73.0, 74.0) @@ -404,7 +404,7 @@ float4 main() : sv_target [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (81.0, 82.0, 83.0, 84.0) @@ -420,7 +420,7 @@ float4 main() : sv_target [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (91.0, 92.0, 93.0, 0.0) @@ -436,7 +436,7 @@ float4 main() : sv_target [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (11.0, 12.0, 13.0, 0.0) @@ -477,7 +477,7 @@ float4 main() : sv_target [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (21.0, 22.0, 23.0, 24.0) @@ -499,7 +499,7 @@ float4 main() : sv_target [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (31.0, 32.0, 33.0, 0.0) @@ -521,7 +521,7 @@ float4 main() : sv_target [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (41.0, 42.0, 43.0, 0.0) @@ -537,7 +537,7 @@ float4 main() : sv_target [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (51.0, 52.0, 53.0, 0.0) @@ -564,7 +564,7 @@ float4 main() : sv_target [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (61.0, 62.0, 63.0, 0.0) @@ -580,5 +580,5 @@ float4 main() : sv_target [test] -todo(msl) draw quad +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 848b4946..d369e158 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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 1.0) @@ -89,7 +89,7 @@ float4 main() : sv_target [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) @@ -120,7 +120,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (4.0, 4.0, 4.0, 4.0) @@ -154,7 +154,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (5.0, 5.0, 5.0, 5.0) @@ -199,7 +199,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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 4b4afbbe..812d0bb1 100644 --- a/tests/hlsl/cast-to-float.shader_test +++ b/tests/hlsl/cast-to-float.shader_test @@ -33,5 +33,5 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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 2b45fc7f..042e7aab 100644 --- a/tests/hlsl/cast-to-half.shader_test +++ b/tests/hlsl/cast-to-half.shader_test @@ -33,5 +33,5 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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 76e48ea9..5a1cb7da 100644 --- a/tests/hlsl/cast-to-int.shader_test +++ b/tests/hlsl/cast-to-int.shader_test @@ -61,6 +61,6 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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 d18269f0..d4f9846e 100644 --- a/tests/hlsl/cast-to-uint.shader_test +++ b/tests/hlsl/cast-to-uint.shader_test @@ -46,5 +46,5 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.5, 0.5, 0.5, 0.5) diff --git a/tests/hlsl/ceil.shader_test b/tests/hlsl/ceil.shader_test index 841bbeb2..f75c88ee 100644 --- a/tests/hlsl/ceil.shader_test +++ b/tests/hlsl/ceil.shader_test @@ -5,7 +5,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.0, 7.0, 8.0, 4.0) 4 [pixel shader] diff --git a/tests/hlsl/clamp.shader_test b/tests/hlsl/clamp.shader_test index 89fbac9a..7162451c 100644 --- a/tests/hlsl/clamp.shader_test +++ b/tests/hlsl/clamp.shader_test @@ -24,7 +24,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (5.5, 5.0, 4.2, 5.2) diff --git a/tests/hlsl/comma.shader_test b/tests/hlsl/comma.shader_test index 2a38ccf4..fc0aa3df 100644 --- a/tests/hlsl/comma.shader_test +++ b/tests/hlsl/comma.shader_test @@ -6,5 +6,5 @@ float4 main(): sv_target } [test] -todo(msl) draw quad +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 dd26742c..6f2cb5d3 100644 --- a/tests/hlsl/conditional.shader_test +++ b/tests/hlsl/conditional.shader_test @@ -125,7 +125,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (9.0, 10.0, 11.0, 12.0) diff --git a/tests/hlsl/distance.shader_test b/tests/hlsl/distance.shader_test index b0fa5fe4..5bcbe921 100644 --- a/tests/hlsl/distance.shader_test +++ b/tests/hlsl/distance.shader_test @@ -44,7 +44,7 @@ float4 main() : SV_TARGET } [test] -todo(sm>=6 | msl) draw quad +todo(sm>=6) 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] -todo(msl) draw quad +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 7362998c..0cbfe81f 100644 --- a/tests/hlsl/dot.shader_test +++ b/tests/hlsl/dot.shader_test @@ -84,7 +84,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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 4a95e553..23dfc1ef 100644 --- a/tests/hlsl/duplicate-modifiers.shader_test +++ b/tests/hlsl/duplicate-modifiers.shader_test @@ -7,6 +7,6 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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/effect-compile.shader_test b/tests/hlsl/effect-compile.shader_test index b874ff88..c01f7c7b 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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0, 0, 0, 0) diff --git a/tests/hlsl/floor.shader_test b/tests/hlsl/floor.shader_test index e7942f7b..8f96a9a9 100644 --- a/tests/hlsl/floor.shader_test +++ b/tests/hlsl/floor.shader_test @@ -5,7 +5,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (-1.0, 6.0, 7.0, 3.0) 4 [pixel shader] diff --git a/tests/hlsl/for.shader_test b/tests/hlsl/for.shader_test index a8cc015c..23acaa46 100644 --- a/tests/hlsl/for.shader_test +++ b/tests/hlsl/for.shader_test @@ -76,7 +76,7 @@ float4 main(float tex : texcoord) : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (10.0, 45.0, 0.0, 0.0) [pixel shader fail(sm<6)] diff --git a/tests/hlsl/function-return.shader_test b/tests/hlsl/function-return.shader_test index 71ab9034..184b4fda 100644 --- a/tests/hlsl/function-return.shader_test +++ b/tests/hlsl/function-return.shader_test @@ -29,7 +29,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.2, 0.1, 0.8, 0.5); [pixel shader todo(sm<4)] @@ -181,7 +181,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.4, 0.3, 0.3, 0.9) 1 [pixel shader todo(sm<4)] diff --git a/tests/hlsl/function.shader_test b/tests/hlsl/function.shader_test index 1c77a51a..49dbb02f 100644 --- a/tests/hlsl/function.shader_test +++ b/tests/hlsl/function.shader_test @@ -176,7 +176,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.5, 0.6, 0.7, 0) [pixel shader] @@ -221,7 +221,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (2.0, 3.0, 6.0, 7.0) @@ -293,7 +293,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) @@ -408,7 +408,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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/initializer-flatten.shader_test b/tests/hlsl/initializer-flatten.shader_test index 94148734..91fc7a37 100644 --- a/tests/hlsl/initializer-flatten.shader_test +++ b/tests/hlsl/initializer-flatten.shader_test @@ -6,7 +6,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1, 2, 3, 4) @@ -24,7 +24,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (4, 5, 6, 7) @@ -37,7 +37,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (40, 10, 20, 30) @@ -56,7 +56,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) @@ -69,5 +69,5 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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 4ebb984c..d7f4094c 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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (50, 60, 70, 80) @@ -21,7 +21,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (7.0, 8.0, 9.0, 10.0) @@ -63,7 +63,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +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 bb7ab083..e0bab46f 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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (17, 18, 19, 20) @@ -57,7 +57,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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 9a0e1a09..4aa0206a 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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (21, 22, 23, 24) @@ -31,5 +31,5 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +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 d778f4ee..ef9f4ca6 100644 --- a/tests/hlsl/initializer-matrix.shader_test +++ b/tests/hlsl/initializer-matrix.shader_test @@ -6,7 +6,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (21, 22, 23, 0) @@ -18,7 +18,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (21, 22, 23, 0) @@ -30,7 +30,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (21, 22, 23, 24) @@ -42,7 +42,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (21, 22, 31, 32) @@ -55,7 +55,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (21, 22, 31, 32) @@ -68,5 +68,5 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +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 adb2006e..044e2752 100644 --- a/tests/hlsl/initializer-multi.shader_test +++ b/tests/hlsl/initializer-multi.shader_test @@ -7,7 +7,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (2, 3, 3, 0) @@ -32,7 +32,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (7.2, 8.0, 7.2, 8.0) @@ -48,5 +48,5 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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 d54c4c7b..d5a47f1e 100644 --- a/tests/hlsl/initializer-nested.shader_test +++ b/tests/hlsl/initializer-nested.shader_test @@ -6,7 +6,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1, 2, 3, 4) @@ -23,7 +23,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (21, 22, 23, 24) @@ -52,5 +52,5 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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 d3933503..9ed50998 100644 --- a/tests/hlsl/initializer-numeric.shader_test +++ b/tests/hlsl/initializer-numeric.shader_test @@ -6,7 +6,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) 4 @@ -18,7 +18,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) 4 @@ -31,7 +31,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) 4 @@ -44,7 +44,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (10.1, 1.1, 1.2, 2.1) 4 @@ -56,7 +56,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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] -todo(msl) draw quad +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-static-array.shader_test b/tests/hlsl/initializer-static-array.shader_test index 667c4285..a974886f 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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (21, 22, 23, 24) @@ -33,5 +33,5 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +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 e875be44..e1c4d870 100644 --- a/tests/hlsl/initializer-struct.shader_test +++ b/tests/hlsl/initializer-struct.shader_test @@ -22,7 +22,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (41, 42, 43, 44) @@ -52,7 +52,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (4311, 4312, 4313, 4314) @@ -80,5 +80,5 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (21, 22, 23, 24) diff --git a/tests/hlsl/intrinsic-override.shader_test b/tests/hlsl/intrinsic-override.shader_test index e4f1ac88..98d7f669 100644 --- a/tests/hlsl/intrinsic-override.shader_test +++ b/tests/hlsl/intrinsic-override.shader_test @@ -11,7 +11,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.3, 0.3, 0.3, 0.4) diff --git a/tests/hlsl/ldexp.shader_test b/tests/hlsl/ldexp.shader_test index 073beba8..7d95134f 100644 --- a/tests/hlsl/ldexp.shader_test +++ b/tests/hlsl/ldexp.shader_test @@ -43,7 +43,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (64.0, 64.0, 64.0, 40.0) diff --git a/tests/hlsl/lerp.shader_test b/tests/hlsl/lerp.shader_test index edbf1f70..d9810fac 100644 --- a/tests/hlsl/lerp.shader_test +++ b/tests/hlsl/lerp.shader_test @@ -49,7 +49,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (-6.0, -2.2, 4.48, 8.28) 1 diff --git a/tests/hlsl/logic-operations.shader_test b/tests/hlsl/logic-operations.shader_test index e0e74cec..0aa7fc87 100644 --- a/tests/hlsl/logic-operations.shader_test +++ b/tests/hlsl/logic-operations.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) diff --git a/tests/hlsl/matrix-indexing.shader_test b/tests/hlsl/matrix-indexing.shader_test index ac8240d3..5a4c71fa 100644 --- a/tests/hlsl/matrix-indexing.shader_test +++ b/tests/hlsl/matrix-indexing.shader_test @@ -74,7 +74,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 5.0, 7.0, 12.0) @@ -89,7 +89,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (30.0, 40.0, 5.0, 6.0) @@ -104,7 +104,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (3.0, 4.0, 50.0, 60.0) diff --git a/tests/hlsl/matrix-semantics.shader_test b/tests/hlsl/matrix-semantics.shader_test index d9601e0d..b9efed53 100644 --- a/tests/hlsl/matrix-semantics.shader_test +++ b/tests/hlsl/matrix-semantics.shader_test @@ -8,7 +8,7 @@ float4x1 main() : sv_target } [test] -todo(msl) draw quad +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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [rtv 0] @@ -96,7 +96,7 @@ void main(out row_major float1x4 x : sv_target0, out float1x2 y : sv_target1) } [test] -todo(sm>=6 | msl) draw quad +todo(sm>=6) 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 790c2614..c75935e4 100644 --- a/tests/hlsl/max-min.shader_test +++ b/tests/hlsl/max-min.shader_test @@ -39,7 +39,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (6.0, 5.0, 4.0, 5.0) diff --git a/tests/hlsl/minimum-precision.shader_test b/tests/hlsl/minimum-precision.shader_test index 1cca75a5..a7ad6efd 100644 --- a/tests/hlsl/minimum-precision.shader_test +++ b/tests/hlsl/minimum-precision.shader_test @@ -17,7 +17,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (197.0, 218.0, 238.0, 257.0) [rtv 0] diff --git a/tests/hlsl/mul.shader_test b/tests/hlsl/mul.shader_test index 7d2fba22..a3cbf9ec 100644 --- a/tests/hlsl/mul.shader_test +++ b/tests/hlsl/mul.shader_test @@ -11,7 +11,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (78.0, 96.0, 114.0, 0.0) @@ -300,7 +300,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (20.0, 14.0, 56.0, 41.0) @@ -315,5 +315,5 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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 344928e8..2bb19112 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] -todo(msl) draw quad +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/numeric-constructor-truncation.shader_test b/tests/hlsl/numeric-constructor-truncation.shader_test index 348b1fa6..159ca922 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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (71.0, 72.0, 73.0, 75.0) @@ -29,5 +29,5 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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 2d093c5b..b39fa612 100644 --- a/tests/hlsl/numeric-types.shader_test +++ b/tests/hlsl/numeric-types.shader_test @@ -6,7 +6,7 @@ vector main() : sv_target } [test] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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-references.shader_test b/tests/hlsl/object-references.shader_test index f33133ed..a3219fc6 100644 --- a/tests/hlsl/object-references.shader_test +++ b/tests/hlsl/object-references.shader_test @@ -202,7 +202,7 @@ float4 main() : sv_target [test] uniform 0 float 10.0 -todo(msl) draw quad +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 1adb99c0..726afb6a 100644 --- a/tests/hlsl/pow.shader_test +++ b/tests/hlsl/pow.shader_test @@ -23,7 +23,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 32.0, 256.0, 125.0) 2 diff --git a/tests/hlsl/return-implicit-conversion.shader_test b/tests/hlsl/return-implicit-conversion.shader_test index 6b699183..185c84e8 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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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 4022de6b..50668259 100644 --- a/tests/hlsl/return.shader_test +++ b/tests/hlsl/return.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) [pixel shader todo(sm<4)] @@ -138,7 +138,7 @@ void main(out float4 ret : sv_target) } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.2, 0.4, 0.6, 0.8) [pixel shader todo(sm<4)] diff --git a/tests/hlsl/rt-format-mismatch.shader_test b/tests/hlsl/rt-format-mismatch.shader_test index ddf6e4c7..8a1741ef 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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (22.0, -22.0, 1.0e100, -1.0e100) [pixel shader] @@ -49,7 +49,7 @@ float2 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rg (22.0, -22.0) [rtv 0] @@ -73,7 +73,7 @@ uint4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgbaui (0, 22, 0xfeedcafe, 0xffffffff) [pixel shader] @@ -127,7 +127,7 @@ int4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgbai (0, 22, -22, -1000) [pixel shader] @@ -161,7 +161,7 @@ uint4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rui (22) [pixel shader] diff --git a/tests/hlsl/shape.shader_test b/tests/hlsl/shape.shader_test index c772cf64..cb2cd988 100644 --- a/tests/hlsl/shape.shader_test +++ b/tests/hlsl/shape.shader_test @@ -7,7 +7,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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 306188f8..7c41b531 100644 --- a/tests/hlsl/side-effects.shader_test +++ b/tests/hlsl/side-effects.shader_test @@ -7,7 +7,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) @@ -23,7 +23,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (11.0, 11.0, 11.0, 11.0) @@ -48,5 +48,5 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (2.2, 2.2, 2.2, 2.2) diff --git a/tests/hlsl/single-numeric-initializer.shader_test b/tests/hlsl/single-numeric-initializer.shader_test index 6971dfe9..077d7f44 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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (7.0, 7.0, 7.0, 7.0) @@ -22,5 +22,5 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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 a5fab02c..5c57bd37 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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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] -todo(msl) draw quad +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 6605caab..bdec1f11 100644 --- a/tests/hlsl/smoothstep.shader_test +++ b/tests/hlsl/smoothstep.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0, 0.784, 1.0, 0.559872) 1 @@ -24,7 +24,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0, 0.104, 0.896, 1.000000) 6 @@ -39,7 +39,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 0.352, 0, 0) 1 @@ -55,7 +55,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.352, 0.352, 0, 0) 1 @@ -71,7 +71,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.352, 0.352, 0, 0) 1 @@ -87,7 +87,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 1.0, 0, 0) 1 @@ -103,7 +103,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.028, 0.104, 0.216, 0.352) 6 @@ -132,7 +132,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.5, 0.5, 0.5, 0.0) @@ -148,7 +148,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.5, 0.5, 0.5, 0.5) diff --git a/tests/hlsl/state-block-syntax.shader_test b/tests/hlsl/state-block-syntax.shader_test index 16e66377..8d409a8a 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] -todo(msl) draw quad +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 a559603c..56758305 100644 --- a/tests/hlsl/static-initializer.shader_test +++ b/tests/hlsl/static-initializer.shader_test @@ -12,7 +12,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.8, 0.0, 0.0, 0.0) @@ -52,7 +52,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) diff --git a/tests/hlsl/step.shader_test b/tests/hlsl/step.shader_test index 57d1afc3..7e585bf9 100644 --- a/tests/hlsl/step.shader_test +++ b/tests/hlsl/step.shader_test @@ -23,7 +23,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 0.0) @@ -51,5 +51,5 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.0, 1.0, 1.0, 0.0) diff --git a/tests/hlsl/struct-assignment.shader_test b/tests/hlsl/struct-assignment.shader_test index 4aa37192..69cf7f3b 100644 --- a/tests/hlsl/struct-assignment.shader_test +++ b/tests/hlsl/struct-assignment.shader_test @@ -19,5 +19,5 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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 c5340aa1..581d743d 100644 --- a/tests/hlsl/struct-inheritance.shader_test +++ b/tests/hlsl/struct-inheritance.shader_test @@ -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 -todo(msl) draw quad +draw quad probe (0, 0) rgba (-1, 0, 3, -4) diff --git a/tests/hlsl/swizzle-matrix.shader_test b/tests/hlsl/swizzle-matrix.shader_test index cadec865..b7d6cf91 100644 --- a/tests/hlsl/swizzle-matrix.shader_test +++ b/tests/hlsl/swizzle-matrix.shader_test @@ -54,7 +54,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 6.0, 1.0, 6.0) @@ -151,7 +151,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (40.0, 40.0, 40.0, 40.0) diff --git a/tests/hlsl/swizzles.shader_test b/tests/hlsl/swizzles.shader_test index 5f0161eb..af08750c 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 -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.0101, 0.0303, 0.0202, 0.0404) @@ -24,7 +24,7 @@ float4 main() : SV_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.1, 0.6, 0.3, 0.5) @@ -37,7 +37,7 @@ float4 main() : SV_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.4, 0.3, 0.1, 0.2) @@ -53,7 +53,7 @@ float4 main() : SV_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.3, 0.2, 0.4, 0.1) @@ -68,7 +68,7 @@ float4 main() : SV_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.1, 0.2, 0.4, 0.3) @@ -80,7 +80,7 @@ float4 main() : SV_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.1, 0.4, 0.4, 0.1) @@ -94,7 +94,7 @@ float4 main() : SV_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.3, 0.1, 0.4, 0.2) @@ -107,7 +107,7 @@ float4 main() : SV_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) @@ -120,7 +120,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (20.0, 20.0, 20.0, 20.0) @@ -133,7 +133,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 3.0) diff --git a/tests/hlsl/ternary.shader_test b/tests/hlsl/ternary.shader_test index 583acb62..9bce9a6c 100644 --- a/tests/hlsl/ternary.shader_test +++ b/tests/hlsl/ternary.shader_test @@ -97,7 +97,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.0, 1.0, 3.0, 4.0) @@ -112,7 +112,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (5.0, 6.0, 7.0, 1.0) @@ -157,7 +157,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 6.0, 7.0, 4.0) @@ -199,7 +199,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 6.0, 7.0, 4.0) @@ -215,7 +215,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) @@ -242,7 +242,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (3.0, 3.0, 3.0, 3.0) @@ -258,7 +258,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) @@ -305,7 +305,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) @@ -340,7 +340,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (2.0, 3.0, 3.0, 2.0) diff --git a/tests/hlsl/transpose.shader_test b/tests/hlsl/transpose.shader_test index 3450d834..aedbef6c 100644 --- a/tests/hlsl/transpose.shader_test +++ b/tests/hlsl/transpose.shader_test @@ -5,7 +5,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (5.0, 5.0, 5.0, 5.0) @@ -18,7 +18,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (5.0, 5.0, 5.0, 5.0) @@ -39,7 +39,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) @@ -55,7 +55,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (2.0, 5.0, 8.0, 11.0) @@ -71,5 +71,5 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (2.0, 5.0, 8.0, 11.0) diff --git a/tests/hlsl/type-names.shader_test b/tests/hlsl/type-names.shader_test index c5750ebe..97159774 100644 --- a/tests/hlsl/type-names.shader_test +++ b/tests/hlsl/type-names.shader_test @@ -37,7 +37,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +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/unroll.shader_test b/tests/hlsl/unroll.shader_test index c9d7949c..b50cda50 100644 --- a/tests/hlsl/unroll.shader_test +++ b/tests/hlsl/unroll.shader_test @@ -33,7 +33,7 @@ float4 main() : sv_target } [test] -todo(msl) draw quad +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] -todo(msl) draw quad +draw quad probe (0,0) rgba(1337.0, 0, 0, 0) diff --git a/tests/hlsl/vector-indexing.shader_test b/tests/hlsl/vector-indexing.shader_test index 24f2217c..988c6608 100644 --- a/tests/hlsl/vector-indexing.shader_test +++ b/tests/hlsl/vector-indexing.shader_test @@ -10,7 +10,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.02, 0.245, 0.351, 1.0) [pixel shader] @@ -47,7 +47,7 @@ float4 main() : SV_TARGET } [test] -todo(msl) draw quad +draw quad probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) diff --git a/tests/hlsl/writemask-assignop-0.shader_test b/tests/hlsl/writemask-assignop-0.shader_test index a387f36b..58771e80 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 -todo(msl) draw quad +draw quad probe (0, 0) rgba (-0.4697, -0.02, 0.57, 0.3202) 2 diff --git a/tests/hlsl/writemask-assignop-2.shader_test b/tests/hlsl/writemask-assignop-2.shader_test index c2bfef70..4524f3b3 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] -todo(msl) draw quad +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 801010e0..ca8aa01d 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] -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.9, 1.8, 1.7, 1.6)