From d3ba810c98b4d2df260a527f74586a0b31408510 Mon Sep 17 00:00:00 2001 From: Elizabeth Figura Date: Sat, 10 Feb 2024 13:16:22 -0600 Subject: [PATCH] tests: Stop probing all pixels when drawing a uniform colour. This is simply unnecessary and wastes time. As part of this, simply remove the "all" directive. Only for a couple of tests is it even potentially interesting to validate all pixels (e.g. nointerpolation.shader_test), and for those "all" is replaced with an explicit (0, 0, 640, 480) rect. In all other cases we just probe (0, 0). --- tests/hlsl/abs.shader_test | 4 +- tests/hlsl/all.shader_test | 14 ++-- tests/hlsl/angle-unit.shader_test | 4 +- tests/hlsl/any.shader_test | 36 +++++----- .../hlsl/arithmetic-float-uniform.shader_test | 26 ++++---- tests/hlsl/arithmetic-float.shader_test | 12 ++-- tests/hlsl/arithmetic-int-uniform.shader_test | 26 ++++---- tests/hlsl/arithmetic-int.shader_test | 22 +++---- tests/hlsl/arithmetic-uint.shader_test | 8 +-- tests/hlsl/array-dimension.shader_test | 2 +- tests/hlsl/array-parameters.shader_test | 8 +-- tests/hlsl/array-size-expr.shader_test | 10 +-- tests/hlsl/bitwise.shader_test | 48 +++++++------- tests/hlsl/bool-cast.shader_test | 6 +- tests/hlsl/bool-semantics.shader_test | 2 +- tests/hlsl/calculate-lod.shader_test | 8 +-- tests/hlsl/cast-64-bit.shader_test | 12 ++-- 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 | 4 +- tests/hlsl/cast-to-half.shader_test | 4 +- tests/hlsl/cast-to-int.shader_test | 8 +-- tests/hlsl/cast-to-uint.shader_test | 4 +- tests/hlsl/cbuffer.shader_test | 38 +++++------ tests/hlsl/ceil.shader_test | 8 +-- tests/hlsl/cf-cond-types.shader_test | 4 +- tests/hlsl/clamp.shader_test | 4 +- tests/hlsl/clip-distance.shader_test | 6 +- tests/hlsl/clip.shader_test | 12 ++-- tests/hlsl/combined-samplers.shader_test | 14 ++-- tests/hlsl/comma.shader_test | 2 +- tests/hlsl/conditional.shader_test | 40 +++++------ tests/hlsl/const.shader_test | 2 +- tests/hlsl/coverage.shader_test | 24 +++---- tests/hlsl/cross.shader_test | 4 +- tests/hlsl/d3dcolor-to-ubyte4.shader_test | 4 +- tests/hlsl/ddxddy.shader_test | 2 +- tests/hlsl/default-values.shader_test | 18 ++--- tests/hlsl/depth-out.shader_test | 28 ++++---- tests/hlsl/determinant.shader_test | 14 ++-- tests/hlsl/discard.shader_test | 8 +-- tests/hlsl/distance.shader_test | 2 +- tests/hlsl/dot.shader_test | 12 ++-- tests/hlsl/duplicate-modifiers.shader_test | 4 +- tests/hlsl/exp.shader_test | 4 +- tests/hlsl/expr-indexing.shader_test | 14 ++-- tests/hlsl/float-comparison.shader_test | 16 ++--- tests/hlsl/floor.shader_test | 8 +-- tests/hlsl/fmod.shader_test | 8 +-- tests/hlsl/for.shader_test | 2 +- tests/hlsl/frac.shader_test | 2 +- tests/hlsl/function-cast.shader_test | 8 +-- tests/hlsl/function-overload.shader_test | 4 +- tests/hlsl/function-return.shader_test | 38 +++++------ tests/hlsl/function.shader_test | 16 ++--- tests/hlsl/gather-offset.shader_test | 14 ++-- tests/hlsl/gather.shader_test | 14 ++-- tests/hlsl/get-sample-pos.shader_test | 2 +- tests/hlsl/getdimensions.shader_test | 4 +- tests/hlsl/half.shader_test | 2 +- tests/hlsl/hard-copy-prop.shader_test | 12 ++-- 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 | 14 ++-- tests/hlsl/initializer-objects.shader_test | 4 +- .../hlsl/initializer-static-array.shader_test | 4 +- tests/hlsl/initializer-struct.shader_test | 6 +- tests/hlsl/intrinsic-override.shader_test | 6 +- tests/hlsl/inverse-trig.shader_test | 66 +++++++++---------- tests/hlsl/is-front-face.shader_test | 4 +- tests/hlsl/ldexp.shader_test | 6 +- tests/hlsl/length.shader_test | 10 +-- tests/hlsl/lerp.shader_test | 6 +- tests/hlsl/lit.shader_test | 8 +-- tests/hlsl/load-level.shader_test | 6 +- tests/hlsl/log.shader_test | 6 +- tests/hlsl/logic-operations.shader_test | 28 ++++---- tests/hlsl/loop.shader_test | 14 ++-- tests/hlsl/majority-pragma.shader_test | 32 ++++----- tests/hlsl/majority-syntax.shader_test | 2 +- tests/hlsl/majority-typedef.shader_test | 2 +- tests/hlsl/math.shader_test | 2 +- tests/hlsl/matrix-indexing.shader_test | 18 ++--- tests/hlsl/matrix-semantics.shader_test | 34 +++++----- tests/hlsl/max-min.shader_test | 14 ++-- tests/hlsl/minimum-precision.shader_test | 10 +-- tests/hlsl/mul.shader_test | 40 +++++------ tests/hlsl/multiple-rt.shader_test | 4 +- tests/hlsl/nested-arrays.shader_test | 2 +- tests/hlsl/nointerpolation.shader_test | 10 +-- tests/hlsl/non-const-indexing.shader_test | 52 +++++++-------- tests/hlsl/normalize.shader_test | 10 +-- ...numeric-constructor-truncation.shader_test | 4 +- tests/hlsl/numeric-types.shader_test | 10 +-- tests/hlsl/object-field-offsets.shader_test | 6 +- tests/hlsl/object-parameters.shader_test | 6 +- tests/hlsl/object-references.shader_test | 6 +- tests/hlsl/pointer-cast.shader_test | 4 +- tests/hlsl/pow.shader_test | 4 +- tests/hlsl/precise-modifier.shader_test | 6 +- .../hlsl/rasteriser-ordered-views.shader_test | 8 +-- tests/hlsl/reflect.shader_test | 12 ++-- tests/hlsl/refract.shader_test | 32 ++++----- .../register-reservations-numeric.shader_test | 20 +++--- .../register-reservations-profile.shader_test | 32 ++++----- ...egister-reservations-resources.shader_test | 24 +++---- .../register-reservations-space.shader_test | 20 +++--- .../return-implicit-conversion.shader_test | 28 ++++---- tests/hlsl/return.shader_test | 50 +++++++------- tests/hlsl/round.shader_test | 6 +- tests/hlsl/rt-get-sample-info.shader_test | 6 +- tests/hlsl/sample-bias.shader_test | 12 ++-- tests/hlsl/sample-cmp.shader_test | 20 +++--- tests/hlsl/sample-grad.shader_test | 6 +- tests/hlsl/sample-level.shader_test | 12 ++-- tests/hlsl/sampler-offset.shader_test | 6 +- tests/hlsl/sampler.shader_test | 4 +- tests/hlsl/saturate.shader_test | 4 +- .../shader-interstage-interface.shader_test | 2 +- tests/hlsl/shape.shader_test | 54 +++++++-------- tests/hlsl/side-effects.shader_test | 6 +- tests/hlsl/sign.shader_test | 20 +++--- .../single-numeric-initializer.shader_test | 4 +- tests/hlsl/sm1-const-allocation.shader_test | 30 ++++----- tests/hlsl/sm1-const-folding.shader_test | 28 ++++---- tests/hlsl/sm6-ternary.shader_test | 6 +- tests/hlsl/smoothstep.shader_test | 18 ++--- tests/hlsl/sqrt.shader_test | 4 +- tests/hlsl/srv-buffers.shader_test | 16 ++--- tests/hlsl/state-block-syntax.shader_test | 2 +- tests/hlsl/static-initializer.shader_test | 8 +-- tests/hlsl/step.shader_test | 6 +- tests/hlsl/storage-qualifiers.shader_test | 4 +- tests/hlsl/struct-array.shader_test | 2 +- tests/hlsl/struct-assignment.shader_test | 2 +- tests/hlsl/struct-semantics.shader_test | 2 +- tests/hlsl/switch.shader_test | 64 +++++++++--------- tests/hlsl/swizzle-constant-prop.shader_test | 6 +- tests/hlsl/swizzle-matrix.shader_test | 14 ++-- tests/hlsl/swizzles.shader_test | 24 +++---- tests/hlsl/ternary.shader_test | 30 ++++----- tests/hlsl/tessellation.shader_test | 2 +- tests/hlsl/texture-load-typed.shader_test | 4 +- tests/hlsl/texture-ordering.shader_test | 10 +-- tests/hlsl/transpose.shader_test | 10 +-- tests/hlsl/trigonometry.shader_test | 18 ++--- tests/hlsl/trunc.shader_test | 8 +-- tests/hlsl/type-names.shader_test | 2 +- tests/hlsl/uniform-semantics.shader_test | 4 +- .../hlsl/vector-indexing-uniform.shader_test | 2 +- tests/hlsl/vector-indexing.shader_test | 6 +- tests/hlsl/vertex-shader-ops.shader_test | 14 ++-- tests/hlsl/writemask-assignop-0.shader_test | 2 +- tests/hlsl/writemask-assignop-1.shader_test | 2 +- tests/hlsl/writemask-assignop-2.shader_test | 2 +- tests/hlsl/writemask-assignop-3.shader_test | 2 +- tests/shader_runner.c | 6 +- 163 files changed, 1003 insertions(+), 1007 deletions(-) diff --git a/tests/hlsl/abs.shader_test b/tests/hlsl/abs.shader_test index 003504eb..ca074162 100644 --- a/tests/hlsl/abs.shader_test +++ b/tests/hlsl/abs.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.1 0.7 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.1, 0.7, 0.4, 0.4) +probe (0, 0) rgba (0.1, 0.7, 0.4, 0.4) uniform 0 float4 -0.7 0.1 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.7, 0.1, 1.2, 0.4) +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 728d5008..2a1966c6 100644 --- a/tests/hlsl/all.shader_test +++ b/tests/hlsl/all.shader_test @@ -12,17 +12,17 @@ float4 main() : sv_target [test] uniform 0 float4 -1.1 1.6 1.3 0.5 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +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(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +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(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] uniform float f; @@ -35,12 +35,12 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [test] uniform 0 float4 0.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] uniform float2x2 f; @@ -54,10 +54,10 @@ float4 main() : sv_target uniform 0 float4 1.0 2.0 0.0 0.0 uniform 4 float4 3.0 4.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +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 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +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 fbf853a6..f0c6d0b4 100644 --- a/tests/hlsl/angle-unit.shader_test +++ b/tests/hlsl/angle-unit.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 30.0 150.0 180.0 todo(glsl) draw quad -probe all rgba (0.0, 0.52359877, 2.61799387, 3.14159265) +probe (0, 0) rgba (0.0, 0.52359877, 2.61799387, 3.14159265) [pixel shader] @@ -23,4 +23,4 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.78539816 1.57079632 2.35619449 todo(glsl) draw quad -probe all rgba (0.0, 45.0, 90.0, 135.0) +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 8a740828..9a5a8538 100644 --- a/tests/hlsl/any.shader_test +++ b/tests/hlsl/any.shader_test @@ -9,25 +9,25 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 1.0 1.0 1.0 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) uniform 0 float4 1.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) uniform 0 float4 0.0 1.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) uniform 0 float4 0.0 0.0 1.0 0.0 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) uniform 0 float4 0.0 0.0 0.0 1.0 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) uniform 0 float4 0.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) uniform 0 float4 -1.0 -1.0 -1.0 -1.0 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [pixel shader] uniform float f; @@ -40,13 +40,13 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) uniform 0 float4 0.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) uniform 0 float4 -1.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [pixel shader] @@ -61,27 +61,27 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 1 1 1 1 if(sm>=4) uniform 0 uint4 1 1 1 1 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +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 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +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 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +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 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +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 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +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 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] uniform uint b; @@ -95,8 +95,8 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 1 0 0 0 if(sm>=4) uniform 0 uint4 1 0 0 0 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +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 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +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 0797b237..6cb9fd28 100644 --- a/tests/hlsl/arithmetic-float-uniform.shader_test +++ b/tests/hlsl/arithmetic-float-uniform.shader_test @@ -11,7 +11,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 15.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (20.0, -10.0, 75.0, 0.33333333) 1 +probe (0, 0) rgba (20.0, -10.0, 75.0, 0.33333333) 1 [pixel shader] uniform float2 a; @@ -26,7 +26,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 15.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (5.0, 5.0, -5.0, 3.0) 1 +probe (0, 0) rgba (5.0, 5.0, -5.0, 3.0) 1 [pixel shader] uniform float2 a; @@ -41,7 +41,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 42.0 5.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (2.0, -2.0, 2.0, -2.0) 16 +probe (0, 0) rgba (2.0, -2.0, 2.0, -2.0) 16 [pixel shader] uniform float2 a; @@ -56,7 +56,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 45.0 5.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] float4 x, y; @@ -70,7 +70,7 @@ float4 main() : sv_target uniform 0 float4 5.0 -42.1 4.0 45.0 uniform 4 float4 15.0 -5.0 4.1 5.0 todo(glsl) draw quad -probe all rgba (5.0, -2.1, 4.0, 0.0) 6 +probe (0, 0) rgba (5.0, -2.1, 4.0, 0.0) 6 [require] % Infinities are not allowed in SM1 @@ -89,7 +89,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 1.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (1e99, 1e99, 1e99, 1e99) +probe (0, 0) rgba (1e99, 1e99, 1e99, 1e99) [pixel shader todo] uniform float4 a, b, c; @@ -104,7 +104,7 @@ 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 todo(sm<6) draw quad -probe all rgba (2.62500024, 209.5, 17.0, 224.5) 1 +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. [pixel shader todo] @@ -121,7 +121,7 @@ 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 todo(sm<6) draw quad -probe all rgba (2.62500048, 209.5, 17.0, 224.5) +probe (0, 0) rgba (2.62500048, 209.5, 17.0, 224.5) [require] shader model >= 5.0 @@ -140,7 +140,7 @@ float4 main() : SV_TARGET [test] uniform 0 double2 7.5 -2.5 todo(sm<6) draw quad -probe all rgba (5.0, 10.0, -18.75, -3.0) +probe (0, 0) rgba (5.0, 10.0, -18.75, -3.0) [pixel shader todo] uniform double2 a; @@ -155,7 +155,7 @@ float4 main() : SV_TARGET [test] uniform 0 double2 3.0e-300 2.5e300 todo(sm<6) draw quad -probe all rgba (7.5, 7.5, 7.5, 7.5) +probe (0, 0) rgba (7.5, 7.5, 7.5, 7.5) % Note: DXC does not support modulo on doubles. [pixel shader todo] @@ -171,7 +171,7 @@ float4 main() : SV_TARGET [test] uniform 0 double2 1.5e300 2.0e299 todo(sm<6) draw quad -probe all rgba (7.5, 7.5, 7.5, 7.5) +probe (0, 0) rgba (7.5, 7.5, 7.5, 7.5) [pixel shader todo] uniform double2 a, b, c; @@ -186,7 +186,7 @@ uniform 0 double2 1.00000007 -42.1 uniform 4 double2 1.625 -5.0 uniform 8 double2 1.00000007 -1.0 todo(sm<6) draw quad -probe all rgba (2.62500024, 209.5, 0.0, 0.0) +probe (0, 0) rgba (2.62500024, 209.5, 0.0, 0.0) % Test result when instructions might be removed because they are identities such as (+0) or (*1). @@ -204,4 +204,4 @@ float4 main() : sv_target [test] uniform 0 float4 0.2 0.3 9.1 3.2 todo(glsl) draw quad -probe all rgba (0.4, 0.6, 18.2, 6.4) +probe (0, 0) rgba (0.4, 0.6, 18.2, 6.4) diff --git a/tests/hlsl/arithmetic-float.shader_test b/tests/hlsl/arithmetic-float.shader_test index 8220a7bf..cefae68d 100644 --- a/tests/hlsl/arithmetic-float.shader_test +++ b/tests/hlsl/arithmetic-float.shader_test @@ -9,7 +9,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (20.0, -10.0, 75.0, 0.33333333) +probe (0, 0) rgba (20.0, -10.0, 75.0, 0.33333333) [pixel shader] float4 main() : SV_TARGET @@ -22,7 +22,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (5.0, 5.0, -5.0, 3.0) +probe (0, 0) rgba (5.0, 5.0, -5.0, 3.0) [pixel shader] float4 main() : SV_TARGET @@ -35,7 +35,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (2.0, -2.0, 2.0, -2.0) 16 +probe (0, 0) rgba (2.0, -2.0, 2.0, -2.0) 16 [pixel shader] float4 main() : SV_TARGET @@ -48,7 +48,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] float4 main() : sv_target @@ -61,7 +61,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (5.0, -2.1, 4.0, 0.0) 6 +probe (0, 0) rgba (5.0, -2.1, 4.0, 0.0) 6 [require] % Infinities are not allowed in SM1 @@ -78,4 +78,4 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (1e99, 1e99, 1e99, 1e99) +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 e33381ab..11fb119e 100644 --- a/tests/hlsl/arithmetic-int-uniform.shader_test +++ b/tests/hlsl/arithmetic-int-uniform.shader_test @@ -11,7 +11,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 16.0 0.0 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (21.0, -11.0, 80.0, 0.0) +probe (0, 0) rgba (21.0, -11.0, 80.0, 0.0) [pixel shader todo(sm<4)] uniform float2 a; @@ -26,7 +26,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 16.0 0.0 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (5.0, 5.0, -5.0, 3.0) +probe (0, 0) rgba (5.0, 5.0, -5.0, 3.0) [pixel shader todo(sm<4)] uniform float2 a; @@ -41,7 +41,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 42.0 5.0 0.0 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (8.0, -8.0, -8.0, 8.0) +probe (0, 0) rgba (8.0, -8.0, -8.0, 8.0) [pixel shader todo(sm<4)] uniform float2 a; @@ -56,7 +56,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 42.0 5.0 0.0 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (2.0, -2.0, 2.0, -2.0) +probe (0, 0) rgba (2.0, -2.0, 2.0, -2.0) [pixel shader todo(sm<4)] uniform float2 a; @@ -71,7 +71,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 45.0 5.0 0.0 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (9.0, -9.0, -9.0, 9.0) +probe (0, 0) rgba (9.0, -9.0, -9.0, 9.0) [pixel shader todo(sm<4)] uniform float2 a; @@ -86,7 +86,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 45.0 5.0 0.0 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] uniform float4 a; @@ -99,7 +99,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 -7.0 0.0 -10.0 todo(glsl) draw quad -probe all rgba (5.0, 7.0, 0.0, 10.0) +probe (0, 0) rgba (5.0, 7.0, 0.0, 10.0) [pixel shader todo(sm<4)] uniform float4 a; @@ -118,7 +118,7 @@ float4 main() : sv_target 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 -probe all rgba (9.0, 5.0, 1.0, 3.0) +probe (0, 0) rgba (9.0, 5.0, 1.0, 3.0) [require] shader model >= 6.0 @@ -137,7 +137,7 @@ float4 main() : SV_TARGET [test] uniform 0 int64_t2 5000000000 16000000000 draw quad -probe all rgba (21.0e9, -11.0e9, 5.0e18, 0.0) 1 +probe (0, 0) rgba (21.0e9, -11.0e9, 5.0e18, 0.0) 1 [pixel shader] uniform int64_t2 a; @@ -152,7 +152,7 @@ float4 main() : SV_TARGET [test] uniform 0 int64_t2 5000000000 16000000000 draw quad -probe all rgba (5.0e9, 5.0e9, -5.0e9, 3.0) +probe (0, 0) rgba (5.0e9, 5.0e9, -5.0e9, 3.0) [pixel shader] uniform int64_t2 a; @@ -167,7 +167,7 @@ float4 main() : SV_TARGET [test] uniform 0 int64_t2 42000000000 5000000000 draw quad -probe all rgba (8.0, -8.0, -8.0, 8.0) +probe (0, 0) rgba (8.0, -8.0, -8.0, 8.0) [pixel shader] uniform int64_t2 a; @@ -182,7 +182,7 @@ float4 main() : SV_TARGET [test] uniform 0 int64_t2 42000000000 5000000000 draw quad -probe all rgba (2.0e9, -2.0e9, 2.0e9, -2.0e9) +probe (0, 0) rgba (2.0e9, -2.0e9, 2.0e9, -2.0e9) [pixel shader] uniform int64_t2 a; @@ -195,4 +195,4 @@ float4 main() : SV_TARGET [test] uniform 0 int64_t2 5000000000 -7000000000 draw quad -probe all rgba (5.0e9, 7.0e9, 0.0, 0.0) +probe (0, 0) rgba (5.0e9, 7.0e9, 0.0, 0.0) diff --git a/tests/hlsl/arithmetic-int.shader_test b/tests/hlsl/arithmetic-int.shader_test index 58aa70f6..61864594 100644 --- a/tests/hlsl/arithmetic-int.shader_test +++ b/tests/hlsl/arithmetic-int.shader_test @@ -9,7 +9,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (20.0, -10.0, 75.0, 0.0) +probe (0, 0) rgba (20.0, -10.0, 75.0, 0.0) [pixel shader] float4 main() : SV_TARGET @@ -22,7 +22,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (5.0, 5.0, -5.0, 3.0) +probe (0, 0) rgba (5.0, 5.0, -5.0, 3.0) [pixel shader] float4 main() : SV_TARGET @@ -35,7 +35,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (8.0, -8.0, -8.0, 8.0) +probe (0, 0) rgba (8.0, -8.0, -8.0, 8.0) [pixel shader] float4 main() : SV_TARGET @@ -48,7 +48,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (2.0, -2.0, 2.0, -2.0) +probe (0, 0) rgba (2.0, -2.0, 2.0, -2.0) [pixel shader] float4 main() : SV_TARGET @@ -61,7 +61,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (9.0, -9.0, -9.0, 9.0) +probe (0, 0) rgba (9.0, -9.0, -9.0, 9.0) [pixel shader] float4 main() : SV_TARGET @@ -74,7 +74,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader fail(sm<6)] // On SM1 this gives hr 0x88760b59. @@ -88,7 +88,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader fail(sm<6)] // On SM1 this gives hr 0x88760b59. @@ -102,7 +102,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [require] @@ -119,8 +119,8 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -if(sm<6) probe all rgba (-2147483648.0, -2147483648.0, -2147483648.0, -2147483648.0) -if(sm>=6) probe all rgba (0.0, 0.0, 0.0, 0.0) +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) [pixel shader] @@ -135,4 +135,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 3.0, 1.0, 3.0) +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 3f4759d8..7f087a4b 100644 --- a/tests/hlsl/arithmetic-uint.shader_test +++ b/tests/hlsl/arithmetic-uint.shader_test @@ -12,7 +12,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (20.0, 4294967296.0, 75.0, 0.0) +probe (0, 0) rgba (20.0, 4294967296.0, 75.0, 0.0) [pixel shader] float4 main() : SV_TARGET @@ -25,7 +25,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (5.0, 5.0, 4294967296.0, 3.0) +probe (0, 0) rgba (5.0, 5.0, 4294967296.0, 3.0) [pixel shader fail(sm<6)] float4 main() : SV_TARGET @@ -38,7 +38,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader fail(sm<6)] float4 main() : SV_TARGET @@ -51,4 +51,4 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) diff --git a/tests/hlsl/array-dimension.shader_test b/tests/hlsl/array-dimension.shader_test index 86b0f7d5..142fa224 100644 --- a/tests/hlsl/array-dimension.shader_test +++ b/tests/hlsl/array-dimension.shader_test @@ -19,4 +19,4 @@ float4 main() : sv_target [test] todo(sm<6) draw quad -probe all rgba (0.1, 0.1, 0.2, 0.4) +probe (0, 0) rgba (0.1, 0.1, 0.2, 0.4) diff --git a/tests/hlsl/array-parameters.shader_test b/tests/hlsl/array-parameters.shader_test index 6755c30a..6fc0bd56 100644 --- a/tests/hlsl/array-parameters.shader_test +++ b/tests/hlsl/array-parameters.shader_test @@ -13,7 +13,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (25.0, 25.0, 25.0, 25.0) +probe (0, 0) rgba (25.0, 25.0, 25.0, 25.0) [pixel shader fail] @@ -79,7 +79,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (15.0, 26.0, 37.0, 48.0) +probe (0, 0) rgba (15.0, 26.0, 37.0, 48.0) [pixel shader fail] @@ -154,7 +154,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (136.0, 136.0, 136.0, 136.0) +probe (0, 0) rgba (136.0, 136.0, 136.0, 136.0) [pixel shader] @@ -172,4 +172,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (702.0, 702.0, 702.0, 702.0) +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 0c9457ee..f87fa3a1 100644 --- a/tests/hlsl/array-size-expr.shader_test +++ b/tests/hlsl/array-size-expr.shader_test @@ -15,7 +15,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (21, 22, 23, 24) +probe (0, 0) rgba (21, 22, 23, 24) [pixel shader] @@ -37,7 +37,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (61, 62, 63, 64) +probe (0, 0) rgba (61, 62, 63, 64) [pixel shader] static const int size = 8; @@ -50,7 +50,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2, 3, 6, 1) +probe (0, 0) rgba (2, 3, 6, 1) % Additional level of indirection [pixel shader fail(sm>=6)] @@ -65,7 +65,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2, 3, 6, 1) +probe (0, 0) rgba (2, 3, 6, 1) [pixel shader fail(sm>=6)] @@ -89,4 +89,4 @@ uniform 8 float 0.0 uniform 12 float 0.0 uniform 16 float 42.0 todo(glsl) draw quad -probe all rgba (42, 42, 42, 42) +probe (0, 0) rgba (42, 42, 42, 42) diff --git a/tests/hlsl/bitwise.shader_test b/tests/hlsl/bitwise.shader_test index 63971f52..f098cb85 100644 --- a/tests/hlsl/bitwise.shader_test +++ b/tests/hlsl/bitwise.shader_test @@ -12,7 +12,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 163840.0, 480.0) +probe (0, 0) rgba (0.0, 0.0, 163840.0, 480.0) [pixel shader] float4 main() : sv_target @@ -27,7 +27,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (-2147483648.0, 4.0, 2147483650.0, 4.0) +probe (0, 0) rgba (-2147483648.0, 4.0, 2147483650.0, 4.0) [pixel shader] float4 main() : sv_target @@ -42,7 +42,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.0, 536870912.0, 1.0, 1073741824.0) +probe (0, 0) rgba (0.0, 536870912.0, 1.0, 1073741824.0) [pixel shader] float4 main() : SV_TARGET @@ -55,7 +55,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (5.0, 15.0, 10.0, -6.0) +probe (0, 0) rgba (5.0, 15.0, 10.0, -6.0) [pixel shader] float4 main() : SV_TARGET @@ -68,7 +68,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] float4 main() : SV_TARGET @@ -81,7 +81,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] float4 main() : SV_TARGET @@ -94,7 +94,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 1.0, 1.0, 0.0) +probe (0, 0) rgba (0.0, 1.0, 1.0, 0.0) [pixel shader] float4 main() : SV_TARGET @@ -114,7 +114,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 1.0, 1.0, 0.0) +probe (0, 0) rgba (0.0, 1.0, 1.0, 0.0) [pixel shader] float4 main() : SV_TARGET @@ -127,7 +127,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 163840.0, 480.0) +probe (0, 0) rgba (0.0, 0.0, 163840.0, 480.0) [pixel shader] float4 main() : SV_TARGET @@ -140,7 +140,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (5.0, 15.0, 10.0, 4294967296.0) +probe (0, 0) rgba (5.0, 15.0, 10.0, 4294967296.0) [pixel shader] float4 main() : SV_TARGET @@ -153,7 +153,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] float4 main() : SV_TARGET @@ -166,7 +166,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] float4 main() : SV_TARGET @@ -179,7 +179,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 1.0, 1.0, 0.0) +probe (0, 0) rgba (0.0, 1.0, 1.0, 0.0) [pixel shader todo] uint u; @@ -193,13 +193,13 @@ uint4 main() : sv_target [test] uniform 0 uint4 0 0 0 0 todo(sm<6) draw quad -probe all rgbaui (0, 0xffffffff, 0xffffffff, 0xffffffff) +probe (0, 0) rgbaui (0, 0xffffffff, 0xffffffff, 0xffffffff) uniform 0 uint4 0xffffffff 0xffffffff 0 0 todo(sm<6) draw quad -probe all rgbaui (32, 0, 31, 0xffffffff) +probe (0, 0) rgbaui (32, 0, 31, 0xffffffff) uniform 0 uint4 0xcccccccc 0xcccccccc 0 0 todo(sm<6) draw quad -probe all rgbaui (16, 2, 31, 29) +probe (0, 0) rgbaui (16, 2, 31, 29) [require] shader model >= 6.0 @@ -223,11 +223,11 @@ float4 main() : sv_target uniform 0 int64_t2 9223372036854775807 -1 uniform 4 int4 34 66 0 0 draw quad -probe all rgba (0.0, 4.611686018e18, 536870912.0, 2.305843009e18) 1 +probe (0, 0) rgba (0.0, 4.611686018e18, 536870912.0, 2.305843009e18) 1 uniform 0 int64_t2 -1 -1 uniform 4 int4 34 66 0 0 draw quad -probe all rgba (-1.0, -1.0, -1.0, -1.0) 1 +probe (0, 0) rgba (-1.0, -1.0, -1.0, -1.0) 1 [pixel shader] uint64_t2 a; @@ -247,7 +247,7 @@ float4 main() : sv_target uniform 0 uint64_t2 0xffffffffffffffff 1 uniform 4 uint4 34 66 0 0 draw quad -probe all rgba (9.223372036e18, 1.0, 1073741823.0, 4.611686018e18) 1 +probe (0, 0) rgba (9.223372036e18, 1.0, 1073741823.0, 4.611686018e18) 1 [pixel shader] uint64_t2 a; @@ -267,7 +267,7 @@ float4 main() : sv_target uniform 0 uint64_t2 0x83 1 uniform 4 uint4 34 66 0 0 draw quad -probe all rgba (262.0, 9.223372036e18, 2250562863104.0, 524.0) 1 +probe (0, 0) rgba (262.0, 9.223372036e18, 2250562863104.0, 524.0) 1 [pixel shader] uint64_t2 a; @@ -283,7 +283,7 @@ float4 main() : sv_target [test] uniform 0 uint64_t2 0x300000000 0x500000000 draw quad -probe all rgba (25769803776.0, 4294967296.0, 30064771072.0, 1.844674404e19) 1 +probe (0, 0) rgba (25769803776.0, 4294967296.0, 30064771072.0, 1.844674404e19) 1 [pixel shader] uint64_t u; @@ -297,10 +297,10 @@ uint4 main() : sv_target [test] uniform 0 uint64_t2 0 0 todo draw quad -probe all rgbaui (0, 0xffffffff, 0xffffffff, 0xffffffff) +probe (0, 0) rgbaui (0, 0xffffffff, 0xffffffff, 0xffffffff) uniform 0 int64_t2 -1 -1 todo draw quad -probe all rgbaui (64, 0, 63, 0xffffffff) +probe (0, 0) rgbaui (64, 0, 63, 0xffffffff) uniform 0 uint64_t2 0xcccccccccccccccc 0xcccccccccccccccc todo draw quad -probe all rgbaui (32, 2, 63, 61) +probe (0, 0) rgbaui (32, 2, 63, 61) diff --git a/tests/hlsl/bool-cast.shader_test b/tests/hlsl/bool-cast.shader_test index 02f6e424..45a98fd7 100644 --- a/tests/hlsl/bool-cast.shader_test +++ b/tests/hlsl/bool-cast.shader_test @@ -11,7 +11,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 1.0, 1.0) +probe (0, 0) rgba (0.0, 0.0, 1.0, 1.0) [pixel shader todo(sm<4)] @@ -28,7 +28,7 @@ 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 | glsl) draw quad -probe all rgba (0.0, 10.0, 1.0, 11.0) +probe (0, 0) rgba (0.0, 10.0, 1.0, 11.0) [pixel shader todo(sm<4)] @@ -43,4 +43,4 @@ float4 main() : sv_target 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 | glsl) draw quad -probe all rgba (2.0, 2.0, 2.0, 0.0) +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 0214e957..1b956378 100644 --- a/tests/hlsl/bool-semantics.shader_test +++ b/tests/hlsl/bool-semantics.shader_test @@ -50,4 +50,4 @@ float4 main(struct input i) : sv_target [test] todo(glsl) draw triangle strip 4 -probe all rgba (0.0, 2.0, 2.0, 2.0) +probe (0, 0, 640, 480) rgba (0.0, 2.0, 2.0, 2.0) diff --git a/tests/hlsl/calculate-lod.shader_test b/tests/hlsl/calculate-lod.shader_test index 69587a18..47c2958b 100644 --- a/tests/hlsl/calculate-lod.shader_test +++ b/tests/hlsl/calculate-lod.shader_test @@ -34,7 +34,7 @@ float4 main(float4 pos : sv_position) : sv_target [test] todo(sm<6) draw quad -probe all rgba (2.0, 1.0, 0.0, 14.0) +probe (0, 0, 640, 480) rgba (2.0, 1.0, 0.0, 14.0) [pixel shader todo] @@ -51,7 +51,7 @@ float4 main(float4 pos : sv_position) : sv_target [test] todo(sm<6) draw quad -probe all rgba (2.0, 2.0, 0.0, 0.0) +probe (0, 0, 640, 480) rgba (2.0, 2.0, 0.0, 0.0) [pixel shader todo] @@ -68,7 +68,7 @@ float4 main(float4 pos : sv_position) : sv_target [test] todo(sm<6) draw quad -probe all rgba (2.0, 1.0, 0.0, 14.0) +probe (0, 0, 640, 480) rgba (2.0, 1.0, 0.0, 14.0) [pixel shader todo] @@ -85,4 +85,4 @@ float4 main(float4 pos : sv_position) : sv_target [test] todo(sm<6) draw quad -probe all rgba (45.0, 50.0, -14.0, -47.0) +probe (0, 0, 640, 480) rgba (45.0, 50.0, -14.0, -47.0) diff --git a/tests/hlsl/cast-64-bit.shader_test b/tests/hlsl/cast-64-bit.shader_test index f488570e..53ed6c4d 100644 --- a/tests/hlsl/cast-64-bit.shader_test +++ b/tests/hlsl/cast-64-bit.shader_test @@ -16,7 +16,7 @@ float4 main() : sv_target uniform 0 double2 -4.5 8.5 uniform 4 float4 -2.25 4.25 0.0 0.0 todo(sm<6) draw quad -probe all rgba (-4.5, 8.5, 2.0, 2.0) +probe (0, 0) rgba (-4.5, 8.5, 2.0, 2.0) [pixel shader todo] @@ -33,7 +33,7 @@ uint4 main() : sv_target [test] uniform 0 double2 -4.5 8.500003814697266 todo(sm<6) draw quad -probe all rgbaui (0, 0xc0120000, 0x80000000, 0x40210000) +probe (0, 0) rgbaui (0, 0xc0120000, 0x80000000, 0x40210000) [pixel shader todo] @@ -49,7 +49,7 @@ float4 main() : sv_target [test] uniform 0 uint4 0xc000000 0x40020000 0x80000000 0xc04be000 todo(sm<6) draw quad -probe all rgba (2.25, -55.75001526, 0.0, 0.0) 1 +probe (0, 0) rgba (2.25, -55.75001526, 0.0, 0.0) 1 [pixel shader todo] @@ -64,7 +64,7 @@ float4 main() : sv_target [test] uniform 0 uint4 0x80000000 0xc04be000 0 0 todo(sm<6) draw quad -probe all rgba (-55.75001526, 0.0, 0.0, 0.0) 1 +probe (0, 0) rgba (-55.75001526, 0.0, 0.0, 0.0) 1 [require] @@ -86,7 +86,7 @@ float4 main() : sv_target uniform 0 uint64_t2 0x500000001 0x100000002 uniform 4 uint4 10 4 0 0 draw quad -probe all rgba (1.0, 2.0, 2147483648.0, 1073741824.0) +probe (0, 0) rgba (1.0, 2.0, 2147483648.0, 1073741824.0) [pixel shader] @@ -104,4 +104,4 @@ float4 main() : sv_target uniform 0 int64_t2 -21474836481 0x100000002 uniform 4 int4 -20 8 0 0 draw quad -probe all rgba (-1.0, 2.0, 1073741824.0, 536870912.0) +probe (0, 0) rgba (-1.0, 2.0, 1073741824.0, 536870912.0) diff --git a/tests/hlsl/cast-broadcast.shader_test b/tests/hlsl/cast-broadcast.shader_test index c901673b..e57babe6 100644 --- a/tests/hlsl/cast-broadcast.shader_test +++ b/tests/hlsl/cast-broadcast.shader_test @@ -20,7 +20,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (84.0, 84.0, 84.0, 84.0) +probe (0, 0) rgba (84.0, 84.0, 84.0, 84.0) [pixel shader fail] @@ -95,4 +95,4 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (33.0, 33.0, 33.0, 33.0) +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 d60557a8..55f5227e 100644 --- a/tests/hlsl/cast-componentwise-compatible.shader_test +++ b/tests/hlsl/cast-componentwise-compatible.shader_test @@ -17,7 +17,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 1.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 1.0) [pixel shader] @@ -40,7 +40,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (5.0, 6.0, 7.0, 8.0) +probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) [pixel shader] @@ -56,7 +56,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader] @@ -87,7 +87,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (7.0, 7.0, 7.0, 7.0) +probe (0, 0) rgba (7.0, 7.0, 7.0, 7.0) [pixel shader] @@ -120,7 +120,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (3.0, 3.0, 3.0, 3.0) +probe (0, 0) rgba (3.0, 3.0, 3.0, 3.0) [pixel shader fail] @@ -160,7 +160,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (10.0, 20.0, 30.0, 30.0) +probe (0, 0) rgba (10.0, 20.0, 30.0, 30.0) [pixel shader] @@ -182,7 +182,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (10.0, 10.0, 11.4, 12.4) +probe (0, 0) rgba (10.0, 10.0, 11.4, 12.4) [pixel shader] @@ -198,7 +198,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (11.0, 12.0, 13.0, 14.0) +probe (0, 0) rgba (11.0, 12.0, 13.0, 14.0) [pixel shader] @@ -221,7 +221,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (21.0, 22.0, 23.0, 24.0) +probe (0, 0) rgba (21.0, 22.0, 23.0, 24.0) [pixel shader] @@ -237,7 +237,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (31.0, 32.0, 33.0, 33.0) +probe (0, 0) rgba (31.0, 32.0, 33.0, 33.0) [pixel shader] @@ -259,7 +259,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (41.0, 42.0, 43.0, 44.0) +probe (0, 0) rgba (41.0, 42.0, 43.0, 44.0) [pixel shader fail(sm<6)] @@ -298,7 +298,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (55.0, 56.0, 57.0, 58.0) +probe (0, 0) rgba (55.0, 56.0, 57.0, 58.0) [pixel shader fail(sm<6)] @@ -330,7 +330,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (61.0, 62.0, 63.0, 64.0) +probe (0, 0) rgba (61.0, 62.0, 63.0, 64.0) [pixel shader fail(sm<6)] @@ -356,7 +356,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (71.0, 72.0, 73.0, 74.0) +probe (0, 0) rgba (71.0, 72.0, 73.0, 74.0) [pixel shader fail(sm<6)] @@ -405,7 +405,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (81.0, 82.0, 83.0, 84.0) +probe (0, 0) rgba (81.0, 82.0, 83.0, 84.0) [pixel shader] @@ -421,7 +421,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (91.0, 92.0, 93.0, 0.0) +probe (0, 0) rgba (91.0, 92.0, 93.0, 0.0) [pixel shader] @@ -437,7 +437,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (11.0, 12.0, 13.0, 0.0) +probe (0, 0) rgba (11.0, 12.0, 13.0, 0.0) [pixel shader fail(sm<6)] @@ -478,7 +478,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (21.0, 22.0, 23.0, 24.0) +probe (0, 0) rgba (21.0, 22.0, 23.0, 24.0) [pixel shader] @@ -500,7 +500,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (31.0, 32.0, 33.0, 0.0) +probe (0, 0) rgba (31.0, 32.0, 33.0, 0.0) [pixel shader] @@ -522,7 +522,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (41.0, 42.0, 43.0, 0.0) +probe (0, 0) rgba (41.0, 42.0, 43.0, 0.0) [pixel shader] @@ -538,7 +538,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (51.0, 52.0, 53.0, 0.0) +probe (0, 0) rgba (51.0, 52.0, 53.0, 0.0) [pixel shader fail(sm<6)] @@ -565,7 +565,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (61.0, 62.0, 63.0, 0.0) +probe (0, 0) rgba (61.0, 62.0, 63.0, 0.0) [pixel shader] @@ -581,4 +581,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (71.0, 72.0, 73.0, 0.0) +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 dd1986c6..552f3433 100644 --- a/tests/hlsl/cast-componentwise-equal.shader_test +++ b/tests/hlsl/cast-componentwise-equal.shader_test @@ -51,7 +51,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 1.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 1.0) [pixel shader fail] @@ -90,7 +90,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (5.0, 6.0, 7.0, 8.0) +probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) [pixel shader fail(sm>=6)] @@ -121,7 +121,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (4.0, 4.0, 4.0, 4.0) +probe (0, 0) rgba (4.0, 4.0, 4.0, 4.0) [pixel shader fail(sm>=6)] @@ -155,7 +155,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (5.0, 5.0, 5.0, 5.0) +probe (0, 0) rgba (5.0, 5.0, 5.0, 5.0) [pixel shader fail(sm>=6)] @@ -200,7 +200,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (71.0, 73.0, 73.0, 74.0) +probe (0, 0) rgba (71.0, 73.0, 73.0, 74.0) [pixel shader fail] diff --git a/tests/hlsl/cast-to-float.shader_test b/tests/hlsl/cast-to-float.shader_test index e15ba733..2134aeb9 100644 --- a/tests/hlsl/cast-to-float.shader_test +++ b/tests/hlsl/cast-to-float.shader_test @@ -19,7 +19,7 @@ if(sm>=4) uniform 1 uint 3 if(sm>=4) uniform 2 int -2 if(sm>=4) uniform 3 float 0.5 todo(glsl) draw quad -probe all rgba (0.5, 0.5, 0.5, 0.5) +probe (0, 0) rgba (0.5, 0.5, 0.5, 0.5) [pixel shader] @@ -34,4 +34,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.5, 0.5, 0.5, 0.5) +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 4409273e..6beee63c 100644 --- a/tests/hlsl/cast-to-half.shader_test +++ b/tests/hlsl/cast-to-half.shader_test @@ -19,7 +19,7 @@ if(sm>=4) uniform 1 uint 3 if(sm>=4) uniform 2 int -2 if(sm>=4) uniform 3 float 0.5 todo(glsl) draw quad -probe all rgba (0.5, 0.5, 0.5, 0.5) +probe (0, 0) rgba (0.5, 0.5, 0.5, 0.5) [pixel shader] @@ -34,4 +34,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.5, 0.5, 0.5, 0.5) +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 7ebcd8ce..da4e6689 100644 --- a/tests/hlsl/cast-to-int.shader_test +++ b/tests/hlsl/cast-to-int.shader_test @@ -11,7 +11,7 @@ float4 main() : sv_target [test] uniform 0 float4 10.3 11.5 12.8 13.1 todo(glsl) draw quad -probe all rgba (10, 11, 12, 0) +probe (0, 0) rgba (10, 11, 12, 0) [pixel shader todo(sm<4)] @@ -41,7 +41,7 @@ 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 | glsl) draw quad -probe all rgba (0.5, 0.5, 0.5, 0.5) +probe (0, 0) rgba (0.5, 0.5, 0.5, 0.5) [pixel shader] @@ -62,5 +62,5 @@ float4 main() : sv_target [test] todo(glsl) draw quad -if(sm<4) todo probe all rgba (0.5, 4.2949673e+009, 0.5, 0.5) -if(sm>=4) probe all rgba (0.5, 0.5, 0.5, 0.5) +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 14f81b7f..c1bd5bc9 100644 --- a/tests/hlsl/cast-to-uint.shader_test +++ b/tests/hlsl/cast-to-uint.shader_test @@ -26,7 +26,7 @@ uniform 1 int 2 uniform 2 int -2 uniform 3 float -3.6 todo(glsl) draw quad -probe all rgba (0.5, 0.5, 0.5, 0.5) +probe (0, 0) rgba (0.5, 0.5, 0.5, 0.5) [pixel shader] @@ -47,4 +47,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.5, 0.5, 0.5, 0.5) +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 733322ce..c42c989d 100644 --- a/tests/hlsl/cbuffer.shader_test +++ b/tests/hlsl/cbuffer.shader_test @@ -14,7 +14,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader fail(sm>=6)] // Annotations @@ -62,7 +62,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader fail(sm>=6)] // 'single' modifier is usable when there is a variable with the same name @@ -84,7 +84,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader] typedef float4 single; @@ -98,7 +98,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader fail] typedef float4 single; @@ -151,7 +151,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 todo(glsl) draw quad -probe all rgba (0.0, 2.0, 4.0, 8.0) +probe (0, 0) rgba (0.0, 2.0, 4.0, 8.0) [pixel shader] @@ -172,7 +172,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 todo(glsl) draw quad -probe all rgba (0.0, 4.0, 8.0, 9.0) +probe (0, 0) rgba (0.0, 4.0, 8.0, 9.0) [pixel shader] @@ -198,7 +198,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 todo(glsl) draw quad -probe all rgba (0.0, 4.0, 5.0, 6.0) +probe (0, 0) rgba (0.0, 4.0, 5.0, 6.0) [pixel shader fail(sm<6)] @@ -221,7 +221,7 @@ uniform 4 float4 2.0 0.0 0.0 0.0 uniform 8 float4 3.0 0.0 0.0 0.0 uniform 12 float4 4.0 0.0 0.0 0.0 todo(sm<6) draw quad -probe all rgba (1.0, 3.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 3.0, 3.0, 4.0) [pixel shader] @@ -255,7 +255,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 todo(glsl) draw quad -probe all rgba (509, 610, 711, 812) +probe (0, 0) rgba (509, 610, 711, 812) [pixel shader] @@ -283,7 +283,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 todo(glsl) draw quad -probe all rgba (12468.0, 13509.0, 14010.0, 15011.0) +probe (0, 0) rgba (12468.0, 13509.0, 14010.0, 15011.0) [pixel shader] @@ -300,7 +300,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 todo(glsl) draw quad -probe all rgba (2.0, 3.0, 2.0, 3.0) +probe (0, 0) rgba (2.0, 3.0, 2.0, 3.0) [pixel shader fail] @@ -405,7 +405,7 @@ uniform 0 float 1.0 uniform 1 float 2.0 uniform 4 float4 5.0 6.0 7.0 8.0 todo(glsl) draw quad -probe all rgba (512.0, 612.0, 712.0, 812.0) +probe (0, 0) rgba (512.0, 612.0, 712.0, 812.0) [pixel shader fail(sm<6)] @@ -436,7 +436,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 todo(glsl) draw quad -probe all rgba (3.0, 4.0, 3.0, 4.0) +probe (0, 0) rgba (3.0, 4.0, 3.0, 4.0) [pixel shader fail] @@ -578,7 +578,7 @@ 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 todo(glsl) draw quad -probe all rgba (1.0, 2.0, 0.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 0.0, 4.0) % packoffset() cannot be used to specify other types of registers @@ -628,7 +628,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) % Samplers cannot have packoffset(), unless register() is also specified, or they are not used. @@ -776,7 +776,7 @@ float4 main() : sv_target uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 0.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader fail(sm<6)] cbuffer buffer @@ -822,7 +822,7 @@ float4 main() : sv_target uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 0.1 0.2 0.3 0.4 todo(glsl) draw quad -probe all rgba (1.1, 2.2, 3.3, 4.4) +probe (0, 0) rgba (1.1, 2.2, 3.3, 4.4) [require] @@ -859,7 +859,7 @@ 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 todo(glsl) draw quad -probe all rgba (124.0, 135.0, 146.0, 150.5) +probe (0, 0) rgba (124.0, 135.0, 146.0, 150.5) [require] shader model >= 5.1 @@ -904,7 +904,7 @@ float4 main() : sv_target [test] todo draw quad -probe all rgba (1.1, 1.1, 1.1, 1.1) +probe (0, 0) rgba (1.1, 1.1, 1.1, 1.1) [pixel shader fail] struct s diff --git a/tests/hlsl/ceil.shader_test b/tests/hlsl/ceil.shader_test index 9917f044..c4e34dc2 100644 --- a/tests/hlsl/ceil.shader_test +++ b/tests/hlsl/ceil.shader_test @@ -6,7 +6,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.0, 7.0, 8.0, 4.0) 4 +probe (0, 0) rgba (0.0, 7.0, 8.0, 4.0) 4 [pixel shader] uniform float4 u; @@ -19,7 +19,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 todo(glsl) draw quad -probe all rgba (0.0, 7.0, 8.0, 4.0) 4 +probe (0, 0) rgba (0.0, 7.0, 8.0, 4.0) 4 [pixel shader] uniform float4 u; @@ -35,7 +35,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 todo(glsl) draw quad -probe all rgba (7.0, 8.0, 0.0, 4.0) 4 +probe (0, 0) rgba (7.0, 8.0, 0.0, 4.0) 4 [pixel shader] uniform int4 u; @@ -52,4 +52,4 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 -1 6 7 3 if(sm>=4) uniform 0 int4 -1 6 7 3 todo(glsl) draw quad -probe all rgba (6.0, 7.0, -1.0, 3.0) 4 +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 0a22613b..32cd853e 100644 --- a/tests/hlsl/cf-cond-types.shader_test +++ b/tests/hlsl/cf-cond-types.shader_test @@ -125,7 +125,7 @@ float4 main() : sv_target [test] uniform 0 float4 -2.0 0.0 0.0 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +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 | glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +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 5f4c0895..0def959d 100644 --- a/tests/hlsl/clamp.shader_test +++ b/tests/hlsl/clamp.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.3 -0.1 0.7 0.0 todo(glsl) draw quad -probe all rgba (-0.1, 0.7, -0.3, 0.3) +probe (0, 0) rgba (-0.1, 0.7, -0.3, 0.3) [pixel shader] @@ -25,7 +25,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (5.5, 5.0, 4.2, 5.2) +probe (0, 0) rgba (5.5, 5.0, 4.2, 5.2) [pixel shader fail] diff --git a/tests/hlsl/clip-distance.shader_test b/tests/hlsl/clip-distance.shader_test index ffb36173..ec5cec23 100644 --- a/tests/hlsl/clip-distance.shader_test +++ b/tests/hlsl/clip-distance.shader_test @@ -49,7 +49,7 @@ float4 main(const in float4 position : SV_Position) : SV_Target [test] clear rtv 0 1.0 1.0 1.0 1.0 todo(sm<6) draw triangle strip 4 -probe all rgba (0.0, 1.0, 0.0, 1.0) +probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) [vb 1] 0.0 @@ -60,7 +60,7 @@ probe all rgba (0.0, 1.0, 0.0, 1.0) [test] clear rtv 0 1.0 1.0 1.0 1.0 todo(sm<6) draw triangle strip 4 -probe all rgba (0.0, 1.0, 0.0, 1.0) +probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) [vb 1] -1.0 @@ -71,7 +71,7 @@ probe all rgba (0.0, 1.0, 0.0, 1.0) [test] clear rtv 0 1.0 1.0 1.0 1.0 todo(sm<6) draw triangle strip 4 -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0, 640, 480) rgba (1.0, 1.0, 1.0, 1.0) [vb 1] 1.0 diff --git a/tests/hlsl/clip.shader_test b/tests/hlsl/clip.shader_test index 4a8d223c..bb7597cf 100644 --- a/tests/hlsl/clip.shader_test +++ b/tests/hlsl/clip.shader_test @@ -10,19 +10,19 @@ float4 main() : sv_target [test] uniform 0 float4 1 2 3 4 todo(glsl) draw quad -probe all rgba (1, 2, 3, 4) +probe (0, 0) rgba (1, 2, 3, 4) uniform 0 float4 9 8 7 6 todo(glsl) draw quad -probe all rgba (9, 8, 7, 6) +probe (0, 0) rgba (9, 8, 7, 6) uniform 0 float4 -1 8 7 6 todo(glsl) draw quad -probe all rgba (9, 8, 7, 6) +probe (0, 0) rgba (9, 8, 7, 6) uniform 0 float4 9 0 7 6 todo(glsl) draw quad -probe all rgba (9, 0, 7, 6) +probe (0, 0) rgba (9, 0, 7, 6) uniform 0 float4 3 -8 3 0 todo(glsl) draw quad -probe all rgba (9, 0, 7, 6) +probe (0, 0) rgba (9, 0, 7, 6) uniform 0 float4 3 3 3 -1 todo(glsl) draw quad -probe all rgba (9, 0, 7, 6) +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 7bfe9d21..8972b541 100644 --- a/tests/hlsl/combined-samplers.shader_test +++ b/tests/hlsl/combined-samplers.shader_test @@ -46,7 +46,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0, 0, 0, 1) +probe (0, 0) rgba (0, 0, 0, 1) % Textures for new separated samplers are allocated before regular textures. @@ -61,7 +61,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (10, 10, 10, 11) +probe (0, 0) rgba (10, 10, 10, 11) [pixel shader todo(sm<4)] @@ -75,7 +75,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (21, 21, 21, 11) +probe (0, 0) rgba (21, 21, 21, 11) [pixel shader] @@ -91,7 +91,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (12, 12, 12, 111) +probe (0, 0) rgba (12, 12, 12, 111) [pixel shader] @@ -106,7 +106,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (104, 104, 104, 111) +probe (0, 0) rgba (104, 104, 104, 111) % Sampler arrays with components that have different usage dimensions are only forbidden in SM4 upwards. @@ -130,7 +130,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1, 1, 1, 11) +probe (0, 0) rgba (1, 1, 1, 11) [require] @@ -153,4 +153,4 @@ float4 main() : sv_target [test] todo draw quad -todo probe all rgba (10, 10, 10, 11) +todo probe (0,0) rgba (10, 10, 10, 11) diff --git a/tests/hlsl/comma.shader_test b/tests/hlsl/comma.shader_test index b4796c65..71d0f302 100644 --- a/tests/hlsl/comma.shader_test +++ b/tests/hlsl/comma.shader_test @@ -7,4 +7,4 @@ float4 main(): sv_target [test] todo(glsl) draw quad -probe all rgba (0.6, 0.7, 0.8, 0.9) +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 806d1747..2da2add7 100644 --- a/tests/hlsl/conditional.shader_test +++ b/tests/hlsl/conditional.shader_test @@ -12,10 +12,10 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (0.9, 0.8, 0.7, 0.6) +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 | glsl) draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) [pixel shader todo(sm<4)] uniform float4 u; @@ -44,7 +44,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (0.9, 0.8, 0.7, 0.6) +probe (0, 0) rgba (0.9, 0.8, 0.7, 0.6) [pixel shader fail(sm<6)] float4 u; @@ -88,10 +88,10 @@ float4 main() : sv_target [test] uniform 0 float -2 todo(glsl) draw quad -probe all rgba (1, 2, 3, 4) +probe (0, 0) rgba (1, 2, 3, 4) uniform 0 float 10 todo(glsl) draw quad -probe all rgba (10, 20, 30, 40) +probe (0, 0) rgba (10, 20, 30, 40) [pixel shader] @@ -109,7 +109,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.9, 0.8, 0.7, 0.6) +probe (0, 0) rgba (0.9, 0.8, 0.7, 0.6) [pixel shader] float4 main() : sv_target @@ -126,7 +126,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (9.0, 10.0, 11.0, 12.0) +probe (0, 0) rgba (9.0, 10.0, 11.0, 12.0) [pixel shader] @@ -146,19 +146,19 @@ if(sm<4) uniform 4 float 9 if(sm>=4) uniform 0 int 8 if(sm>=4) uniform 1 int 9 todo(glsl) draw quad -probe all rgba (-1.0, -1.0, -1.0, -1.0) +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 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +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 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [pixel shader] @@ -178,19 +178,19 @@ if(sm<4) uniform 4 float 9 if(sm>=4) uniform 0 int 8 if(sm>=4) uniform 1 int 9 todo(glsl) draw quad -probe all rgba (-1.0, -1.0, -1.0, -1.0) +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 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +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 todo(glsl) draw quad -probe all rgba (-1.0, -1.0, -1.0, -1.0) +probe (0, 0) rgba (-1.0, -1.0, -1.0, -1.0) [pixel shader] @@ -210,13 +210,13 @@ if(sm<4) uniform 4 float -2 if(sm>=4) uniform 0 int -3 if(sm>=4) uniform 1 int -2 todo(glsl) draw quad -probe all rgba (-1.0, -1.0, -1.0, -1.0) +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 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) % Test "if" conditionals, using resource loads to ensure we aren't removing these instruction with optimizations. @@ -244,10 +244,10 @@ float4 main() : sv_target [test] uniform 0 float -2 todo(sm<4 | glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 4.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 4.0) uniform 0 float 4 todo(sm<4 | glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader todo(sm<4)] @@ -268,10 +268,10 @@ float4 main() : sv_target [test] uniform 0 float 2 todo(sm<4 | glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 4.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 4.0) uniform 0 float 1 todo(sm<4 | glsl) draw quad -probe all rgba (1.0, 0.0, 0.0, 4.0) +probe (0, 0) rgba (1.0, 0.0, 0.0, 4.0) uniform 0 float 0 todo(sm<4 | glsl) draw quad -probe all rgba (1.0, 1.0, 0.0, 4.0) +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 968a288c..6b5899f0 100644 --- a/tests/hlsl/const.shader_test +++ b/tests/hlsl/const.shader_test @@ -11,7 +11,7 @@ float4 main() : sv_target uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 0.1 0.2 0.3 0.4 todo(glsl) draw quad -probe all rgba (1.1, 2.2, 3.3, 4.4) +probe (0, 0) rgba (1.1, 2.2, 3.3, 4.4) [pixel shader fail(sm<6)] float4 main() : sv_target diff --git a/tests/hlsl/coverage.shader_test b/tests/hlsl/coverage.shader_test index e7cf30ad..d75b244f 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] todo(sm<6) draw quad -probe all rgba (0.5, 0.5, 0.5, 0.5) +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(sm<6) draw quad -probe all rgba (0.25, 0.25, 0.25, 0.25) +probe (0, 0) rgba (0.25, 0.25, 0.25, 0.25) [require] @@ -45,16 +45,16 @@ float4 main(float4 position : SV_Position, uint coverage : SV_Coverage) : SV_Tar sample mask 0x01 clear rtv 0 0.0 0.0 0.0 0.0 todo(sm<6) draw quad -probe all rgba (0.0, 0.25, 0.0, 0.25) -probe uav 1 all rui (0x01) +probe (0, 0) rgba (0.0, 0.25, 0.0, 0.25) +probe uav 1 (0, 0, 4, 4) rui (0x01) sample mask 0x03 todo(sm<6) draw quad -probe all rgba (0.0, 0.5, 0.0, 0.5) -probe uav 1 all rui (0x03) +probe (0, 0) rgba (0.0, 0.5, 0.0, 0.5) +probe uav 1 (0, 0, 4, 4) rui (0x03) sample mask 0x07 todo(sm<6) draw quad -probe all rgba (0.0, 0.75, 0.0, 0.75) -probe uav 1 all rui (0x07) +probe (0, 0) rgba (0.0, 0.75, 0.0, 0.75) +probe uav 1 (0, 0, 4, 4) rui (0x07) [uav 1] format r32 uint @@ -68,9 +68,9 @@ size (2d, 4, 4) clear rtv 0 0.0 0.0 0.0 0.0 sample mask 0x09 todo(sm<6) draw quad -probe all rgba (0.0, 0.5, 0.0, 0.5) -probe uav 1 all rui (0x09) +probe (0, 0) rgba (0.0, 0.5, 0.0, 0.5) +probe uav 1 (0, 0, 4, 4) rui (0x09) sample mask 0x0f todo(sm<6) draw quad -probe all rgba (0.0, 1.0, 0.0, 1.0) -probe uav 1 all rui (0x0f) +probe (0, 0) rgba (0.0, 1.0, 0.0, 1.0) +probe uav 1 (0, 0, 4, 4) rui (0x0f) diff --git a/tests/hlsl/cross.shader_test b/tests/hlsl/cross.shader_test index 2cd8ad83..83314d43 100644 --- a/tests/hlsl/cross.shader_test +++ b/tests/hlsl/cross.shader_test @@ -13,7 +13,7 @@ float4 main() : sv_target uniform 0 float4 1 -2 3 4 uniform 4 float4 10 100 1000 10000 todo(glsl) draw quad -probe all rgba (-2300, -970, 120, 0) +probe (0, 0) rgba (-2300, -970, 120, 0) @@ -30,4 +30,4 @@ float4 main() : sv_target [test] uniform 0 float4 1 -2 3 4 todo(glsl) draw quad -probe all rgba (-20, 8, 12, 3.5) +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 87c9de35..4fa95663 100644 --- a/tests/hlsl/d3dcolor-to-ubyte4.shader_test +++ b/tests/hlsl/d3dcolor-to-ubyte4.shader_test @@ -12,7 +12,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 todo(glsl) draw quad -probe all rgba (1912.0, 1657.0, -127.0, 867.0) 1 +probe (0, 0) rgba (1912.0, 1657.0, -127.0, 867.0) 1 [pixel shader] uniform float4 u; @@ -25,4 +25,4 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 todo(glsl) draw quad -probe all rgba (-127.0, -127.0, -127.0, -127.0) 1 +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 47b8391d..0a057cf5 100644 --- a/tests/hlsl/ddxddy.shader_test +++ b/tests/hlsl/ddxddy.shader_test @@ -9,7 +9,7 @@ float4 main(float4 pos : sv_position) : sv_target [test] todo(sm<4 | glsl) draw quad -probe all rgba (1.0, 1.0, 0.0, 0.0) +probe (0, 0, 640, 480) rgba (1.0, 1.0, 0.0, 0.0) [pixel shader] diff --git a/tests/hlsl/default-values.shader_test b/tests/hlsl/default-values.shader_test index 728fa5a6..4dbb2a8c 100644 --- a/tests/hlsl/default-values.shader_test +++ b/tests/hlsl/default-values.shader_test @@ -18,7 +18,7 @@ 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 todo(glsl) draw quad -probe all rgba (10, 20, 50, 60) +probe (0, 0) rgba (10, 20, 50, 60) [pixel shader fail(sm<6)] @@ -58,7 +58,7 @@ float4 main() : sv_target { return b; } [test] uniform 0 float4 10.0 20.0 30.0 40.0 todo(glsl) draw quad -probe all rgba (10, 20, 30, 40) +probe (0, 0) rgba (10, 20, 30, 40) [pixel shader] @@ -72,7 +72,7 @@ float4 main() : sv_target [test] uniform 0 float4 10.0 20.0 30.0 40.0 todo(glsl) draw quad -probe all rgba (20, 40, 60, 80) +probe (0, 0) rgba (20, 40, 60, 80) [pixel shader] @@ -89,7 +89,7 @@ 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 todo(glsl) draw quad -probe all rgba (100, 120, 140, 160) +probe (0, 0) rgba (100, 120, 140, 160) [pixel shader] @@ -112,7 +112,7 @@ 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 todo(glsl) draw quad -probe all rgba (70, 80, 90, 100) +probe (0, 0) rgba (70, 80, 90, 100) [pixel shader] @@ -135,7 +135,7 @@ 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 todo(glsl) draw quad -probe all rgba (10, 20, 50, 60) +probe (0, 0) rgba (10, 20, 50, 60) [pixel shader fail(sm<6)] @@ -171,7 +171,7 @@ float4 main() : sv_target { return b; } [test] uniform 0 float4 10 20 30 40 todo(glsl) draw quad -probe all rgba (10, 20, 30, 40) +probe (0, 0) rgba (10, 20, 30, 40) [pixel shader] @@ -191,7 +191,7 @@ 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 todo(glsl) draw quad -probe all rgba (60, 100, 80, 80) +probe (0, 0) rgba (60, 100, 80, 80) [pixel shader] @@ -217,7 +217,7 @@ 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 todo(glsl) draw quad -probe all rgba (70, 80, 90, 100) +probe (0, 0) rgba (70, 80, 90, 100) % In SM4, the values in the default values initializer of matrices end up in different components diff --git a/tests/hlsl/depth-out.shader_test b/tests/hlsl/depth-out.shader_test index 282ec5a8..998ea2e7 100644 --- a/tests/hlsl/depth-out.shader_test +++ b/tests/hlsl/depth-out.shader_test @@ -17,22 +17,22 @@ uniform 0 float 0.0 clear dsv 1.0 depth less todo(glsl) draw quad -probe dsv all r (0.0) +probe dsv (0,0) r (0.0) uniform 0 float 0.75 clear dsv 1.0 todo(glsl) draw quad -probe dsv all r (0.75) +probe dsv (0,0) r (0.75) clear dsv 0.5 depth greater todo(glsl) draw quad -probe dsv all r (0.75) +probe dsv (0,0) r (0.75) depth less clear dsv 0.5 todo(glsl) draw quad -probe dsv all r (0.5) +probe dsv (0,0) r (0.5) [require] @@ -66,15 +66,15 @@ clear rtv 0 1.0 1.0 1.0 1.0 clear dsv 0.5 depth greater equal todo(sm<6) draw quad -probe all rgba (0.0, 1.0, 0.0, 1.0) -probe dsv all r (0.75) +probe (0, 0) rgba (0.0, 1.0, 0.0, 1.0) +probe dsv (0,0) r (0.75) uniform 0 float4 0.75 0.375 0.0 0.0 clear rtv 0 1.0 1.0 1.0 1.0 clear dsv 0.5 todo(sm<6) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) -probe dsv all r (0.5) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) +probe dsv (0,0) r (0.5) [pixel shader todo] @@ -92,19 +92,19 @@ clear rtv 0 1.0 1.0 1.0 1.0 clear dsv 0.5 depth greater equal todo(sm<6) draw quad -probe all rgba (0.0, 1.0, 0.0, 1.0) -probe dsv all r (0.75) +probe (0, 0) rgba (0.0, 1.0, 0.0, 1.0) +probe dsv (0,0) r (0.75) uniform 0 float4 0.375 0.625 0.0 0.0 clear rtv 0 1.0 1.0 1.0 1.0 clear dsv 0.5 todo(sm<6) draw quad -probe all rgba (0.0, 1.0, 0.0, 1.0) -probe dsv all r (0.625) +probe (0, 0) rgba (0.0, 1.0, 0.0, 1.0) +probe dsv (0,0) r (0.625) uniform 0 float4 0.375 0.375 0.0 0.0 clear rtv 0 1.0 1.0 1.0 1.0 clear dsv 0.5 todo(sm<6) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) -probe dsv all r (0.5) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) +probe dsv (0,0) r (0.5) diff --git a/tests/hlsl/determinant.shader_test b/tests/hlsl/determinant.shader_test index 5df5526c..33aa1dc1 100644 --- a/tests/hlsl/determinant.shader_test +++ b/tests/hlsl/determinant.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [test] uniform 0 float4 9.0 2.0 3.0 4.0 todo(glsl) draw quad -probe all rgba (9.0, 9.0, 9.0, 9.0) +probe (0, 0) rgba (9.0, 9.0, 9.0, 9.0) [pixel shader] float1x1 m; @@ -22,7 +22,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [pixel shader] float2x2 m; @@ -36,7 +36,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 todo(glsl) draw quad -probe all rgba (-4.0, -4.0, -4.0, -4.0) +probe (0, 0) rgba (-4.0, -4.0, -4.0, -4.0) [pixel shader] float2x1 m; @@ -50,7 +50,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 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [pixel shader] float3x3 m; @@ -65,7 +65,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 todo(glsl) draw quad -probe all rgba (192.0, 192.0, 192.0, 192.0) +probe (0, 0) rgba (192.0, 192.0, 192.0, 192.0) [pixel shader] float4x4 m; @@ -81,7 +81,7 @@ 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 todo(glsl) draw quad -probe all rgba (-672.0, -672.0, -672.0, -672.0) +probe (0, 0) rgba (-672.0, -672.0, -672.0, -672.0) [pixel shader] float3x4 m; @@ -97,7 +97,7 @@ 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 todo(glsl) draw quad -probe all rgba (192.0, 192.0, 192.0, 192.0) +probe (0, 0) rgba (192.0, 192.0, 192.0, 192.0) [pixel shader fail] float1 v; diff --git a/tests/hlsl/discard.shader_test b/tests/hlsl/discard.shader_test index 152a3a0d..92dfb233 100644 --- a/tests/hlsl/discard.shader_test +++ b/tests/hlsl/discard.shader_test @@ -11,10 +11,10 @@ float4 main() : sv_target [test] uniform 0 float4 1 2 3 4 todo(sm<4 | glsl) draw quad -probe all rgba (1, 2, 3, 4) +probe (0, 0) rgba (1, 2, 3, 4) uniform 0 float4 9 8 7 6 todo(sm<4 | glsl) draw quad -probe all rgba (1, 2, 3, 4) +probe (0, 0) rgba (1, 2, 3, 4) [require] shader model >= 3.0 @@ -68,11 +68,11 @@ float4 main(float4 pos : sv_position) : sv_target [test] uniform 0 float4 1 2 3 4 todo(glsl) draw quad -probe all rgba (1, 2, 3, 4) +probe (0, 0) rgba (1, 2, 3, 4) probe uav 1 (0, 0) r (1.0) probe uav 1 (1, 0) r (1.0) uniform 0 float4 9 8 7 6 todo(glsl) draw quad -probe all rgba (1, 2, 3, 4) +probe (0, 0) rgba (1, 2, 3, 4) probe uav 1 (0, 0) r (2.0) probe uav 1 (1, 0) r (1.0) diff --git a/tests/hlsl/distance.shader_test b/tests/hlsl/distance.shader_test index a9feb40d..a0b6c9bd 100644 --- a/tests/hlsl/distance.shader_test +++ b/tests/hlsl/distance.shader_test @@ -11,7 +11,7 @@ float4 main() : sv_target uniform 0 float4 -2.0 3.0 4.0 0.1 uniform 4 float4 2.0 -1.0 4.0 5.0 todo(glsl) draw quad -probe all rgba (7.483983, 7.483983, 7.483983, 7.483983) 1 +probe (0, 0) rgba (7.483983, 7.483983, 7.483983, 7.483983) 1 [pixel shader] uniform int4 x; diff --git a/tests/hlsl/dot.shader_test b/tests/hlsl/dot.shader_test index 7698c08e..327e968b 100644 --- a/tests/hlsl/dot.shader_test +++ b/tests/hlsl/dot.shader_test @@ -11,7 +11,7 @@ float4 main() : SV_TARGET uniform 0 float4 2.0 3.0 4.0 5.0 uniform 4 float4 10.0 11.0 12.0 13.0 todo(glsl) draw quad -probe all rgba (166.0, 166.0, 166.0, 166.0) +probe (0, 0) rgba (166.0, 166.0, 166.0, 166.0) [pixel shader] uniform float2 x; @@ -26,7 +26,7 @@ float4 main() : SV_TARGET 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 | glsl) draw quad -probe all rgba (53.0, 53.0, 53.0, 53.0) +probe (0, 0) rgba (53.0, 53.0, 53.0, 53.0) [pixel shader] uniform float x; @@ -41,7 +41,7 @@ float4 main() : SV_TARGET uniform 0 float4 2.0 0.0 0.0 0.0 uniform 4 float4 10.0 11.0 12.0 13.0 todo(glsl) draw quad -probe all rgba (92.0, 92.0, 92.0, 92.0) +probe (0, 0) rgba (92.0, 92.0, 92.0, 92.0) [pixel shader] uniform float4 x; @@ -56,7 +56,7 @@ float4 main() : SV_TARGET uniform 0 float4 10.0 11.0 12.0 13.0 uniform 4 float4 2.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (92.0, 92.0, 92.0, 92.0) +probe (0, 0) rgba (92.0, 92.0, 92.0, 92.0) [pixel shader] uniform float x; @@ -72,7 +72,7 @@ float4 main() : SV_TARGET uniform 0 float4 2.0 3.0 0.0 0.0 uniform 4 float4 3.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (6.0, 6.0, 6.0, 6.0) +probe (0, 0) rgba (6.0, 6.0, 6.0, 6.0) [pixel shader] static const float4 x = float4(2.0, 3.0, 4.0, 5.0); @@ -85,7 +85,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (110.0, 110.0, 110.0, 110.0) +probe (0, 0) rgba (110.0, 110.0, 110.0, 110.0) [pixel shader fail] uniform float1x1 x; diff --git a/tests/hlsl/duplicate-modifiers.shader_test b/tests/hlsl/duplicate-modifiers.shader_test index a62c7548..6da1a649 100644 --- a/tests/hlsl/duplicate-modifiers.shader_test +++ b/tests/hlsl/duplicate-modifiers.shader_test @@ -8,5 +8,5 @@ float4 main() : sv_target [test] todo(glsl) draw quad -if(sm<6) probe all rgba (0.1, 0.2, 0.3, 0.4) -if(sm>=6) probe all rgba (0.1, 0.3, 0.2, 0.4) +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/exp.shader_test b/tests/hlsl/exp.shader_test index 38e9d4cb..e7a5ae4f 100644 --- a/tests/hlsl/exp.shader_test +++ b/tests/hlsl/exp.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [test] uniform 0 float4 -1.0 0.0 1.0 2.0 todo(glsl) draw quad -probe all rgba (0.5, 1.0, 2.0, 4.0) 2 +probe (0, 0) rgba (0.5, 1.0, 2.0, 4.0) 2 [pixel shader] uniform float4 f; @@ -22,4 +22,4 @@ float4 main() : sv_target [test] uniform 0 float4 -1.0 0.0 1.0 2.0 todo(glsl) draw quad -probe all rgba (0.36787948, 1.0, 2.7182815, 7.38905573) 2 +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 4a850860..1f1826f2 100644 --- a/tests/hlsl/expr-indexing.shader_test +++ b/tests/hlsl/expr-indexing.shader_test @@ -10,7 +10,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 todo(glsl) draw quad -probe all rgba (8.0, 8.0, 8.0, 8.0) +probe (0, 0) rgba (8.0, 8.0, 8.0, 8.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 float 2 todo(glsl) draw quad -probe all rgba (10.0, 10.0, 10.0, 10.0) +probe (0, 0) rgba (10.0, 10.0, 10.0, 10.0) [pixel shader] @@ -41,7 +41,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 todo(glsl) draw quad -probe all rgba (3.0, 3.0, 3.0, 3.0) +probe (0, 0) rgba (3.0, 3.0, 3.0, 3.0) [pixel shader] @@ -57,10 +57,10 @@ float4 main() : sv_target uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float 0 todo(glsl) draw quad -probe all rgba (4.0, 4.0, 4.0, 4.0) +probe (0, 0) rgba (4.0, 4.0, 4.0, 4.0) uniform 4 float 2 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [pixel shader] @@ -79,7 +79,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 todo(glsl) draw quad -probe all rgba (4.0, 4.0, 4.0, 4.0) +probe (0, 0) rgba (4.0, 4.0, 4.0, 4.0) [pixel shader] @@ -100,4 +100,4 @@ float4 main() : sv_target uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float 1 todo(glsl) draw quad -probe all rgba (2.0, 2.0, 2.0, 2.0) +probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) diff --git a/tests/hlsl/float-comparison.shader_test b/tests/hlsl/float-comparison.shader_test index 56ce46f3..6cfa592f 100644 --- a/tests/hlsl/float-comparison.shader_test +++ b/tests/hlsl/float-comparison.shader_test @@ -10,7 +10,7 @@ float4 main() : sv_target [test] uniform 0 float 0.0 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] @@ -57,11 +57,11 @@ float4 main() : sv_target uniform 0 float4 0.0 1.5 1.5 0.0 todo(glsl) draw quad % SM1-3 apparently treats '0/0' as zero. -if(sm<4) todo probe all rgba (1010101.0, 11001100.0, 1101001.0, 11.0) +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. -if(sm>=4 & sm<6) todo probe all rgba (1010101.0, 0.0, 1101001.0, 1.0) +if(sm>=4 & sm<6) todo probe (0,0) rgba (1010101.0, 0.0, 1101001.0, 1.0) % SM6 emits the correct ordered/unordered instructions, so comparisons are false for NaN, and are made true with 'not'. -if(sm>=6) probe all rgba (1010101.0, 11110000.0, 1101001.0, 1.0) +if(sm>=6) probe (0,0) rgba (1010101.0, 11110000.0, 1101001.0, 1.0) % In shader model 2.0, native compares two numbers for equality checking if (a - b)*(a - b) is @@ -89,7 +89,7 @@ float4 main() : sv_target uniform 0 float4 1e-37 1e-37 1e+38 1e+38 uniform 4 float4 0 -1e-37 1e+38 -1e+38 draw quad -probe all rgba (1.0, 1.0, 1.0, 0.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 0.0) [require] @@ -108,7 +108,7 @@ float4 main() : sv_target uniform 0 float4 1e-37 1e-37 1e+38 1e+38 uniform 4 float4 0 -1e-37 1e+38 -1e+38 draw quad -probe all rgba (0.0, 0.0, 1.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 1.0, 0.0) [require] @@ -126,7 +126,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.5 0.0 1.0 -1.0 draw quad -probe all rgba (1.0, 1.0, 0.0, 0.0) +probe (0, 0) rgba (1.0, 1.0, 0.0, 0.0) [pixel shader] @@ -140,4 +140,4 @@ float4 main() : sv_target [test] uniform 0 float4 1.5 0.0 1.0 -1.0 draw quad -probe all rgba (0.0, 0.0, 1.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 1.0, 0.0) diff --git a/tests/hlsl/floor.shader_test b/tests/hlsl/floor.shader_test index dfbbd37a..3ed656aa 100644 --- a/tests/hlsl/floor.shader_test +++ b/tests/hlsl/floor.shader_test @@ -6,7 +6,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (-1.0, 6.0, 7.0, 3.0) 4 +probe (0, 0) rgba (-1.0, 6.0, 7.0, 3.0) 4 [pixel shader] uniform float4 u; @@ -19,7 +19,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 todo(glsl) draw quad -probe all rgba (-1.0, 6.0, 7.0, 3.0) 4 +probe (0, 0) rgba (-1.0, 6.0, 7.0, 3.0) 4 [pixel shader] uniform float4 u; @@ -35,7 +35,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 todo(glsl) draw quad -probe all rgba (6.0, 7.0, -1.0, 3.0) 4 +probe (0, 0) rgba (6.0, 7.0, -1.0, 3.0) 4 [pixel shader] @@ -53,4 +53,4 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 -1 6 7 3 if(sm>=4) uniform 0 int4 -1 6 7 3 todo(glsl) draw quad -probe all rgba (6.0, 7.0, -1.0, 3.0) 4 +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 40dc66e8..8b55eef1 100644 --- a/tests/hlsl/fmod.shader_test +++ b/tests/hlsl/fmod.shader_test @@ -9,10 +9,10 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 0.0 0.0 todo(glsl) draw quad -probe all rgba (-0.5, 0.0, 0.0, 0.0) 4 +probe (0, 0) rgba (-0.5, 0.0, 0.0, 0.0) 4 uniform 0 float4 1.1 0.3 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.2, 0.0, 0.0, 0.0) 4 +probe (0, 0) rgba (0.2, 0.0, 0.0, 0.0) 4 [pixel shader] uniform float4 u; @@ -25,7 +25,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 2.0 0.0 todo(glsl) draw quad -probe all rgba (-0.5, 0.5, 0.0, 0.0) 4 +probe (0, 0) rgba (-0.5, 0.5, 0.0, 0.0) 4 uniform 0 float4 1.1 0.3 3.0 0.0 todo(glsl) draw quad -probe all rgba (1.1, 0.3, 0.0, 0.0) 4 +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 7ce6c821..e43a21cf 100644 --- a/tests/hlsl/for.shader_test +++ b/tests/hlsl/for.shader_test @@ -77,7 +77,7 @@ float4 main(float tex : texcoord) : sv_target [test] todo(sm<4 | glsl) draw quad -probe all rgba (10.0, 45.0, 0.0, 0.0) +probe (0, 0) rgba (10.0, 45.0, 0.0, 0.0) [pixel shader fail(sm<6)] float4 main(float tex : texcoord) : sv_target diff --git a/tests/hlsl/frac.shader_test b/tests/hlsl/frac.shader_test index 5e7d480c..88cade1d 100644 --- a/tests/hlsl/frac.shader_test +++ b/tests/hlsl/frac.shader_test @@ -9,4 +9,4 @@ float4 main() : sv_target [test] uniform 0 float4 -1.1 1.6 1.3 0.5 todo(glsl) draw quad -probe all rgba (0.9, 0.6, 0.3, 0.5) 2 +probe (0, 0) rgba (0.9, 0.6, 0.3, 0.5) 2 diff --git a/tests/hlsl/function-cast.shader_test b/tests/hlsl/function-cast.shader_test index f049b79d..f955695a 100644 --- a/tests/hlsl/function-cast.shader_test +++ b/tests/hlsl/function-cast.shader_test @@ -19,7 +19,7 @@ float4 main() : sv_target [test] uniform 0 float4 -1.9 -1.0 2.9 4.0 todo(sm<6) draw quad -probe all rgba (-1.0, -1.0, 2.0, 4.0) +probe (0, 0) rgba (-1.0, -1.0, 2.0, 4.0) % As above, but cast "x" to float4 first. % In SM 6 a cast seems to implicitly promote the type to const, @@ -44,7 +44,7 @@ float4 main() : sv_target [test] uniform 0 float4 -1.9 -1.0 2.9 4.0 todo draw quad -probe all rgba (-1.0, -1.0, 2.0, 4.0) +probe (0, 0) rgba (-1.0, -1.0, 2.0, 4.0) % As above, but declare "x" as float4 and cast it to int4. @@ -67,7 +67,7 @@ float4 main() : sv_target [test] uniform 0 float4 -1.9 -1.0 2.9 4.0 todo draw quad -probe all rgba (-1.0, -1.0, 2.0, 4.0) +probe (0, 0) rgba (-1.0, -1.0, 2.0, 4.0) [pixel shader todo] @@ -89,4 +89,4 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 -2 0 1 -3000000 if(sm>=4) uniform 0 int4 -2 0 1 -3000000 todo(sm<6) draw quad -probe all rgba (-1.0, 0.0, 1.0, -3000000.0) 4 +probe (0, 0) rgba (-1.0, 0.0, 1.0, -3000000.0) 4 diff --git a/tests/hlsl/function-overload.shader_test b/tests/hlsl/function-overload.shader_test index 6383c434..2be46a4d 100644 --- a/tests/hlsl/function-overload.shader_test +++ b/tests/hlsl/function-overload.shader_test @@ -38,7 +38,7 @@ float4 main() : sv_target [test] todo(sm<6) draw quad -probe all rgba (0.1, 0.2, 0.1, 0.2) +probe (0, 0) rgba (0.1, 0.2, 0.1, 0.2) [pixel shader fail todo] @@ -79,7 +79,7 @@ float4 main() : sv_target [test] todo(sm<6) draw quad -todo(sm<6) probe all rgba (1.0, 2.0, 2.0, 2.0) +todo(sm<6) probe (0,0) rgba (1.0, 2.0, 2.0, 2.0) % float and float1 can be defined separately... diff --git a/tests/hlsl/function-return.shader_test b/tests/hlsl/function-return.shader_test index 3c085a57..a474bd50 100644 --- a/tests/hlsl/function-return.shader_test +++ b/tests/hlsl/function-return.shader_test @@ -30,7 +30,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.2, 0.1, 0.8, 0.5); +probe (0, 0) rgba (0.2, 0.1, 0.8, 0.5); [pixel shader todo(sm<4)] uniform float f; @@ -80,16 +80,16 @@ float4 main() : sv_target [test] uniform 0 float 0.1 todo(sm<4 | glsl) draw quad -probe all rgba (0.3, 0.2, 0.6, 0.3) 1 +probe (0, 0) rgba (0.3, 0.2, 0.6, 0.3) 1 uniform 0 float 0.4 todo(sm<4 | glsl) draw quad -probe all rgba (0.6, 0.5, 0.6, 0.3) 1 +probe (0, 0) rgba (0.6, 0.5, 0.6, 0.3) 1 uniform 0 float 0.6 todo(sm<4 | glsl) draw quad -probe all rgba (0.6, 0.5, 0.4, 0.5) 1 +probe (0, 0) rgba (0.6, 0.5, 0.4, 0.5) 1 uniform 0 float 0.8 todo(sm<4 | glsl) draw quad -probe all rgba (0.8, 0.7, 0.4, 0.5) 1 +probe (0, 0) rgba (0.8, 0.7, 0.4, 0.5) 1 [pixel shader todo(sm<4)] uniform float f; @@ -135,13 +135,13 @@ float4 main() : sv_target [test] uniform 0 float 0.1 todo(sm<4 | glsl) draw quad -probe all rgba (0.2, 0.1, 0.2, 0.1) 1 +probe (0, 0) rgba (0.2, 0.1, 0.2, 0.1) 1 uniform 0 float 0.5 todo(sm<4 | glsl) draw quad -probe all rgba (0.5, 0.4, 1.0, 0.9) 1 +probe (0, 0) rgba (0.5, 0.4, 1.0, 0.9) 1 uniform 0 float 0.9 todo(sm<4 | glsl) draw quad -probe all rgba (1.0, 0.9, 1.0, 0.6) 1 +probe (0, 0) rgba (1.0, 0.9, 1.0, 0.6) 1 [pixel shader todo(sm<4)] float func(out float o) @@ -182,7 +182,7 @@ float4 main() : sv_target [test] todo(sm<4 | glsl) draw quad -probe all rgba (0.4, 0.3, 0.3, 0.9) 1 +probe (0, 0) rgba (0.4, 0.3, 0.3, 0.9) 1 [pixel shader todo(sm<4)] uniform float f; @@ -236,23 +236,23 @@ float4 main() : sv_target [test] uniform 0 float 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (0.3, 0.2, 0.3, 0.3) 1 +probe (0, 0) rgba (0.3, 0.2, 0.3, 0.3) 1 uniform 0 float 0.1 todo(sm<4 | glsl) draw quad -probe all rgba (0.3, 0.3, 0.3, 0.3) 1 +probe (0, 0) rgba (0.3, 0.3, 0.3, 0.3) 1 uniform 0 float 0.3 todo(sm<4 | glsl) draw quad -probe all rgba (0.3, 0.5, 0.3, 0.3) 1 +probe (0, 0) rgba (0.3, 0.5, 0.3, 0.3) 1 uniform 0 float 0.7 todo(sm<4 | glsl) draw quad -probe all rgba (0.3, 0.9, 0.7, 0.6) 1 +probe (0, 0) rgba (0.3, 0.9, 0.7, 0.6) 1 uniform 0 float 0.9 todo(sm<4 | glsl) draw quad -probe all rgba (0.4, 0.1, 0.7, 0.6) 1 +probe (0, 0) rgba (0.4, 0.1, 0.7, 0.6) 1 [pixel shader todo(sm<4)] @@ -292,20 +292,20 @@ 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 | glsl) draw quad -probe all rgba (0.3, 0.2, 0.6, 0.6) 1 +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 | glsl) draw quad -probe all rgba (0.3, 0.3, 0.6, 0.6) 1 +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 | glsl) draw quad -probe all rgba (0.3, 0.5, 0.6, 0.6) 1 +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 | glsl) draw quad -probe all rgba (0.3, 0.5, 0.6, 0.6) 1 +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 | glsl) draw quad -probe all rgba (0.4, 0.1, 0.6, 0.6) 1 +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 7743ee1f..29851650 100644 --- a/tests/hlsl/function.shader_test +++ b/tests/hlsl/function.shader_test @@ -177,7 +177,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) [pixel shader] @@ -201,7 +201,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.5, 0.6, 0.7, 0) +probe (0, 0) rgba (0.5, 0.6, 0.7, 0) [pixel shader] @@ -222,7 +222,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.6, 0.1, 0.5, 0) +probe (0, 0) rgba (0.6, 0.1, 0.5, 0) % Recursion is forbidden. @@ -276,7 +276,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 3.0, 6.0, 7.0) +probe (0, 0) rgba (2.0, 3.0, 6.0, 7.0) [pixel shader] @@ -294,7 +294,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 3.0, 6.0, 7.0) +probe (0, 0) rgba (2.0, 3.0, 6.0, 7.0) % Inline modifier @@ -313,7 +313,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 3.0, 6.0, 7.0) +probe (0, 0) rgba (2.0, 3.0, 6.0, 7.0) % Inline modifier used on entry point @@ -332,7 +332,7 @@ inline float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 3.0, 6.0, 7.0) +probe (0, 0) rgba (2.0, 3.0, 6.0, 7.0) % Export modifier @@ -344,4 +344,4 @@ export float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) diff --git a/tests/hlsl/gather-offset.shader_test b/tests/hlsl/gather-offset.shader_test index e710c29a..76f97ecc 100644 --- a/tests/hlsl/gather-offset.shader_test +++ b/tests/hlsl/gather-offset.shader_test @@ -24,7 +24,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.1, 0.2, 0.2, 0.1) +probe (0, 0) rgba (0.1, 0.2, 0.2, 0.1) [pixel shader] @@ -38,7 +38,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.0, 0.1, 0.1, 0.0) +probe (0, 0) rgba (0.0, 0.1, 0.1, 0.0) [require] @@ -56,7 +56,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.2, 0.2, 0.1, 0.1) +probe (0, 0) rgba (0.2, 0.2, 0.1, 0.1) [pixel shader] @@ -70,7 +70,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.1, 0.1, 0.0, 0.0) +probe (0, 0) rgba (0.1, 0.1, 0.0, 0.0) [pixel shader] @@ -84,7 +84,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.5, 0.0, 0.5, 0.0) +probe (0, 0) rgba (0.5, 0.0, 0.5, 0.0) [pixel shader] @@ -98,7 +98,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.0, 0.4, 0.0, 0.4) +probe (0, 0) rgba (0.0, 0.4, 0.0, 0.4) [pixel shader] @@ -114,4 +114,4 @@ float4 main() : sv_target [test] uniform 0 int4 1 0 0 0 todo(glsl) draw quad -probe all rgba (0.1, 0.2, 0.2, 0.1) +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 721766d6..48c8d828 100644 --- a/tests/hlsl/gather.shader_test +++ b/tests/hlsl/gather.shader_test @@ -24,7 +24,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.0, 0.1, 0.1, 0.0) +probe (0, 0) rgba (0.0, 0.1, 0.1, 0.0) [pixel shader] @@ -38,7 +38,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.1, 0.2, 0.2, 0.1) +probe (0, 0) rgba (0.1, 0.2, 0.2, 0.1) [require] @@ -56,7 +56,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.1, 0.1, 0.0, 0.0) +probe (0, 0) rgba (0.1, 0.1, 0.0, 0.0) [pixel shader] @@ -70,7 +70,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.2, 0.2, 0.1, 0.1) +probe (0, 0) rgba (0.2, 0.2, 0.1, 0.1) [pixel shader todo] @@ -84,7 +84,7 @@ float4 main() : sv_target [test] todo(sm<6) draw quad -probe all rgba (0.1, 0.1, 0.0, 0.0) +probe (0, 0) rgba (0.1, 0.1, 0.0, 0.0) [pixel shader] @@ -98,7 +98,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.0, 0.5, 0.0, 0.5) +probe (0, 0) rgba (0.0, 0.5, 0.0, 0.5) [pixel shader] @@ -112,4 +112,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.4, 0.0, 0.4, 0.0) +probe (0, 0) rgba (0.4, 0.0, 0.4, 0.0) diff --git a/tests/hlsl/get-sample-pos.shader_test b/tests/hlsl/get-sample-pos.shader_test index 3fcf6b97..a910380b 100644 --- a/tests/hlsl/get-sample-pos.shader_test +++ b/tests/hlsl/get-sample-pos.shader_test @@ -16,4 +16,4 @@ float4 main() : sv_target [test] todo(sm<6) draw quad -probe all rgba (-0.125, -0.375, 0.375, -0.125) +probe (0, 0) rgba (-0.125, -0.375, 0.375, -0.125) diff --git a/tests/hlsl/getdimensions.shader_test b/tests/hlsl/getdimensions.shader_test index a218c84c..c421d216 100644 --- a/tests/hlsl/getdimensions.shader_test +++ b/tests/hlsl/getdimensions.shader_test @@ -29,7 +29,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 3.0, 2.0, 3.0) +probe (0, 0) rgba (2.0, 3.0, 2.0, 3.0) [srv 1] size (2d, 2, 2) @@ -54,4 +54,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 2.0, 1.0, 2.0) +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 263eeb27..643a2fe0 100644 --- a/tests/hlsl/half.shader_test +++ b/tests/hlsl/half.shader_test @@ -20,4 +20,4 @@ float4 main() : sv_target [test] uniform 0 float 10.0 todo(glsl) draw quad -probe all rgba (10.0, 10.0, 10.0, 10.0) +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 648d8e47..36e36165 100644 --- a/tests/hlsl/hard-copy-prop.shader_test +++ b/tests/hlsl/hard-copy-prop.shader_test @@ -18,10 +18,10 @@ float4 main() : sv_target [test] uniform 0 float 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (2.0, 2.0, 2.0, 2.0) +probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) uniform 0 float 1.0 todo(sm<4 | glsl) draw quad -probe all rgba (-2.0, -2.0, -2.0, -2.0) +probe (0, 0) rgba (-2.0, -2.0, -2.0, -2.0) [pixel shader todo(sm<4)] @@ -44,10 +44,10 @@ float4 main() : sv_target [test] uniform 0 float 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (2.0, 2.0, 2.0, 2.0) +probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) uniform 0 float 1.0 todo(sm<4 | glsl) draw quad -probe all rgba (20.0, 20.0, 20.0, 20.0) +probe (0, 0) rgba (20.0, 20.0, 20.0, 20.0) [pixel shader todo(sm<4)] @@ -70,7 +70,7 @@ float4 main() : sv_target [test] uniform 0 float 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (1.0, 4.0, 0.0, 0.0) +probe (0, 0) rgba (1.0, 4.0, 0.0, 0.0) uniform 0 float 1.0 todo(sm<4 | glsl) draw quad -probe all rgba (1.0, 40.0, 0.0, 0.0) +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 1cd7e3a2..57afd1e7 100644 --- a/tests/hlsl/initializer-flatten.shader_test +++ b/tests/hlsl/initializer-flatten.shader_test @@ -7,7 +7,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1, 2, 3, 4) +probe (0, 0) rgba (1, 2, 3, 4) [pixel shader] @@ -25,7 +25,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (4, 5, 6, 7) +probe (0, 0) rgba (4, 5, 6, 7) [pixel shader] @@ -38,7 +38,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (40, 10, 20, 30) +probe (0, 0) rgba (40, 10, 20, 30) [pixel shader] @@ -57,7 +57,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader] @@ -70,4 +70,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +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 d2ea24be..90148563 100644 --- a/tests/hlsl/initializer-implicit-array.shader_test +++ b/tests/hlsl/initializer-implicit-array.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (50, 60, 70, 80) +probe (0, 0) rgba (50, 60, 70, 80) [pixel shader] @@ -23,7 +23,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad % dxcompiler emits a nop shader which returns immediately. -if(sm<6) probe all rgba (5.0, 6.0, 7.0, 8.0) +if(sm<6) probe (0,0) rgba (5.0, 6.0, 7.0, 8.0) [pixel shader] @@ -36,7 +36,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (7.0, 8.0, 9.0, 10.0) +probe (0, 0) rgba (7.0, 8.0, 9.0, 10.0) [pixel shader] @@ -64,7 +64,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (318.0, 320.0, 322.0, 324.0) +probe (0, 0) rgba (318.0, 320.0, 322.0, 324.0) [pixel shader fail] diff --git a/tests/hlsl/initializer-invalid-arg-count.shader_test b/tests/hlsl/initializer-invalid-arg-count.shader_test index 20564ac5..58962c4a 100644 --- a/tests/hlsl/initializer-invalid-arg-count.shader_test +++ b/tests/hlsl/initializer-invalid-arg-count.shader_test @@ -10,7 +10,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (17, 18, 19, 20) +probe (0, 0) rgba (17, 18, 19, 20) [pixel shader fail] @@ -58,7 +58,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (22, 23, 24, 25) +probe (0, 0) rgba (22, 23, 24, 25) [pixel shader fail] diff --git a/tests/hlsl/initializer-local-array.shader_test b/tests/hlsl/initializer-local-array.shader_test index 70d31b9f..48f082b3 100644 --- a/tests/hlsl/initializer-local-array.shader_test +++ b/tests/hlsl/initializer-local-array.shader_test @@ -11,7 +11,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (21, 22, 23, 24) +probe (0, 0) rgba (21, 22, 23, 24) [pixel shader] @@ -32,4 +32,4 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (71, 72, 73, 74) +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 184f0908..3b924b7c 100644 --- a/tests/hlsl/initializer-matrix.shader_test +++ b/tests/hlsl/initializer-matrix.shader_test @@ -7,7 +7,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (21, 22, 23, 0) +probe (0, 0) rgba (21, 22, 23, 0) [pixel shader] @@ -19,7 +19,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (21, 22, 23, 0) +probe (0, 0) rgba (21, 22, 23, 0) [pixel shader] @@ -31,7 +31,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (21, 22, 23, 24) +probe (0, 0) rgba (21, 22, 23, 24) [pixel shader] @@ -43,7 +43,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (21, 22, 31, 32) +probe (0, 0) rgba (21, 22, 31, 32) [pixel shader] @@ -56,7 +56,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (21, 22, 31, 32) +probe (0, 0) rgba (21, 22, 31, 32) [pixel shader] @@ -69,4 +69,4 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (21, 22, 31, 32) +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 294b3870..f76e414d 100644 --- a/tests/hlsl/initializer-multi.shader_test +++ b/tests/hlsl/initializer-multi.shader_test @@ -8,7 +8,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2, 3, 3, 0) +probe (0, 0) rgba (2, 3, 3, 0) [pixel shader fail] @@ -33,7 +33,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (7.2, 8.0, 7.2, 8.0) +probe (0, 0) rgba (7.2, 8.0, 7.2, 8.0) [pixel shader] @@ -49,4 +49,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (5.2, 9.0, 5.2, 9.0) +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 d1b3e98e..eb25fd13 100644 --- a/tests/hlsl/initializer-nested.shader_test +++ b/tests/hlsl/initializer-nested.shader_test @@ -7,7 +7,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1, 2, 3, 4) +probe (0, 0) rgba (1, 2, 3, 4) [pixel shader] @@ -24,7 +24,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (21, 22, 23, 24) +probe (0, 0) rgba (21, 22, 23, 24) [pixel shader] @@ -53,4 +53,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (21, 22, 23, 24) +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 d2d4a12a..0bf96298 100644 --- a/tests/hlsl/initializer-numeric.shader_test +++ b/tests/hlsl/initializer-numeric.shader_test @@ -7,7 +7,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) 4 +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) 4 [pixel shader] @@ -19,7 +19,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) 4 +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) 4 [pixel shader] @@ -32,7 +32,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) 4 +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) 4 [pixel shader] @@ -45,7 +45,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (10.1, 1.1, 1.2, 2.1) 4 +probe (0, 0) rgba (10.1, 1.1, 1.2, 2.1) 4 [pixel shader] @@ -57,7 +57,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (3.0, 250.0, 16.0, 4.2949673e+009) 4 +probe (0, 0) rgba (3.0, 250.0, 16.0, 4.2949673e+009) 4 [pixel shader] @@ -70,5 +70,5 @@ float4 main() : sv_target [test] todo(glsl) draw quad -if(sm<6) probe all rgba (-1294967296.0, 3000000000.0, 0.0, 0.0) 4 -if(sm>=6) probe all rgba (3000000000.0, 3000000000.0, 0.0, 0.0) 4 +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 5007c0ce..fa4e1756 100644 --- a/tests/hlsl/initializer-objects.shader_test +++ b/tests/hlsl/initializer-objects.shader_test @@ -26,7 +26,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.2, 0.2, 0.2, 0.1) +probe (0, 0) rgba (0.2, 0.2, 0.2, 0.1) [pixel shader] @@ -49,7 +49,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (31.1, 41.1, 51.1, 61.1) 1 +probe (0, 0) rgba (31.1, 41.1, 51.1, 61.1) 1 [pixel shader] diff --git a/tests/hlsl/initializer-static-array.shader_test b/tests/hlsl/initializer-static-array.shader_test index b242b271..265ae3a4 100644 --- a/tests/hlsl/initializer-static-array.shader_test +++ b/tests/hlsl/initializer-static-array.shader_test @@ -12,7 +12,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (21, 22, 23, 24) +probe (0, 0) rgba (21, 22, 23, 24) [pixel shader] @@ -34,4 +34,4 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (61, 62, 63, 64) +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 6bd8714d..50b77f9c 100644 --- a/tests/hlsl/initializer-struct.shader_test +++ b/tests/hlsl/initializer-struct.shader_test @@ -23,7 +23,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (41, 42, 43, 44) +probe (0, 0) rgba (41, 42, 43, 44) [pixel shader] @@ -53,7 +53,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (4311, 4312, 4313, 4314) +probe (0, 0) rgba (4311, 4312, 4313, 4314) [pixel shader] @@ -81,4 +81,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (21, 22, 23, 24) +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 4be76421..416cd783 100644 --- a/tests/hlsl/intrinsic-override.shader_test +++ b/tests/hlsl/intrinsic-override.shader_test @@ -12,7 +12,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.3, 0.3, 0.4, 0.6) +probe (0, 0) rgba (0.3, 0.3, 0.4, 0.6) [pixel shader fail(sm>=6)] @@ -28,7 +28,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.3, 0.3, 0.3, 0.4) +probe (0, 0) rgba (0.3, 0.3, 0.3, 0.4) [require] @@ -48,4 +48,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.2, 0.0, 0.3, 0.4) +probe (0, 0) rgba (0.2, 0.0, 0.3, 0.4) diff --git a/tests/hlsl/inverse-trig.shader_test b/tests/hlsl/inverse-trig.shader_test index 62d79e9f..7dde8f2f 100644 --- a/tests/hlsl/inverse-trig.shader_test +++ b/tests/hlsl/inverse-trig.shader_test @@ -14,23 +14,23 @@ float4 main() : sv_target [test] uniform 0 float4 -1.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (3.14159274, 0.0, 0.0, 0.0) 128 +probe (0, 0) rgba (3.14159274, 0.0, 0.0, 0.0) 128 uniform 0 float4 -0.5 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (2.094441441, 0.0, 0.0, 0.0) 256 +probe (0, 0) rgba (2.094441441, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (1.57072878, 0.0, 0.0, 0.0) 1024 +probe (0, 0) rgba (1.57072878, 0.0, 0.0, 0.0) 1024 uniform 0 float4 0.5 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (1.04715133, 0.0, 0.0, 0.0) 512 +probe (0, 0) rgba (1.04715133, 0.0, 0.0, 0.0) 512 uniform 0 float4 1.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) 128 +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) 128 [pixel shader] uniform float4 a; @@ -45,7 +45,7 @@ float4 main() : sv_target [test] uniform 0 float4 -1.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (-31416.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (-31416.0, 0.0, 0.0, 0.0) [require] shader model < 6.0 @@ -53,15 +53,15 @@ shader model < 6.0 [test] uniform 0 float4 -0.5 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (-10473.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (-10473.0, 0.0, 0.0, 0.0) uniform 0 float4 0.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (1.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (1.0, 0.0, 0.0, 0.0) uniform 0 float4 0.5 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (10473.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (10473.0, 0.0, 0.0, 0.0) [require] shader model >= 6.0 @@ -73,15 +73,15 @@ shader model >= 6.0 [test] uniform 0 float4 -0.5 0.0 0.0 0.0 draw quad -probe all rgba (-10472.0, 0.0, 0.0, 0.0) 4096 +probe (0, 0) rgba (-10472.0, 0.0, 0.0, 0.0) 4096 uniform 0 float4 0.0 0.0 0.0 0.0 draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) uniform 0 float4 0.5 0.0 0.0 0.0 draw quad -probe all rgba (10472.0, 0.0, 0.0, 0.0) 4096 +probe (0, 0) rgba (10472.0, 0.0, 0.0, 0.0) 4096 [require] % reset requirements @@ -89,7 +89,7 @@ probe all rgba (10472.0, 0.0, 0.0, 0.0) 4096 [test] uniform 0 float4 1.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (31416.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (31416.0, 0.0, 0.0, 0.0) [pixel shader] @@ -103,23 +103,23 @@ float4 main() : sv_target [test] uniform 0 float4 -1.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (-0.785409629, 0.0, 0.0, 0.0) 512 +probe (0, 0) rgba (-0.785409629, 0.0, 0.0, 0.0) 512 uniform 0 float4 -0.5 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (-0.4636476, 0.0, 0.0, 0.0) 256 +probe (0, 0) rgba (-0.4636476, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) 256 +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.5 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.4636476, 0.0, 0.0, 0.0) 256 +probe (0, 0) rgba (0.4636476, 0.0, 0.0, 0.0) 256 uniform 0 float4 1.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.785409629, 0.0, 0.0, 0.0) 512 +probe (0, 0) rgba (0.785409629, 0.0, 0.0, 0.0) 512 [pixel shader] uniform float4 a; @@ -134,63 +134,63 @@ float4 main() : sv_target % Non-degenerate cases uniform 0 float4 1.0 1.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.785385, 0.0, 0.0, 0.0) 512 +probe (0, 0) rgba (0.785385, 0.0, 0.0, 0.0) 512 uniform 0 float4 5.0 -5.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (2.356194, 0.0, 0.0, 0.0) 256 +probe (0, 0) rgba (2.356194, 0.0, 0.0, 0.0) 256 uniform 0 float4 -3.0 -3.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (-2.356194, 0.0, 0.0, 0.0) 256 +probe (0, 0) rgba (-2.356194, 0.0, 0.0, 0.0) 256 uniform 0 float4 1.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (1.570796, 0.0, 0.0, 0.0) 256 +probe (0, 0) rgba (1.570796, 0.0, 0.0, 0.0) 256 uniform 0 float4 -1.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (-1.570796, 0.0, 0.0, 0.0) 256 +probe (0, 0) rgba (-1.570796, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 1.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) 256 +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 -1.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (3.1415927, 0.0, 0.0, 0.0) 256 +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 todo(glsl) draw quad -probe all rgba (0.463647, 0.0, 0.0, 0.0) 256 +probe (0, 0) rgba (0.463647, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.00001 -0.00002 0.0 0.0 todo(glsl) draw quad -probe all rgba (2.677945, 0.0, 0.0, 0.0) 256 +probe (0, 0) rgba (2.677945, 0.0, 0.0, 0.0) 256 uniform 0 float4 -0.00001 100000.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (-0.000000000099986595, 0.0, 0.0, 0.0) 2048 +probe (0, 0) rgba (-0.000000000099986595, 0.0, 0.0, 0.0) 2048 uniform 0 float4 10000000.0 0.00000001 0.0 0.0 todo(glsl) draw quad -probe all rgba (1.570796, 0.0, 0.0, 0.0) 256 +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 todo(glsl) draw quad -probe all rgba (1.570796, 0.0, 0.0, 0.0) 256 +probe (0, 0) rgba (1.570796, 0.0, 0.0, 0.0) 256 uniform 0 float4 1000000000.0 -0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (1.570796, 0.0, 0.0, 0.0) 256 +probe (0, 0) rgba (1.570796, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 -1.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (3.1415927, 0.0, 0.0, 0.0) 256 +probe (0, 0) rgba (3.1415927, 0.0, 0.0, 0.0) 256 uniform 0 float4 -0.0 -1.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (3.1415927, 0.0, 0.0, 0.0) 256 +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 ec657525..f6ab5b63 100644 --- a/tests/hlsl/is-front-face.shader_test +++ b/tests/hlsl/is-front-face.shader_test @@ -23,7 +23,7 @@ float4 main(bool face : sv_isfrontface) : sv_target [test] todo(glsl) draw triangle strip 4 -probe all rgba (0.0, 1.0, 0.0, 1.0) +probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) [vb 0] -2.0 -2.0 @@ -33,4 +33,4 @@ probe all rgba (0.0, 1.0, 0.0, 1.0) [test] todo(glsl) draw triangle strip 4 -probe all rgba (1.0, 2.0, 1.0, 2.0) +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 8e4e5ab9..b497c368 100644 --- a/tests/hlsl/ldexp.shader_test +++ b/tests/hlsl/ldexp.shader_test @@ -11,7 +11,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 todo(glsl) draw quad -probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) 2 +probe (0, 0) rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) 2 [pixel shader] @@ -29,7 +29,7 @@ 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 todo(glsl) draw quad -probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) 2 +probe (0, 0) rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) 2 [pixel shader] @@ -44,7 +44,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (64.0, 64.0, 64.0, 40.0) +probe (0, 0) rgba (64.0, 64.0, 64.0, 40.0) [pixel shader fail] diff --git a/tests/hlsl/length.shader_test b/tests/hlsl/length.shader_test index c44b3e1a..10dd0d9a 100644 --- a/tests/hlsl/length.shader_test +++ b/tests/hlsl/length.shader_test @@ -9,7 +9,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 5.0 todo(glsl) draw quad -probe all rgba (7.34846926, 7.34846926, 7.34846926, 7.34846926) 1 +probe (0, 0) rgba (7.34846926, 7.34846926, 7.34846926, 7.34846926) 1 [pixel shader] uniform float3 x; @@ -22,7 +22,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 0.0 todo(glsl) draw quad -probe all rgba (5.38516474, 5.38516474, 5.38516474, 5.38516474) 1 +probe (0, 0) rgba (5.38516474, 5.38516474, 5.38516474, 5.38516474) 1 [pixel shader] uniform float2 x; @@ -35,7 +35,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 0.0 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (3.60555124, 3.60555124, 3.60555124, 3.60555124) 1 +probe (0, 0) rgba (3.60555124, 3.60555124, 3.60555124, 3.60555124) 1 [pixel shader] uniform float1 x; @@ -48,7 +48,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (2.0, 2.0, 2.0, 2.0) +probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) [pixel shader] uniform float x; @@ -61,7 +61,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (2.0, 2.0, 2.0, 2.0) +probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) [pixel shader fail] uniform float1x3 x; diff --git a/tests/hlsl/lerp.shader_test b/tests/hlsl/lerp.shader_test index 908e594b..1dd03bd3 100644 --- a/tests/hlsl/lerp.shader_test +++ b/tests/hlsl/lerp.shader_test @@ -13,7 +13,7 @@ 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 todo(glsl) draw quad -probe all rgba (2.0, -10.0, -2.0, 76.25) +probe (0, 0) rgba (2.0, -10.0, -2.0, 76.25) [pixel shader] @@ -34,7 +34,7 @@ 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 todo(glsl) draw quad -probe all rgba (2.0, -10.0, -2.0, 1e12) 4 +probe (0, 0) rgba (2.0, -10.0, -2.0, 1e12) 4 [pixel shader] @@ -50,7 +50,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (-6.0, -2.2, 4.48, 8.28) 1 +probe (0, 0) rgba (-6.0, -2.2, 4.48, 8.28) 1 [pixel shader fail] diff --git a/tests/hlsl/lit.shader_test b/tests/hlsl/lit.shader_test index ce68d6ea..fd06a8e0 100644 --- a/tests/hlsl/lit.shader_test +++ b/tests/hlsl/lit.shader_test @@ -9,17 +9,17 @@ float4 main() : sv_target [test] uniform 0 float4 -0.1 10.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (1.0, 0.0, 0.0, 1.0) +probe (0, 0) rgba (1.0, 0.0, 0.0, 1.0) [test] uniform 0 float4 1.2 -0.1 0.0 0.0 todo(glsl) draw quad -probe all rgba (1.0, 1.2, 0.0, 1.0) +probe (0, 0) rgba (1.0, 1.2, 0.0, 1.0) [test] uniform 0 float4 1.2 2.0 3.0 0.0 todo(glsl) draw quad -probe all rgba (1.0, 1.2, 8.0, 1.0) +probe (0, 0) rgba (1.0, 1.2, 8.0, 1.0) [pixel shader] uniform float4 u; @@ -32,7 +32,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.2 2.0 3.0 0.0 todo(glsl) draw quad -probe all rgba (2.0, 2.4, 16.0, 2.0) +probe (0, 0) rgba (2.0, 2.4, 16.0, 2.0) [pixel shader fail] uniform float4 u; diff --git a/tests/hlsl/load-level.shader_test b/tests/hlsl/load-level.shader_test index 53e47a3a..5910d849 100644 --- a/tests/hlsl/load-level.shader_test +++ b/tests/hlsl/load-level.shader_test @@ -23,10 +23,10 @@ float4 main() : sv_target [test] uniform 0 uint 0 todo(glsl) draw quad -probe all rgba (1.0, 0.0, 1.0, 0.0) +probe (0, 0) rgba (1.0, 0.0, 1.0, 0.0) uniform 0 uint 1 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 1.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 1.0, 0.0) [pixel shader fail] sampler s; @@ -48,4 +48,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 0.0, 1.0, 0.0) +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 c7165dcc..06720ee5 100644 --- a/tests/hlsl/log.shader_test +++ b/tests/hlsl/log.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [test] uniform 0 float4 2.0 4.0 5.0 0.4 todo(glsl) draw quad -probe all rgba (1.0, 2.0, 2.32192802, -1.32192802) 1 +probe (0, 0) rgba (1.0, 2.0, 2.32192802, -1.32192802) 1 [pixel shader] uniform float4 x; @@ -22,7 +22,7 @@ float4 main() : sv_target [test] uniform 0 float4 10.0 100.0 1.0 0.1 todo(glsl) draw quad -probe all rgba (1.0, 2.0, 0.0, -1.0) 1 +probe (0, 0) rgba (1.0, 2.0, 0.0, -1.0) 1 [pixel shader] uniform float4 x; @@ -35,4 +35,4 @@ float4 main() : sv_target [test] uniform 0 float4 3.0 10.0 1.0 0.1 todo(glsl) draw quad -probe all rgba (1.0986123, 2.302585, 0.0, -2.302585) 2 +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 b698944b..376ba879 100644 --- a/tests/hlsl/logic-operations.shader_test +++ b/tests/hlsl/logic-operations.shader_test @@ -9,7 +9,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] float4 main() : SV_TARGET @@ -23,7 +23,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] float4 main() : SV_TARGET @@ -36,7 +36,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] float4 main() : SV_TARGET @@ -49,7 +49,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] float4 main() : SV_TARGET @@ -62,7 +62,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] float4 main() : SV_TARGET @@ -76,7 +76,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] float4 main() : SV_TARGET @@ -89,7 +89,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] float4 main() : SV_TARGET @@ -102,7 +102,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] float4 main() : SV_TARGET @@ -115,7 +115,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] float4 main() : SV_TARGET @@ -129,7 +129,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] float4 main() : SV_TARGET @@ -142,7 +142,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] float4 main() : SV_TARGET @@ -155,7 +155,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] @@ -172,10 +172,10 @@ if(sm<4) uniform 4 float 0 if(sm>=4) uniform 0 int 5 if(sm>=4) uniform 1 int 0 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 0.0, 1.0) +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 todo(glsl) draw quad -probe all rgba (0.0, 1.0, 0.0, 0.0) +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 2de10d98..e499b8f4 100644 --- a/tests/hlsl/loop.shader_test +++ b/tests/hlsl/loop.shader_test @@ -19,7 +19,7 @@ float4 main() : sv_target [test] uniform 0 float 5.0 todo(sm<4 | glsl) draw quad -probe all rgba (50.0, 50.0, 50.0, 50.0) +probe (0, 0) rgba (50.0, 50.0, 50.0, 50.0) [pixel shader todo(sm<4)] @@ -42,7 +42,7 @@ float4 main() : sv_target [test] uniform 0 float 4.0 todo(sm<4 | glsl) draw quad -probe all rgba (20.0, 20.0, 20.0, 20.0) +probe (0, 0) rgba (20.0, 20.0, 20.0, 20.0) [pixel shader todo(sm<4)] float a; @@ -71,7 +71,7 @@ float4 main() : sv_target [test] uniform 0 float 4.0 todo(sm<4 | glsl) draw quad -probe all rgba (409.1, 409.1, 409.1, 409.1) +probe (0, 0) rgba (409.1, 409.1, 409.1, 409.1) [pixel shader todo(sm<4)] float a; @@ -101,7 +101,7 @@ float4 main() : sv_target [test] uniform 0 float 4.0 todo(sm<4 | glsl) draw quad -probe all rgba (410.1, 410.1, 410.1, 410.1) +probe (0, 0) rgba (410.1, 410.1, 410.1, 410.1) % loop attribute by itself [pixel shader todo(sm<4)] @@ -119,7 +119,7 @@ float4 main() : sv_target [test] todo(sm<4 | glsl) draw quad -probe all rgba (10.0, 10.0, 10.0, 10.0) +probe (0, 0) rgba (10.0, 10.0, 10.0, 10.0) [pixel shader todo(sm<4)] float4 main() : sv_target @@ -138,7 +138,7 @@ float4 main() : sv_target [test] todo(sm<4 | glsl) draw quad -probe all rgba (10.0, 10.0, 10.0, 10.0) +probe (0, 0) rgba (10.0, 10.0, 10.0, 10.0) [pixel shader todo(sm<4)] float4 main() : sv_target @@ -157,7 +157,7 @@ float4 main() : sv_target [test] todo(sm<4 | glsl) draw quad -probe all rgba (10.0, 10.0, 10.0, 10.0) +probe (0, 0) rgba (10.0, 10.0, 10.0, 10.0) % unroll can't be used with fastopt or loop [pixel shader fail] diff --git a/tests/hlsl/majority-pragma.shader_test b/tests/hlsl/majority-pragma.shader_test index 993ecf05..9b2c7951 100644 --- a/tests/hlsl/majority-pragma.shader_test +++ b/tests/hlsl/majority-pragma.shader_test @@ -18,7 +18,7 @@ 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 todo(glsl) draw quad -probe all rgba (0.17, 0.39, 0.17, 0.39) 1 +probe (0, 0) rgba (0.17, 0.39, 0.17, 0.39) 1 %% Test with a struct. @@ -41,7 +41,7 @@ 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 todo(glsl) draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) %% Test with an array. @@ -62,7 +62,7 @@ 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 todo(glsl) draw quad -probe all rgba (0.5, 0.6, 0.7, 0.8) +probe (0, 0) rgba (0.5, 0.6, 0.7, 0.8) % The documentation claims these strings are subject to macro expansion. @@ -91,8 +91,8 @@ 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 todo(glsl) draw quad -if(sm<6) probe all rgba (0.23, 0.34, 0.5, 0.5) 1 -if(sm>=6) probe all rgba (0.17, 0.39, 0.5, 0.5) 1 +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 % The majority that applies to a typedef is the latent majority at the time @@ -113,7 +113,7 @@ 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 todo(glsl) draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) % In fact, it's illegal to specify a contradictory majority. @@ -151,7 +151,7 @@ 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 todo(glsl) draw quad -probe all rgba (0.3, 0.4, 0.5, 0.6) +probe (0, 0) rgba (0.3, 0.4, 0.5, 0.6) % However, if no pack_matrix directive has been used yet, a typedef has no @@ -175,7 +175,7 @@ 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 todo(glsl) draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) % This does not apply recursively to struct or array members, however. Members @@ -203,7 +203,7 @@ float4 main() : sv_target uniform 0 float4 0.2 0.4 0.0 0.0 uniform 4 float4 0.3 0.5 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.2, 0.3, 0.4, 0.5) +probe (0, 0) rgba (0.2, 0.3, 0.4, 0.5) [pixel shader] @@ -223,7 +223,7 @@ 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 todo(glsl) draw quad -probe all rgba (0.3, 0.4, 0.5, 0.6) +probe (0, 0) rgba (0.3, 0.4, 0.5, 0.6) % Compiler options [require] @@ -247,7 +247,7 @@ 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 todo(glsl) draw quad -probe all rgba (0.2, 0.3, 0.6, 0.7) 1 +probe (0, 0) rgba (0.2, 0.3, 0.6, 0.7) 1 [require] options: column-major @@ -269,7 +269,7 @@ 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 todo(glsl) draw quad -probe all rgba (0.2, 0.3, 0.6, 0.7) 1 +probe (0, 0) rgba (0.2, 0.3, 0.6, 0.7) 1 [require] options: row-major @@ -291,7 +291,7 @@ 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 todo(glsl) draw quad -probe all rgba (0.5, 0.9, 0.6, 1.0) 1 +probe (0, 0) rgba (0.5, 0.9, 0.6, 1.0) 1 [require] options: column-major @@ -319,7 +319,7 @@ 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 todo(glsl) draw quad -probe all rgba (0.3, 0.4, 2.5, 2.9) 1 +probe (0, 0) rgba (0.3, 0.4, 2.5, 2.9) 1 [require] options: row-major @@ -347,7 +347,7 @@ 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 todo(glsl) draw quad -probe all rgba (1.2, 1.6, 3.1, 3.2) 1 +probe (0, 0) rgba (1.2, 1.6, 3.1, 3.2) 1 [require] options: column-major row-major @@ -367,4 +367,4 @@ 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 todo(glsl) draw quad -probe all rgba (0.1, 0.3, 0.2, 0.4) 1 +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 3a0e5bef..fc557348 100644 --- a/tests/hlsl/majority-syntax.shader_test +++ b/tests/hlsl/majority-syntax.shader_test @@ -12,7 +12,7 @@ float4 main() : sv_target uniform 0 float4 0.1 0.3 0.0 0.0 uniform 4 float4 0.2 0.4 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.1, 0.3, 0.2, 0.4) +probe (0, 0) rgba (0.1, 0.3, 0.2, 0.4) [pixel shader fail(sm<6)] row_major row_major float4x4 m; diff --git a/tests/hlsl/majority-typedef.shader_test b/tests/hlsl/majority-typedef.shader_test index 01af0006..9c794083 100644 --- a/tests/hlsl/majority-typedef.shader_test +++ b/tests/hlsl/majority-typedef.shader_test @@ -19,4 +19,4 @@ 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 todo(glsl) draw quad -probe all rgba (0.17, 0.39, 0.17, 0.39) 1 +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 b2259091..32b5a832 100644 --- a/tests/hlsl/math.shader_test +++ b/tests/hlsl/math.shader_test @@ -15,4 +15,4 @@ float4 main() : SV_TARGET uniform 0 float4 2.5 0.3 0.2 0.7 uniform 4 float4 0.1 1.5 0.0 0.0 todo(glsl) draw quad -probe all rgba (-12.43, 9.833333, 1.6, 35.0) 1 +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 56235c63..6793542f 100644 --- a/tests/hlsl/matrix-indexing.shader_test +++ b/tests/hlsl/matrix-indexing.shader_test @@ -12,7 +12,7 @@ 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 todo(glsl) draw quad -probe all rgba (1.0, 2.0, 10.0, 15.0) +probe (0, 0) rgba (1.0, 2.0, 10.0, 15.0) [pixel shader] uniform column_major float4x4 m; @@ -28,7 +28,7 @@ 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 todo(glsl) draw quad -probe all rgba (1.0, 2.0, 10.0, 15.0) +probe (0, 0) rgba (1.0, 2.0, 10.0, 15.0) [pixel shader] uniform row_major float4x4 m; @@ -44,7 +44,7 @@ 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 todo(glsl) draw quad -probe all rgba (1.0, 5.0, 7.0, 12.0) +probe (0, 0) rgba (1.0, 5.0, 7.0, 12.0) [pixel shader] uniform float3x2 m; @@ -59,7 +59,7 @@ float4 main() : SV_TARGET uniform 0 float4 1.0 2.0 3.0 0.0 uniform 4 float4 5.0 6.0 7.0 0.0 todo(glsl) draw quad -probe all rgba (1.0, 3.0, 6.0, 7.0) +probe (0, 0) rgba (1.0, 3.0, 6.0, 7.0) [pixel shader] float4 main() : SV_TARGET @@ -75,7 +75,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (1.0, 5.0, 7.0, 12.0) +probe (0, 0) rgba (1.0, 5.0, 7.0, 12.0) [pixel shader] @@ -90,7 +90,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (30.0, 40.0, 5.0, 6.0) +probe (0, 0) rgba (30.0, 40.0, 5.0, 6.0) [pixel shader] @@ -105,7 +105,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (3.0, 4.0, 50.0, 60.0) +probe (0, 0) rgba (3.0, 4.0, 50.0, 60.0) [pixel shader todo(sm<4)] @@ -121,7 +121,7 @@ float4 main() : sv_target [test] uniform 0 float 2 todo(sm<4 | glsl) draw quad -probe all rgba (8, 9, 10, 11) +probe (0, 0) rgba (8, 9, 10, 11) [pixel shader todo(sm<4)] @@ -137,4 +137,4 @@ float4 main() : sv_target [test] uniform 0 float 3 todo(sm<4 | glsl) draw quad -probe all rgba (12, 13, 14, 15) +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 352943dd..fd7f5534 100644 --- a/tests/hlsl/matrix-semantics.shader_test +++ b/tests/hlsl/matrix-semantics.shader_test @@ -9,7 +9,7 @@ float4x1 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader] row_major float1x4 main() : sv_target @@ -19,7 +19,7 @@ row_major float1x4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [rtv 0] format r32 float @@ -45,10 +45,10 @@ row_major float4x1 main() : sv_target [test] todo(sm>=6 | glsl) draw quad -probe rtv 0 all r (1.0) -probe rtv 1 all r (2.0) -probe rtv 2 all r (3.0) -probe rtv 3 all r (4.0) +probe rtv 0 (0,0) r (1.0) +probe rtv 1 (0,0) r (2.0) +probe rtv 2 (0,0) r (3.0) +probe rtv 3 (0,0) r (4.0) [pixel shader fail(sm>=6)] float1x4 main() : sv_target @@ -58,10 +58,10 @@ float1x4 main() : sv_target [test] todo(sm>=6 | glsl) draw quad -probe rtv 0 all r (1.0) -probe rtv 1 all r (2.0) -probe rtv 2 all r (3.0) -probe rtv 3 all r (4.0) +probe rtv 0 (0,0) r (1.0) +probe rtv 1 (0,0) r (2.0) +probe rtv 2 (0,0) r (3.0) +probe rtv 3 (0,0) r (4.0) [pixel shader fail] void main(out float1x2 x : sv_target0, out float1x2 y : sv_target1) @@ -79,10 +79,10 @@ void main(out float1x2 x : sv_target0, out float1x2 y : sv_target2) [test] todo(sm>=6 | glsl) draw quad -probe rtv 0 all r (1.0) -probe rtv 1 all r (2.0) -probe rtv 2 all r (5.0) -probe rtv 3 all r (6.0) +probe rtv 0 (0,0) r (1.0) +probe rtv 1 (0,0) r (2.0) +probe rtv 2 (0,0) r (5.0) +probe rtv 3 (0,0) r (6.0) [rtv 0] format r32g32b32a32 float @@ -97,6 +97,6 @@ void main(out row_major float1x4 x : sv_target0, out float1x2 y : sv_target1) [test] todo(sm>=6 | glsl) draw quad -probe rtv 0 all rgba (1.0, 2.0, 3.0, 4.0) -probe rtv 1 all r (5.0) -probe rtv 2 all r (6.0) +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 fd228a54..abdf0b77 100644 --- a/tests/hlsl/max-min.shader_test +++ b/tests/hlsl/max-min.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.7 -0.1 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.7, 2.1, 2.0, -1.0) +probe (0, 0) rgba (0.7, 2.1, 2.0, -1.0) [pixel shader] @@ -25,7 +25,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.7 -0.1 0.4 0.8 todo(glsl) draw quad -probe all rgba (0.7, 0.8, 0.7, 0.2) +probe (0, 0) rgba (0.7, 0.8, 0.7, 0.2) [pixel shader] @@ -40,7 +40,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (6.0, 5.0, 4.0, 5.0) +probe (0, 0) rgba (6.0, 5.0, 4.0, 5.0) [pixel shader fail] @@ -65,7 +65,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.7 -0.1 0.0 0.0 todo(glsl) draw quad -probe all rgba (-0.1, 2.0, 1.0, -2.0) +probe (0, 0) rgba (-0.1, 2.0, 1.0, -2.0) [pixel shader] @@ -81,7 +81,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.7 -0.1 0.4 0.8 todo(glsl) draw quad -probe all rgba (0.4, -0.1, -0.2, -0.1) +probe (0, 0) rgba (0.4, -0.1, -0.2, -0.1) [require] @@ -98,7 +98,7 @@ uint4 main() : sv_target [test] uniform 0 uint4 1 2 0 0 todo(glsl) draw quad -probe all rgbaui (2, 1, 2, 1) +probe (0, 0) rgbaui (2, 1, 2, 1) [pixel shader todo] @@ -112,4 +112,4 @@ int4 main() : sv_target [test] uniform 0 int4 -1 -2 0 0 todo(sm<6) draw quad -probe all rgbai (-1, -2, -1, -2) +probe (0, 0) rgbai (-1, -2, -1, -2) diff --git a/tests/hlsl/minimum-precision.shader_test b/tests/hlsl/minimum-precision.shader_test index 040a04f7..0b384495 100644 --- a/tests/hlsl/minimum-precision.shader_test +++ b/tests/hlsl/minimum-precision.shader_test @@ -18,7 +18,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (197.0, 218.0, 238.0, 257.0) +probe (0, 0) rgba (197.0, 218.0, 238.0, 257.0) [pixel shader] @@ -37,7 +37,7 @@ shader model < 6.0 [test] uniform 0 uint4 0 0 0 0 todo(glsl) draw quad -probe all rgbaui (0x7fff, 0xffff, 0, 0) +probe (0, 0) rgbaui (0x7fff, 0xffff, 0, 0) [require] shader model >= 6.0 @@ -45,7 +45,7 @@ shader model >= 6.0 [test] uniform 0 uint4 0 0 0 0 draw quad -probe all rgbaui (0x7fff, 0xffffffff, 0, 0) +probe (0, 0) rgbaui (0x7fff, 0xffffffff, 0, 0) % The code d3dcompiler_47 produces for this appears correct, but the result @@ -65,8 +65,8 @@ uint4 main() : sv_target uniform 0 uint4 0 0 0 0 uniform 4 uint 2 draw quad -probe all rgbaui (0x7fff, 0xffffffff, 0, 0) +probe (0, 0) rgbaui (0x7fff, 0xffffffff, 0, 0) uniform 0 uint4 0 0 0 0 uniform 4 uint 0 draw quad -probe all rgbaui (1, 2, 0, 0) +probe (0, 0) rgbaui (1, 2, 0, 0) diff --git a/tests/hlsl/mul.shader_test b/tests/hlsl/mul.shader_test index 5d631852..617066bd 100644 --- a/tests/hlsl/mul.shader_test +++ b/tests/hlsl/mul.shader_test @@ -12,7 +12,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (30.0, 70.0, 110.0, 150.0) +probe (0, 0) rgba (30.0, 70.0, 110.0, 150.0) [pixel shader] float4 main() : sv_target @@ -28,7 +28,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (90.0, 100.0, 110.0, 120.0) +probe (0, 0) rgba (90.0, 100.0, 110.0, 120.0) [pixel shader] float4 main() : sv_target @@ -44,7 +44,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (14.0, 38.0, 62.0, 86.0) +probe (0, 0) rgba (14.0, 38.0, 62.0, 86.0) [pixel shader] float4 main() : sv_target @@ -60,7 +60,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (38.0, 44.0, 50.0, 56.0) +probe (0, 0) rgba (38.0, 44.0, 50.0, 56.0) [pixel shader] float4 main() : sv_target @@ -75,7 +75,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (14.0, 32.0, 50.0, 0.0) +probe (0, 0) rgba (14.0, 32.0, 50.0, 0.0) [pixel shader] float4 main() : sv_target @@ -90,7 +90,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (30.0, 36.0, 42.0, 0.0) +probe (0, 0) rgba (30.0, 36.0, 42.0, 0.0) [pixel shader] float4 main() : sv_target @@ -106,7 +106,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (50.0, 60.0, 70.0, 80.0) +probe (0, 0) rgba (50.0, 60.0, 70.0, 80.0) [pixel shader] float4 main() : sv_target @@ -122,7 +122,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (50.0, 60.0, 70.0, 80.0) +probe (0, 0) rgba (50.0, 60.0, 70.0, 80.0) [pixel shader] float4 main() : sv_target @@ -138,7 +138,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (10.0, 20.0, 30.0, 40.0) +probe (0, 0) rgba (10.0, 20.0, 30.0, 40.0) [pixel shader] float4 main() : sv_target @@ -154,7 +154,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (10.0, 50.0, 90.0, 130.0) +probe (0, 0) rgba (10.0, 50.0, 90.0, 130.0) [pixel shader] float4 main() : sv_target @@ -170,7 +170,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (10.0, 20.0, 30.0, 40.0) +probe (0, 0) rgba (10.0, 20.0, 30.0, 40.0) [pixel shader] float4 main() : sv_target @@ -186,7 +186,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (10.0, 50.0, 90.0, 130.0) +probe (0, 0) rgba (10.0, 50.0, 90.0, 130.0) [pixel shader] float4 main() : sv_target @@ -202,7 +202,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (90.0, 100.0, 110.0, 120.0) +probe (0, 0) rgba (90.0, 100.0, 110.0, 120.0) [pixel shader] float4 main() : sv_target @@ -218,7 +218,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (5.0, 10.0, 15.0, 20.0) +probe (0, 0) rgba (5.0, 10.0, 15.0, 20.0) [pixel shader] float4 main() : sv_target @@ -234,7 +234,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 4.0, 6.0, 8.0) +probe (0, 0) rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] float4 main() : sv_target @@ -250,7 +250,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (30.0, 70.0, 110.0, 150.0) +probe (0, 0) rgba (30.0, 70.0, 110.0, 150.0) [pixel shader] float4 main() : sv_target @@ -268,7 +268,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (83.0, 98.0, 113.0, 128.0) +probe (0, 0) rgba (83.0, 98.0, 113.0, 128.0) [pixel shader] float4 main() : sv_target @@ -286,7 +286,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (78.0, 96.0, 114.0, 0.0) +probe (0, 0) rgba (78.0, 96.0, 114.0, 0.0) [pixel shader] @@ -301,7 +301,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (20.0, 14.0, 56.0, 41.0) +probe (0, 0) rgba (20.0, 14.0, 56.0, 41.0) [pixel shader] @@ -316,4 +316,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (5.0, 11.0, 0.0, 0.0) +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 8172d7f9..a9245be7 100644 --- a/tests/hlsl/multiple-rt.shader_test +++ b/tests/hlsl/multiple-rt.shader_test @@ -15,5 +15,5 @@ void main(out float4 o0 : sv_target0, out float4 o1 : sv_target1) [test] todo(glsl) draw quad -probe rtv 0 all rgba (0.1, 0.2, 0.3, 0.4) -probe rtv 1 all rgba (0.5, 0.6, 0.7, 0.8) +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 cdf8308d..910985fd 100644 --- a/tests/hlsl/nested-arrays.shader_test +++ b/tests/hlsl/nested-arrays.shader_test @@ -22,4 +22,4 @@ 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 todo(glsl) draw quad -probe all rgba (0.4, 0.1, 0.6, 0.3) +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 10be37d2..17f25797 100644 --- a/tests/hlsl/nointerpolation.shader_test +++ b/tests/hlsl/nointerpolation.shader_test @@ -24,7 +24,7 @@ float4 main(nointerpolation float4 t : texcoord) : sv_target [test] todo(glsl) draw triangle list 3 -probe all rgba (0.0, 1.0, 0.0, 1.0) +probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) [vertex shader] struct ps_input @@ -51,7 +51,7 @@ float4 main(ps_input input) : sv_target [test] todo(glsl) draw triangle list 3 -probe all rgba (0.0, 1.0, 0.0, 1.0) +probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) [vertex shader] struct ps_input @@ -78,7 +78,7 @@ float4 main(nointerpolation ps_input input) : sv_target [test] todo(glsl) draw triangle list 3 -probe all rgba (0.0, 1.0, 0.0, 1.0) +probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) [vertex shader] struct ps_input @@ -105,7 +105,7 @@ float4 main(centroid ps_input input) : sv_target [test] todo(glsl) draw triangle list 3 -probe all rgba (0.0, 1.0, 0.0, 1.0) +probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) [vertex shader] struct ps_input @@ -136,7 +136,7 @@ shader model < 6.0 [test] todo(glsl) draw triangle list 3 -probe all rgba (0.0, 1.0, 0.0, 1.0) +probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) % Centroid for SM 6. [require] diff --git a/tests/hlsl/non-const-indexing.shader_test b/tests/hlsl/non-const-indexing.shader_test index 021517c2..4e5eb8fc 100644 --- a/tests/hlsl/non-const-indexing.shader_test +++ b/tests/hlsl/non-const-indexing.shader_test @@ -13,16 +13,16 @@ 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 todo(sm<4 | glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) uniform 12 float4 1 0 0 0 todo(sm<4 | glsl) draw quad -probe all rgba (5.0, 6.0, 7.0, 8.0) +probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) uniform 12 float4 0 1 0 0 todo(sm<4 | glsl) draw quad -probe all rgba (5.0, 6.0, 7.0, 8.0) +probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) uniform 12 float4 1 1 0 0 todo(sm<4 | glsl) draw quad -probe all rgba (9.0, 10.0, 11.0, 12.0) +probe (0, 0) rgba (9.0, 10.0, 11.0, 12.0) [pixel shader] @@ -37,16 +37,16 @@ float4 main() : SV_TARGET [test] uniform 0 float 0 todo(glsl) draw quad -probe all rgba (11.0, 11.0, 11.0, 11.0) +probe (0, 0) rgba (11.0, 11.0, 11.0, 11.0) uniform 0 float 1 todo(glsl) draw quad -probe all rgba (12.0, 12.0, 12.0, 12.0) +probe (0, 0) rgba (12.0, 12.0, 12.0, 12.0) uniform 0 float 2 todo(glsl) draw quad -probe all rgba (13.0, 13.0, 13.0, 13.0) +probe (0, 0) rgba (13.0, 13.0, 13.0, 13.0) uniform 0 float 3 todo(glsl) draw quad -probe all rgba (14.0, 14.0, 14.0, 14.0) +probe (0, 0) rgba (14.0, 14.0, 14.0, 14.0) [pixel shader todo(sm<4)] @@ -62,7 +62,7 @@ float4 main() : sv_target [test] uniform 0 float 2.3 todo(sm<4 | glsl) draw quad -probe all rgba (3, 3, 3, 3) +probe (0, 0) rgba (3, 3, 3, 3) [pixel shader todo(sm<4)] @@ -78,16 +78,16 @@ float4 main() : SV_TARGET [test] uniform 0 float 0 todo(sm<4 | glsl) draw quad -probe all rgba (21.0, 1.0, 24.0, 0.0) +probe (0, 0) rgba (21.0, 1.0, 24.0, 0.0) uniform 0 float 1 todo(sm<4 | glsl) draw quad -probe all rgba (22.0, 0.0, 23.0, 1.0) +probe (0, 0) rgba (22.0, 0.0, 23.0, 1.0) uniform 0 float 2 todo(sm<4 | glsl) draw quad -probe all rgba (23.0, 1.0, 22.0, 0.0) +probe (0, 0) rgba (23.0, 1.0, 22.0, 0.0) uniform 0 float 3 todo(sm<4 | glsl) draw quad -probe all rgba (24.0, 0.0, 21.0, 1.0) +probe (0, 0) rgba (24.0, 0.0, 21.0, 1.0) [pixel shader todo(sm<4)] @@ -103,16 +103,16 @@ float4 main() : sv_target [test] uniform 0 float4 0 0 0 0 todo(sm<4 | glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) uniform 0 float4 1 0 0 0 todo(sm<4 | glsl) draw quad -probe all rgba (5.0, 6.0, 7.0, 8.0) +probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) uniform 0 float4 0 1 0 0 todo(sm<4 | glsl) draw quad -probe all rgba (5.0, 6.0, 7.0, 8.0) +probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) uniform 0 float4 1 1 0 0 todo(sm<4 | glsl) draw quad -probe all rgba (9.0, 10.0, 11.0, 12.0) +probe (0, 0) rgba (9.0, 10.0, 11.0, 12.0) [pixel shader todo(sm<4)] @@ -131,7 +131,7 @@ float4 main() : sv_target [test] uniform 0 float4 0 0 2.4 0 todo(sm<4 | glsl) draw quad -probe all rgba (1.0, 120.0, 90.0, 4.0) +probe (0, 0) rgba (1.0, 120.0, 90.0, 4.0) % SM1 doesn't support relative addressing if it is used in a l-value. @@ -156,15 +156,15 @@ float4 main() : sv_target uniform 0 int 0 uniform 1 int 0 todo(glsl) draw quad -probe all rgba (100, 6, 7, 8) +probe (0, 0) rgba (100, 6, 7, 8) uniform 0 int 2 uniform 1 int 2 todo(glsl) draw quad -probe all rgba (5, 6, 100, 8) +probe (0, 0) rgba (5, 6, 100, 8) uniform 0 int 1 uniform 1 int 3 todo(glsl) draw quad -probe all rgba (5, 6, 7, 4) +probe (0, 0) rgba (5, 6, 7, 4) [pixel shader] @@ -193,7 +193,7 @@ uniform 4 float4 5 6 7 8 uniform 8 int 3 uniform 9 int 4 todo(glsl) draw quad -probe all rgba (1126, 3344, 5566, 3788) +probe (0, 0) rgba (1126, 3344, 5566, 3788) [pixel shader] @@ -213,7 +213,7 @@ float4 main() : sv_target uniform 0 uint 1 uniform 1 uint 0x40a00000 todo(glsl) draw quad -probe all rgba (1, 5, 3, 4) +probe (0, 0) rgba (1, 5, 3, 4) [require] @@ -244,6 +244,6 @@ uniform 12 float 4.0 uniform 16 uint4 3 1 0 2 uniform 20 uint4 0 3 1 2 todo(sm<4 | glsl) draw quad -if(sm<4) todo probe all rgba (1.0, 1.0, 1.0, 1.0) -if(sm>=4 & sm<6) todo probe all rgba (4.0, 4.0, 4.0, 4.0) -if(sm>=6) probe all rgba (4.0, 3.0, 2.0, 1.0) +if(sm<4) todo 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 3f89e280..6b007c78 100644 --- a/tests/hlsl/normalize.shader_test +++ b/tests/hlsl/normalize.shader_test @@ -9,7 +9,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 5.0 todo(glsl) draw quad -probe all rgba (0.272165537, 0.408248305, 0.544331074, 0.680413842) 2 +probe (0, 0) rgba (0.272165537, 0.408248305, 0.544331074, 0.680413842) 2 [pixel shader] uniform float3 x; @@ -22,7 +22,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 0.0 todo(glsl) draw quad -probe all rgba (0.371390700, 0.557086051, 0.742781401, 0.0) 1 +probe (0, 0) rgba (0.371390700, 0.557086051, 0.742781401, 0.0) 1 [pixel shader] uniform float2 x; @@ -35,7 +35,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 0.0 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (0.554700196, 0.832050323, 0.0, 0.0) 1 +probe (0, 0) rgba (0.554700196, 0.832050323, 0.0, 0.0) 1 [pixel shader] uniform float1 x; @@ -48,7 +48,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [pixel shader] uniform float x; @@ -61,7 +61,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [pixel shader fail] uniform float1x3 x; diff --git a/tests/hlsl/numeric-constructor-truncation.shader_test b/tests/hlsl/numeric-constructor-truncation.shader_test index de1e2f84..5e6e7ca2 100644 --- a/tests/hlsl/numeric-constructor-truncation.shader_test +++ b/tests/hlsl/numeric-constructor-truncation.shader_test @@ -7,7 +7,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (71.0, 72.0, 73.0, 75.0) +probe (0, 0) rgba (71.0, 72.0, 73.0, 75.0) [pixel shader] @@ -30,4 +30,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 5.0) +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 dc4fd413..5b1d3cdc 100644 --- a/tests/hlsl/numeric-types.shader_test +++ b/tests/hlsl/numeric-types.shader_test @@ -7,7 +7,7 @@ vector main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader] float4 main() : sv_target @@ -18,7 +18,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader] float4 main() : sv_target @@ -29,7 +29,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 0.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 0.0) [pixel shader fail] vector main() : sv_target @@ -57,7 +57,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (5.0, 6.0, 7.0, 8.0) +probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) [pixel shader] float4 main() : sv_target @@ -69,7 +69,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (5.0, 6.0, 7.0, 0.0) +probe (0, 0) rgba (5.0, 6.0, 7.0, 0.0) [pixel shader fail(sm<6)] float4 main() : sv_target diff --git a/tests/hlsl/object-field-offsets.shader_test b/tests/hlsl/object-field-offsets.shader_test index 2eb1ff77..13a56e42 100644 --- a/tests/hlsl/object-field-offsets.shader_test +++ b/tests/hlsl/object-field-offsets.shader_test @@ -20,7 +20,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 todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 0.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 0.0) [pixel shader] @@ -46,7 +46,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 todo(glsl) draw quad -probe all rgba (1.0, 2.0, 5.0, 0.0) +probe (0, 0) rgba (1.0, 2.0, 5.0, 0.0) [pixel shader] @@ -67,4 +67,4 @@ 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 todo(glsl) draw quad -probe all rgba (1.0, 2.0, 5.0, 0.0) +probe (0, 0) rgba (1.0, 2.0, 5.0, 0.0) diff --git a/tests/hlsl/object-parameters.shader_test b/tests/hlsl/object-parameters.shader_test index 4a44a0c7..9efecf15 100644 --- a/tests/hlsl/object-parameters.shader_test +++ b/tests/hlsl/object-parameters.shader_test @@ -120,7 +120,7 @@ float4 main(struct apple input) : sv_target [test] todo draw quad -todo probe all rgba (416.0, 416.0, 416.0, 111.0) +todo probe (0,0) rgba (416.0, 416.0, 416.0, 111.0) [pixel shader todo fail(sm>=6)] @@ -143,7 +143,7 @@ float4 main(struct apple input, sampler samp) : sv_target [test] todo draw quad -todo probe all rgba (1.0, 1.0, 0.5, 0.5) +todo probe (0,0) rgba (1.0, 1.0, 0.5, 0.5) [sampler 0] @@ -189,4 +189,4 @@ float4 main(struct apple input, sampler samp) : sv_target [test] todo draw quad -todo probe all rgba (0.5, 1.0, 0.5, 1.0) +todo probe (0,0) rgba (0.5, 1.0, 0.5, 1.0) diff --git a/tests/hlsl/object-references.shader_test b/tests/hlsl/object-references.shader_test index 797b7534..bf06d4d3 100644 --- a/tests/hlsl/object-references.shader_test +++ b/tests/hlsl/object-references.shader_test @@ -47,7 +47,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (77.77, 77.77, 77.77, 77.77) +probe (0, 0) rgba (77.77, 77.77, 77.77, 77.77) [srv 0] @@ -112,7 +112,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (312, 312, 312, 111) +probe (0, 0) rgba (312, 312, 312, 111) [pixel shader] @@ -135,7 +135,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2132, 2132, 2132, 1111) +probe (0, 0) rgba (2132, 2132, 2132, 1111) [pixel shader fail(sm<6)] diff --git a/tests/hlsl/pointer-cast.shader_test b/tests/hlsl/pointer-cast.shader_test index 6821abab..ecd48bee 100644 --- a/tests/hlsl/pointer-cast.shader_test +++ b/tests/hlsl/pointer-cast.shader_test @@ -17,7 +17,7 @@ float4 main(float4 pos : SV_Position) : SV_Target [test] uniform 0 uint4 0 1 0x3e000000 0 draw quad -probe all rgba (0.25, 0.125, 0.0, 1.0) +probe (0, 0) rgba (0.25, 0.125, 0.0, 1.0) uniform 0 uint4 1 0 0x3e000000 0 draw quad -probe all rgba (0.5, 0.75, 0.0, 1.0) +probe (0, 0) rgba (0.5, 0.75, 0.0, 1.0) diff --git a/tests/hlsl/pow.shader_test b/tests/hlsl/pow.shader_test index 89ebbf7a..cbd91354 100644 --- a/tests/hlsl/pow.shader_test +++ b/tests/hlsl/pow.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.4 0.8 2.5 2.0 todo(glsl) draw quad -probe all rgba (0.512, 0.101192884, 0.64, 0.25) 4 +probe (0, 0) rgba (0.512, 0.101192884, 0.64, 0.25) 4 [pixel shader] @@ -24,7 +24,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 32.0, 256.0, 125.0) 2 +probe (0, 0) rgba (1.0, 32.0, 256.0, 125.0) 2 [pixel shader fail] diff --git a/tests/hlsl/precise-modifier.shader_test b/tests/hlsl/precise-modifier.shader_test index bbc709d4..7fc555d1 100644 --- a/tests/hlsl/precise-modifier.shader_test +++ b/tests/hlsl/precise-modifier.shader_test @@ -10,7 +10,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.1 0.2 0.3 0.4 todo(glsl) draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) [pixel shader fail(sm>=6)] precise float4 var; @@ -24,7 +24,7 @@ precise main() : sv_target [test] uniform 0 float4 0.1 0.2 0.3 0.4 todo(glsl) draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) [pixel shader] float4 precise; @@ -38,4 +38,4 @@ float4 main() : sv_target [test] uniform 0 float4 0.1 0.2 0.3 0.4 todo(glsl) draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) diff --git a/tests/hlsl/rasteriser-ordered-views.shader_test b/tests/hlsl/rasteriser-ordered-views.shader_test index 04ede0fa..c23ae048 100644 --- a/tests/hlsl/rasteriser-ordered-views.shader_test +++ b/tests/hlsl/rasteriser-ordered-views.shader_test @@ -33,8 +33,8 @@ uint4 main(float4 pos : sv_position) : sv_target % Initialise the UAV and RTV. [test] todo(glsl) draw triangle list 3 -probe all rui(0xaaaaaaaa) -probe uav 1 all rui(0x55555555) +probe (0, 0) rui(0xaaaaaaaa) +probe uav 1 (0, 0, 640, 480) rui(0x55555555) [pixel shader] RasterizerOrderedTexture2D tex : register(u1); @@ -65,5 +65,5 @@ rov [test] draw triangle list 93 -probe all rui(0x6aaaaaaa) -probe uav 1 all rui(0x2aaaaaaa) +probe (0, 0) rui(0x6aaaaaaa) +probe uav 1 (0, 0, 640, 480) rui(0x2aaaaaaa) diff --git a/tests/hlsl/reflect.shader_test b/tests/hlsl/reflect.shader_test index 1b3123c8..95810d59 100644 --- a/tests/hlsl/reflect.shader_test +++ b/tests/hlsl/reflect.shader_test @@ -11,7 +11,7 @@ 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 todo(glsl) draw quad -probe all rgba (-0.1, -0.5, 0.5, -0.7) 4 +probe (0, 0) rgba (-0.1, -0.5, 0.5, -0.7) 4 [pixel shader] uniform float4 i; @@ -28,7 +28,7 @@ float4 main() : sv_target uniform 0 float4 0.5 0.0 0.0 0.0 uniform 4 float4 0.6 0.4 -0.3 1.0 todo(glsl) draw quad -probe all rgba (-0.52, -0.18, 1.01, -1.2) 4 +probe (0, 0) rgba (-0.52, -0.18, 1.01, -1.2) 4 [pixel shader] uniform float4 i; @@ -45,7 +45,7 @@ float4 main() : sv_target uniform 0 float4 0.5 -0.1 0.2 0.3 uniform 4 float4 0.6 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (-0.148, -0.748, -0.448, -0.348) 4 +probe (0, 0) rgba (-0.148, -0.748, -0.448, -0.348) 4 [pixel shader] uniform float4 i; @@ -63,7 +63,7 @@ float4 main() : sv_target uniform 0 float4 0.5 0.0 0.0 0.0 uniform 4 float4 0.6 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.14, 0.14, 0.14, 0.14) 4 +probe (0, 0) rgba (0.14, 0.14, 0.14, 0.14) 4 [pixel shader] uniform float4 i; @@ -80,7 +80,7 @@ float4 main() : sv_target 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 | glsl) draw quad -probe all rgba (0.188, -0.308, 0.0, 0.0) 4 +probe (0, 0) rgba (0.188, -0.308, 0.0, 0.0) 4 [pixel shader] uniform float4 i; @@ -98,4 +98,4 @@ float4 main() : sv_target 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 | glsl) draw quad -probe all rgba (0.188, -0.308, 0.0, 0.0) 4 +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 f123cd44..4e90accf 100644 --- a/tests/hlsl/refract.shader_test +++ b/tests/hlsl/refract.shader_test @@ -13,10 +13,10 @@ 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(glsl) draw quad -probe all rgba (-0.550931, -0.453954, 0.3654653, -1.0248856) 32 +probe (0, 0) rgba (-0.550931, -0.453954, 0.3654653, -1.0248856) 32 uniform 8 float 100.0 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] float4 r; @@ -35,10 +35,10 @@ 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 | glsl) draw quad -probe all rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32 +probe (0, 0) rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32 uniform 8 float 100.0 todo(sm<4 | glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] float4 r; @@ -56,10 +56,10 @@ 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 | glsl) draw quad -probe all rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32 +probe (0, 0) rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32 uniform 8 float 100.0 todo(sm<4 | glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] float4 r; @@ -77,10 +77,10 @@ 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 | glsl) draw quad -probe all rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32 +probe (0, 0) rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32 uniform 8 float 100.0 todo(sm<4 | glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] float4 r; @@ -99,10 +99,10 @@ 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(glsl) draw quad -probe all rgba (-0.524978, 0.0, 0.0, 0.0) 32 +probe (0, 0) rgba (-0.524978, 0.0, 0.0, 0.0) 32 uniform 8 float 100.0 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader] float4 r; @@ -119,10 +119,10 @@ 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(glsl) draw quad -probe all rgba (-0.5562381, -0.6762381, -0.6162381, -0.5962381) 32 +probe (0, 0) rgba (-0.5562381, -0.6762381, -0.6162381, -0.5962381) 32 uniform 8 float 100.0 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader fail(sm>=6)] float4 r; @@ -139,10 +139,10 @@ 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) todo(glsl) draw quad -if(sm<6) probe all rgba (-0.550931, -0.453954, 0.3654653, -1.0248856) 32 +if(sm<6) probe (0,0) rgba (-0.550931, -0.453954, 0.3654653, -1.0248856) 32 uniform 8 float 100.0 if(sm<6) todo(glsl) draw quad -if(sm<6) probe all rgba (0.0, 0.0, 0.0, 0.0) +if(sm<6) probe (0,0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader fail] float4x1 r; @@ -229,5 +229,5 @@ float4 main() : sv_target [test] todo(sm<6) draw quad -if(sm<6) probe all rgba (2.0, 1.0, 1.0, 1.0) -if(sm>=6) probe all rgba (1.0, 1.0, 1.0, 1.0) +if(sm<6) probe (0,0) rgba (2.0, 1.0, 1.0, 1.0) +if(sm>=6) probe (0,0) rgba (1.0, 1.0, 1.0, 1.0) diff --git a/tests/hlsl/register-reservations-numeric.shader_test b/tests/hlsl/register-reservations-numeric.shader_test index 21d0f727..1f32aa43 100644 --- a/tests/hlsl/register-reservations-numeric.shader_test +++ b/tests/hlsl/register-reservations-numeric.shader_test @@ -24,7 +24,7 @@ float4 main() : sv_target uniform 0 float4 0.1 0.2 0.3 0.4 uniform 4 float4 1.1 1.2 1.3 1.4 todo(glsl) draw quad -probe all rgba (1.1, 1.4, 0.2, 0.3) +probe (0, 0) rgba (1.1, 1.4, 0.2, 0.3) [pixel shader] @@ -43,7 +43,7 @@ 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 todo(glsl) draw quad -probe all rgba (4.1, 4.2, 1.3, 1.4) +probe (0, 0) rgba (4.1, 4.2, 1.3, 1.4) [require] @@ -64,7 +64,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 draw quad -probe all rgba (2.1, 0.1, 0.0, 0.0) +probe (0, 0) rgba (2.1, 0.1, 0.0, 0.0) [require] @@ -85,7 +85,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 todo(glsl) draw quad -probe all rgba (2.1, 2.2, 0.0, 0.0) +probe (0, 0) rgba (2.1, 2.2, 0.0, 0.0) [require] @@ -106,7 +106,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 draw quad -probe all rgba (2.1, 2.2, 2.2, 2.3) +probe (0, 0) rgba (2.1, 2.2, 2.2, 2.3) % Results differ between SM1 and SM4 because in the latter variables can share the same register, @@ -132,7 +132,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 draw quad -probe all rgba (2.1, 2.2, 3.1, 0.0) +probe (0, 0) rgba (2.1, 2.2, 3.1, 0.0) [require] @@ -156,7 +156,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 todo(glsl) draw quad -probe all rgba (2.1, 2.2, 2.3, 0.0) +probe (0, 0) rgba (2.1, 2.2, 2.3, 0.0) [pixel shader] @@ -175,7 +175,7 @@ float4 main() : sv_target uniform 0 float 100 uniform 4 float 101 todo(glsl) draw quad -probe all rgba (100, 100, 100, 100) +probe (0, 0) rgba (100, 100, 100, 100) [pixel shader fail(sm>=6)] @@ -189,7 +189,7 @@ float4 main(uniform float a : register(c1)) : sv_target uniform 0 float 100 uniform 4 float 101 todo(glsl) draw quad -probe all rgba (100, 100, 100, 100) +probe (0, 0) rgba (100, 100, 100, 100) [pixel shader todo] cbuffer c @@ -209,7 +209,7 @@ uniform 0 float 200 uniform 4 float 201 uniform 8 float 202 todo(sm<6) draw quad -todo(sm<6) probe all rgba (201.0, 202.0, 0.0, 0.0) +todo(sm<6) probe (0,0) rgba (201.0, 202.0, 0.0, 0.0) [pixel shader fail(sm<4)] diff --git a/tests/hlsl/register-reservations-profile.shader_test b/tests/hlsl/register-reservations-profile.shader_test index 00ca86e6..a747ea6d 100644 --- a/tests/hlsl/register-reservations-profile.shader_test +++ b/tests/hlsl/register-reservations-profile.shader_test @@ -26,8 +26,8 @@ float4 main() : sv_target [test] todo(sm<6) draw quad % sm6 seems to ignore profile qualifiers entirely. -if(sm>=6) probe all rgba (1, 1, 1, 99) -if(sm<6) probe all rgba (0, 0, 0, 99) +if(sm>=6) probe (0,0) rgba (1, 1, 1, 99) +if(sm<6) probe (0,0) rgba (0, 0, 0, 99) [pixel shader todo] @@ -40,8 +40,8 @@ float4 main() : sv_target [test] todo(sm<6) draw quad -if(sm>=6) probe all rgba (1, 1, 1, 99) -if(sm<6) probe all rgba (0, 0, 0, 99) +if(sm>=6) probe (0,0) rgba (1, 1, 1, 99) +if(sm<6) probe (0,0) rgba (0, 0, 0, 99) [pixel shader todo] @@ -54,7 +54,7 @@ float4 main() : sv_target [test] todo(sm<6) draw quad -probe all rgba (1, 1, 1, 99) +probe (0, 0) rgba (1, 1, 1, 99) [pixel shader fail todo] @@ -94,7 +94,7 @@ float4 main() : sv_target [test] draw quad -probe all rgba (1, 1, 1, 99) +probe (0, 0) rgba (1, 1, 1, 99) [pixel shader todo] @@ -107,7 +107,7 @@ float4 main() : sv_target [test] todo(sm<6) draw quad -probe all rgba (1, 1, 1, 99) +probe (0, 0) rgba (1, 1, 1, 99) [pixel shader fail] @@ -129,8 +129,8 @@ float4 main() : sv_target [test] todo(sm<6) draw quad -if(sm>=6) probe all rgba (1, 1, 1, 99) -if(sm<6) probe all rgba (0, 0, 0, 99) +if(sm>=6) probe (0,0) rgba (1, 1, 1, 99) +if(sm<6) probe (0,0) rgba (0, 0, 0, 99) [pixel shader todo] @@ -143,7 +143,7 @@ float4 main() : sv_target [test] todo(sm<6) draw quad -probe all rgba (2, 2, 2, 99) +probe (0, 0) rgba (2, 2, 2, 99) % The documentation explicitly gives this case as an example, implying that a % more specific profile takes precedence over a less specific one. It doesn't. @@ -164,8 +164,8 @@ float4 main() : sv_target [test] todo(sm<6) draw quad -if(sm>=6) probe all rgba (2, 2, 2, 99) -if(sm<6) probe all rgba (1, 1, 1, 99) +if(sm>=6) probe (0,0) rgba (2, 2, 2, 99) +if(sm<6) probe (0,0) rgba (1, 1, 1, 99) [pixel shader fail(sm<6) todo] @@ -178,7 +178,7 @@ float4 main() : sv_target [test] draw quad -probe all rgba (2, 2, 2, 99) +probe (0, 0) rgba (2, 2, 2, 99) [pixel shader fail(sm<6) todo] @@ -191,7 +191,7 @@ float4 main() : sv_target [test] draw quad -probe all rgba (2, 2, 2, 99) +probe (0, 0) rgba (2, 2, 2, 99) [pixel shader fail(sm<6) todo] @@ -204,7 +204,7 @@ float4 main() : sv_target [test] draw quad -probe all rgba (2, 2, 2, 99) +probe (0, 0) rgba (2, 2, 2, 99) [pixel shader fail todo] @@ -258,4 +258,4 @@ float4 main() : sv_target [test] todo(sm<6) draw quad -probe all rgba (1, 1, 1, 99) +probe (0, 0) rgba (1, 1, 1, 99) diff --git a/tests/hlsl/register-reservations-resources.shader_test b/tests/hlsl/register-reservations-resources.shader_test index a618c979..15bd814b 100644 --- a/tests/hlsl/register-reservations-resources.shader_test +++ b/tests/hlsl/register-reservations-resources.shader_test @@ -35,7 +35,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (41.0, 41.0, 41.0, 1089.0) +probe (0, 0) rgba (41.0, 41.0, 41.0, 1089.0) % If no component in a texture array is used, and it doesn't have a register reservation, no @@ -51,7 +51,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 99.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 99.0) % Register reservations force to reserve all the resource registers. Even if unused. @@ -66,7 +66,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 99.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 99.0) % Register reservation with incorrect register type. @@ -85,14 +85,14 @@ shader model < 6.0 [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 99.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 99.0) [require] shader model >= 6.0 [test] draw quad -probe all rgba (1.0, 1.0, 1.0, 99.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 99.0) [require] shader model >= 4.0 @@ -111,7 +111,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 99.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 99.0) [pixel shader] Texture2D unused[2][2] : register(t0); @@ -124,7 +124,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (4.0, 4.0, 4.0, 99.0) +probe (0, 0) rgba (4.0, 4.0, 4.0, 99.0) % Overlapping reservations, both overlapping objects are unused. @@ -140,7 +140,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 99.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 99.0) % Overlapping reservations @@ -155,7 +155,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 2.0, 2.0, 99.0) +probe (0, 0) rgba (2.0, 2.0, 2.0, 99.0) [pixel shader] @@ -169,7 +169,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 2.0, 2.0, 99.0) +probe (0, 0) rgba (2.0, 2.0, 2.0, 99.0) [require] @@ -225,7 +225,7 @@ float4 main() : sv_target [test] todo(sm<6) draw quad -todo(sm<6) probe all rgba (0.5, 0.5, 0.5, 99.0) +todo(sm<6) probe (0,0) rgba (0.5, 0.5, 0.5, 99.0) [pixel shader] @@ -242,4 +242,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 99.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 99.0) diff --git a/tests/hlsl/register-reservations-space.shader_test b/tests/hlsl/register-reservations-space.shader_test index bc5aef1b..48fac6f4 100644 --- a/tests/hlsl/register-reservations-space.shader_test +++ b/tests/hlsl/register-reservations-space.shader_test @@ -27,7 +27,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1, 1, 1, 99) +probe (0, 0) rgba (1, 1, 1, 99) [pixel shader fail(sm>=6)] @@ -40,7 +40,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1, 1, 1, 99) +probe (0, 0) rgba (1, 1, 1, 99) [pixel shader fail todo] @@ -62,7 +62,7 @@ float4 main() : sv_target [test] draw quad -probe all rgba (0, 0, 0, 99) +probe (0, 0) rgba (0, 0, 0, 99) [pixel shader fail(sm<6)] @@ -75,7 +75,7 @@ float4 main() : sv_target [test] draw quad -probe all rgba (0, 0, 0, 99) +probe (0, 0) rgba (0, 0, 0, 99) % Specifying a profile is just broken. The first reservation (or, with sm6, the @@ -91,8 +91,8 @@ float4 main() : sv_target [test] todo(sm<6) draw quad -if(sm>=6) probe all rgba (2, 2, 2, 99) -if(sm<6) probe all rgba (1, 1, 1, 99) +if(sm>=6) probe (0,0) rgba (2, 2, 2, 99) +if(sm<6) probe (0,0) rgba (1, 1, 1, 99) % This actually inheres to 5.1+; it doesn't matter whether "space" is specified. @@ -107,8 +107,8 @@ float4 main() : sv_target [test] todo(sm<6) draw quad -if(sm>=6) probe all rgba (2, 2, 2, 99) -if(sm<6) probe all rgba (1, 1, 1, 99) +if(sm>=6) probe (0,0) rgba (2, 2, 2, 99) +if(sm<6) probe (0,0) rgba (1, 1, 1, 99) % It's still illegal to specify multiple contradictory reservations with the @@ -135,8 +135,8 @@ float4 main() : sv_target [test] todo(sm<6) draw quad -if(sm>=6) probe all rgba (2, 2, 2, 99) -if(sm<6) probe all rgba (1, 1, 1, 99) +if(sm>=6) probe (0,0) rgba (2, 2, 2, 99) +if(sm<6) probe (0,0) rgba (1, 1, 1, 99) % Test conflicts. diff --git a/tests/hlsl/return-implicit-conversion.shader_test b/tests/hlsl/return-implicit-conversion.shader_test index 513be7df..2b29d0fd 100644 --- a/tests/hlsl/return-implicit-conversion.shader_test +++ b/tests/hlsl/return-implicit-conversion.shader_test @@ -6,7 +6,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.4, 0.3, 0.2, 0.1) +probe (0, 0) rgba (0.4, 0.3, 0.2, 0.1) [pixel shader] float4 main() : sv_target @@ -16,7 +16,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.4, 0.3, 0.2, 0.1) +probe (0, 0) rgba (0.4, 0.3, 0.2, 0.1) [pixel shader] float4 main() : sv_target @@ -26,7 +26,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.4, 0.3, 0.2, 0.1) +probe (0, 0) rgba (0.4, 0.3, 0.2, 0.1) [pixel shader] float4x1 main() : sv_target @@ -36,7 +36,7 @@ float4x1 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.4, 0.3, 0.2, 0.1) +probe (0, 0) rgba (0.4, 0.3, 0.2, 0.1) [pixel shader] float3 func() @@ -51,7 +51,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.4, 0.3, 0.2, 0.0) +probe (0, 0) rgba (0.4, 0.3, 0.2, 0.0) [pixel shader] float3 func() @@ -66,7 +66,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.4, 0.3, 0.2, 0.0) +probe (0, 0) rgba (0.4, 0.3, 0.2, 0.0) [pixel shader] float1x3 func() @@ -81,7 +81,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.4, 0.3, 0.2, 0.0) +probe (0, 0) rgba (0.4, 0.3, 0.2, 0.0) [pixel shader] float3x1 func() @@ -96,7 +96,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.4, 0.3, 0.2, 0.0) +probe (0, 0) rgba (0.4, 0.3, 0.2, 0.0) [pixel shader fail] float3x1 func() @@ -133,7 +133,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.4, 0.3, 0.2, 0.0) +probe (0, 0) rgba (0.4, 0.3, 0.2, 0.0) [pixel shader] float3 func() @@ -148,7 +148,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.4, 0.3, 0.2, 0.0) +probe (0, 0) rgba (0.4, 0.3, 0.2, 0.0) [pixel shader] float3 func() @@ -163,7 +163,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.4, 0.3, 0.2, 0.0) +probe (0, 0) rgba (0.4, 0.3, 0.2, 0.0) [pixel shader fail(sm<6) todo] float3x1 func() @@ -189,7 +189,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.4, 0.3, 0.2, 0.0) +probe (0, 0) rgba (0.4, 0.3, 0.2, 0.0) [pixel shader fail] float3x1 func() @@ -215,7 +215,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.4, 0.3, 0.2, 0.0) +probe (0, 0) rgba (0.4, 0.3, 0.2, 0.0) [pixel shader fail] float1x3 func() @@ -241,4 +241,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.4, 0.3, 0.2, 0.0) +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 2195f749..138a2a79 100644 --- a/tests/hlsl/return.shader_test +++ b/tests/hlsl/return.shader_test @@ -10,7 +10,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) [pixel shader] @@ -23,7 +23,7 @@ void main(out float4 ret : sv_target) [test] todo(glsl) draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) [pixel shader todo(sm<4)] uniform float f; @@ -38,10 +38,10 @@ float4 main() : sv_target [test] uniform 0 float 0.2 todo(sm<4 | glsl) draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) uniform 0 float 0.8 todo(sm<4 | glsl) draw quad -probe all rgba (0.5, 0.6, 0.7, 0.8) +probe (0, 0) rgba (0.5, 0.6, 0.7, 0.8) [pixel shader todo(sm<4)] uniform float f; @@ -64,10 +64,10 @@ void main(out float4 ret : sv_target) [test] uniform 0 float 0.2 todo(sm<4 | glsl) draw quad -probe all rgba (0.3, 0.4, 0.5, 0.6) +probe (0, 0) rgba (0.3, 0.4, 0.5, 0.6) uniform 0 float 0.8 todo(sm<4 | glsl) draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) [pixel shader todo(sm<4)] uniform float f; @@ -90,13 +90,13 @@ void main(out float4 ret : sv_target) [test] uniform 0 float 0.1 todo(sm<4 | glsl) draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) 1 +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) 1 uniform 0 float 0.5 todo(sm<4 | glsl) draw quad -probe all rgba (0.2, 0.3, 0.4, 0.5) 1 +probe (0, 0) rgba (0.2, 0.3, 0.4, 0.5) 1 uniform 0 float 0.9 todo(sm<4 | glsl) draw quad -probe all rgba (0.5, 0.6, 0.7, 0.8) 1 +probe (0, 0) rgba (0.5, 0.6, 0.7, 0.8) 1 [pixel shader todo(sm<4)] uniform float f; @@ -116,13 +116,13 @@ void main(out float4 ret : sv_target) [test] uniform 0 float 0.1 todo(sm<4 | glsl) draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) 1 +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) 1 uniform 0 float 0.5 todo(sm<4 | glsl) draw quad -probe all rgba (0.5, 0.6, 0.7, 0.8) 1 +probe (0, 0) rgba (0.5, 0.6, 0.7, 0.8) 1 uniform 0 float 0.9 todo(sm<4 | glsl) draw quad -probe all rgba (0.4, 0.5, 0.6, 0.7) 1 +probe (0, 0) rgba (0.4, 0.5, 0.6, 0.7) 1 [pixel shader todo(sm<4)] void main(out float4 ret : sv_target) @@ -139,7 +139,7 @@ void main(out float4 ret : sv_target) [test] todo(sm<4 | glsl) draw quad -probe all rgba (0.2, 0.4, 0.6, 0.8) +probe (0, 0) rgba (0.2, 0.4, 0.6, 0.8) [pixel shader todo(sm<4)] uniform float f; @@ -161,23 +161,23 @@ void main(out float4 ret : sv_target) [test] uniform 0 float 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (0.1, 0.1, 0.1, 0.1) 1 +probe (0, 0) rgba (0.1, 0.1, 0.1, 0.1) 1 uniform 0 float 0.1 todo(sm<4 | glsl) draw quad -probe all rgba (0.2, 0.2, 0.2, 0.2) 1 +probe (0, 0) rgba (0.2, 0.2, 0.2, 0.2) 1 uniform 0 float 0.3 todo(sm<4 | glsl) draw quad -probe all rgba (0.4, 0.4, 0.4, 0.4) 1 +probe (0, 0) rgba (0.4, 0.4, 0.4, 0.4) 1 uniform 0 float 0.7 todo(sm<4 | glsl) draw quad -probe all rgba (0.8, 0.8, 0.8, 0.8) 1 +probe (0, 0) rgba (0.8, 0.8, 0.8, 0.8) 1 uniform 0 float 0.9 todo(sm<4 | glsl) draw quad -probe all rgba (0.9, 0.9, 0.9, 0.9) 1 +probe (0, 0) rgba (0.9, 0.9, 0.9, 0.9) 1 [pixel shader todo(sm<4)] uniform float f; @@ -205,10 +205,10 @@ void main(out float4 ret : sv_target) [test] uniform 0 float 0.2 todo(sm<4 | glsl) draw quad -probe all rgba (0.2, 0.2, 0.2, 0.2) +probe (0, 0) rgba (0.2, 0.2, 0.2, 0.2) uniform 0 float 0.8 todo(sm<4 | glsl) draw quad -probe all rgba (0.5, 0.5, 0.5, 0.5) +probe (0, 0) rgba (0.5, 0.5, 0.5, 0.5) [pixel shader todo(sm<4)] @@ -237,20 +237,20 @@ 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 | glsl) draw quad -probe all rgba (0.1, 0.1, 0.1, 0.1) 1 +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 | glsl) draw quad -probe all rgba (0.2, 0.2, 0.2, 0.2) 1 +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 | glsl) draw quad -probe all rgba (0.4, 0.4, 0.4, 0.4) 1 +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 | glsl) draw quad -probe all rgba (0.4, 0.4, 0.4, 0.4) 1 +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 | glsl) draw quad -probe all rgba (0.9, 0.9, 0.9, 0.9) 1 +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 a77e1b55..5c4b5c56 100644 --- a/tests/hlsl/round.shader_test +++ b/tests/hlsl/round.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.4 -6.6 7.6 3.4 todo(glsl) draw quad -probe all rgba (0.0, -7.0, 8.0, 3.0) 4 +probe (0, 0) rgba (0.0, -7.0, 8.0, 3.0) 4 @@ -27,7 +27,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.4 -6.6 7.6 3.4 todo(glsl) draw quad -probe all rgba (-7.0, 8.0, 0.0, 3.0) 4 +probe (0, 0) rgba (-7.0, 8.0, 0.0, 3.0) 4 @@ -43,4 +43,4 @@ float4 main() : sv_target [test] uniform 0 float4 -1 0 2 10 todo(glsl) draw quad -probe all rgba (-1.0, 0.0, 2.0, 10.0) 4 +probe (0, 0) rgba (-1.0, 0.0, 2.0, 10.0) 4 diff --git a/tests/hlsl/rt-get-sample-info.shader_test b/tests/hlsl/rt-get-sample-info.shader_test index 9c4ea2fb..c552f17b 100644 --- a/tests/hlsl/rt-get-sample-info.shader_test +++ b/tests/hlsl/rt-get-sample-info.shader_test @@ -14,7 +14,7 @@ float4 main() : sv_target [test] todo(sm<6) draw quad -probe all rgba (4.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (4.0, 0.0, 0.0, 0.0) [pixel shader todo] @@ -28,7 +28,7 @@ float4 main() : sv_target [test] uniform 0 uint 0 todo(sm<6) draw quad -probe all rgba (-0.125, -0.375, 0.375, -0.125) +probe (0, 0) rgba (-0.125, -0.375, 0.375, -0.125) uniform 0 uint 2 todo(sm<6) draw quad -probe all rgba (-0.375, 0.125, 0.125, 0.375) +probe (0, 0) rgba (-0.375, 0.125, 0.125, 0.375) diff --git a/tests/hlsl/sample-bias.shader_test b/tests/hlsl/sample-bias.shader_test index debe2415..17926380 100644 --- a/tests/hlsl/sample-bias.shader_test +++ b/tests/hlsl/sample-bias.shader_test @@ -33,15 +33,15 @@ float4 main(float2 coord : texcoord) : sv_target [test] uniform 0 float4 6.5 0.0 0.0 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (10.0, 0.0, 10.0, 0.0) +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 | glsl) draw quad -probe all rgba (4.0, 0.0, 10.0, 0.0) +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 | glsl) draw quad -probe all rgba (0.0, 0.0, 10.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 10.0, 0.0) [require] shader model >= 3.0 @@ -61,12 +61,12 @@ float4 main(float2 coord : texcoord) : sv_target [test] uniform 0 float4 6.5 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (10.0, 0.0, 10.0, 0.0) +probe (0, 0) rgba (10.0, 0.0, 10.0, 0.0) uniform 0 float4 7.5 0.0 0.0 0.0 todo(glsl) draw quad -todo(sm<4) probe all rgba (4.0, 0.0, 10.0, 0.0) +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 todo(glsl) draw quad -todo(sm<4) probe all rgba (0.0, 0.0, 10.0, 0.0) +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 c25faf23..0546d793 100644 --- a/tests/hlsl/sample-cmp.shader_test +++ b/tests/hlsl/sample-cmp.shader_test @@ -28,7 +28,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0) [sampler 0] filter linear linear linear @@ -37,7 +37,7 @@ comparison less [test] todo(glsl) draw quad -probe all rgba (1.0, 0.0, 0.0, 1.0) +probe (0, 0) rgba (1.0, 0.0, 0.0, 1.0) [sampler 0] filter linear linear linear @@ -46,7 +46,7 @@ comparison equal [test] todo(glsl) draw quad -probe all rgba (0.0, 1.0, 0.0, 1.0) +probe (0, 0) rgba (0.0, 1.0, 0.0, 1.0) [sampler 0] filter linear linear linear @@ -55,7 +55,7 @@ comparison less equal [test] todo(glsl) draw quad -probe all rgba (1.0, 1.0, 0.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 0.0, 1.0) [sampler 0] filter linear linear linear @@ -64,7 +64,7 @@ comparison greater [test] todo(glsl) draw quad -probe all rgba (0.0, 0.0, 1.0, 1.0) +probe (0, 0) rgba (0.0, 0.0, 1.0, 1.0) [sampler 0] filter linear linear linear @@ -73,7 +73,7 @@ comparison not equal [test] todo(glsl) draw quad -probe all rgba (1.0, 0.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 0.0, 1.0, 1.0) [sampler 0] filter linear linear linear @@ -82,7 +82,7 @@ comparison greater equal [test] todo(glsl) draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0) [sampler 0] filter linear linear linear @@ -91,7 +91,7 @@ comparison always [test] todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [sampler 0] @@ -119,7 +119,7 @@ float4 main() : sv_target uniform 0 float 0.5 uniform 1 float 0.00000007 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 1.0, 1.0) +probe (0, 0) rgba (0.0, 0.0, 1.0, 1.0) [pixel shader] @@ -141,4 +141,4 @@ float4 main() : sv_target [test] uniform 0 float 0.5 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 1.0, 1.0) +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 a1aa8818..aa77d248 100644 --- a/tests/hlsl/sample-grad.shader_test +++ b/tests/hlsl/sample-grad.shader_test @@ -27,10 +27,10 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (1.0, 0.0, 1.0, 0.0) +probe (0, 0) rgba (1.0, 0.0, 1.0, 0.0) uniform 0 float4 1.0 1.0 1.0 1.0 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 1.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 1.0, 0.0) uniform 0 float4 2.0 2.0 2.0 2.0 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 1.0, 0.0) +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 177f4afa..da6e2653 100644 --- a/tests/hlsl/sample-level.shader_test +++ b/tests/hlsl/sample-level.shader_test @@ -27,13 +27,13 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (1.0, 0.0, 1.0, 0.0) +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 | glsl) draw quad -probe all rgba (0.5, 0.0, 1.0, 0.0) +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 | glsl) draw quad -probe all rgba (0.0, 0.0, 1.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 1.0, 0.0) [require] shader model >= 3.0 @@ -51,10 +51,10 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (1.0, 0.0, 1.0, 0.0) +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 | glsl) draw quad -probe all rgba (0.5, 0.0, 1.0, 0.0) +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 | glsl) draw quad -probe all rgba (0.0, 0.0, 1.0, 0.0) +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 267e893a..75016ce4 100644 --- a/tests/hlsl/sampler-offset.shader_test +++ b/tests/hlsl/sampler-offset.shader_test @@ -23,7 +23,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.1, 0.2, 0.5, 0.0) +probe (0, 0) rgba (0.1, 0.2, 0.5, 0.0) [pixel shader] @@ -37,7 +37,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.2, 0.2, 0.0, 0.4) +probe (0, 0) rgba (0.2, 0.2, 0.0, 0.4) [pixel shader] @@ -51,4 +51,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.0, 0.2, 0.0, 0.4) +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 c5fe9cb7..63063b0c 100644 --- a/tests/hlsl/sampler.shader_test +++ b/tests/hlsl/sampler.shader_test @@ -18,7 +18,7 @@ float4 main() : sv_target [test] todo(sm<4 | glsl) draw quad -probe all rgba (0.25, 0, 0.25, 0) +probe (0, 0) rgba (0.25, 0, 0.25, 0) [pixel shader todo(sm<4)] SamplerState s; @@ -31,7 +31,7 @@ float4 main() : sv_target [test] todo(sm<4 | glsl) draw quad -probe all rgba (0.25, 0, 0.25, 0) +probe (0, 0) rgba (0.25, 0, 0.25, 0) [pixel shader fail] sampler2D s; diff --git a/tests/hlsl/saturate.shader_test b/tests/hlsl/saturate.shader_test index c74c9374..cbc52635 100644 --- a/tests/hlsl/saturate.shader_test +++ b/tests/hlsl/saturate.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.7 -0.1 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.7, 0.0, 1.0, 0.0) +probe (0, 0) rgba (0.7, 0.0, 1.0, 0.0) [pixel shader] uniform float4 u; @@ -23,4 +23,4 @@ float4 main() : sv_target [test] uniform 0 float4 -2 0 2 -1 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 1.0, 0.0) +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 8a2afb5f..099bcc4a 100644 --- a/tests/hlsl/shader-interstage-interface.shader_test +++ b/tests/hlsl/shader-interstage-interface.shader_test @@ -53,4 +53,4 @@ void main(float4 position : SV_Position, float2 t0 : TEXCOORD0, [test] todo(glsl) draw triangle strip 4 -probe all rgba (10.0, 8.0, 7.0, 3.0) +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 2885e053..2a7c735f 100644 --- a/tests/hlsl/shape.shader_test +++ b/tests/hlsl/shape.shader_test @@ -8,7 +8,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (3.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (3.0, 0.0, 0.0, 0.0) [pixel shader] float4 main() : sv_target @@ -20,7 +20,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 3.0, 0.0, 0.0) +probe (0, 0) rgba (2.0, 3.0, 0.0, 0.0) [pixel shader] float4 main() : sv_target @@ -32,7 +32,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 3.0, 4.0, 5.0) +probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) [pixel shader] float4 main() : sv_target @@ -44,7 +44,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 4.0, 0.0, 0.0) +probe (0, 0) rgba (2.0, 4.0, 0.0, 0.0) [pixel shader] float4 main() : sv_target @@ -56,7 +56,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 2.0, 0.0, 0.0) +probe (0, 0) rgba (2.0, 2.0, 0.0, 0.0) [pixel shader] float4 main() : sv_target @@ -68,7 +68,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 3.0, 4.0, 5.0) +probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) [pixel shader] float4 main() : sv_target @@ -80,7 +80,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 3.0, 4.0, 5.0) +probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) [pixel shader] float4 main() : sv_target @@ -94,7 +94,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 4.0, 7.0, 9.0) +probe (0, 0) rgba (2.0, 4.0, 7.0, 9.0) [pixel shader] float4 main() : sv_target @@ -108,7 +108,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 4.0, 7.0, 9.0) +probe (0, 0) rgba (2.0, 4.0, 7.0, 9.0) [pixel shader] float4 main() : sv_target @@ -123,7 +123,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 4.0, 6.0, 8.0) +probe (0, 0) rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] float4 main() : sv_target @@ -138,7 +138,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 4.0, 6.0, 8.0) +probe (0, 0) rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] float4 main() : sv_target @@ -153,7 +153,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 7.0, 12.0, 17.0) +probe (0, 0) rgba (2.0, 7.0, 12.0, 17.0) [pixel shader] float4 main() : sv_target @@ -168,7 +168,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 7.0, 12.0, 17.0) +probe (0, 0) rgba (2.0, 7.0, 12.0, 17.0) [pixel shader] float4 main() : sv_target @@ -184,7 +184,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 4.0, 6.0, 0.0) +probe (0, 0) rgba (2.0, 4.0, 6.0, 0.0) [pixel shader] float4 main() : sv_target @@ -200,7 +200,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (9.0, 11.0, 13.0, 0.0) +probe (0, 0) rgba (9.0, 11.0, 13.0, 0.0) [pixel shader] float4 main() : sv_target @@ -212,7 +212,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 4.0, 6.0, 8.0) +probe (0, 0) rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] float4 main() : sv_target @@ -224,7 +224,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 4.0, 6.0, 8.0) +probe (0, 0) rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] float4 main() : sv_target @@ -236,7 +236,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 4.0, 6.0, 8.0) +probe (0, 0) rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] float4 main() : sv_target @@ -248,7 +248,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 4.0, 6.0, 8.0) +probe (0, 0) rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] float4 main() : sv_target @@ -261,7 +261,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 4.0, 6.0, 8.0) +probe (0, 0) rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] float4 main() : sv_target @@ -274,7 +274,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 4.0, 6.0, 8.0) +probe (0, 0) rgba (2.0, 4.0, 6.0, 8.0) [pixel shader] float4 main() : sv_target @@ -286,7 +286,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 3.0, 4.0, 5.0) +probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) [pixel shader] float4 main() : sv_target @@ -298,7 +298,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 3.0, 4.0, 5.0) +probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) [pixel shader] float4 main() : sv_target @@ -310,7 +310,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 4.0, 0.0, 0.0) +probe (0, 0) rgba (2.0, 4.0, 0.0, 0.0) [pixel shader] float4 main() : sv_target @@ -322,7 +322,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 4.0, 0.0, 0.0) +probe (0, 0) rgba (2.0, 4.0, 0.0, 0.0) [pixel shader] float4 main() : sv_target @@ -337,7 +337,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 3.0, 4.0, 5.0) +probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) [pixel shader] float4 main() : sv_target @@ -352,4 +352,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (6.0, 7.0, 8.0, 9.0) +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 9ac4424e..50ada2cc 100644 --- a/tests/hlsl/side-effects.shader_test +++ b/tests/hlsl/side-effects.shader_test @@ -8,7 +8,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [pixel shader] @@ -24,7 +24,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (11.0, 11.0, 11.0, 11.0) +probe (0, 0) rgba (11.0, 11.0, 11.0, 11.0) % dxcompiler performs the first call to func() before the array index call. @@ -49,4 +49,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.2, 2.2, 2.2, 2.2) +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 27c2160e..35e59792 100644 --- a/tests/hlsl/sign.shader_test +++ b/tests/hlsl/sign.shader_test @@ -9,13 +9,13 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 0.0 0.0 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +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 | glsl) draw quad -probe all rgba (-1.0, -1.0, -1.0, -1.0) +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 | glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [pixel shader todo(sm<4)] @@ -29,7 +29,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 todo(sm<4 | glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [pixel shader todo(sm<4)] @@ -44,7 +44,7 @@ float4 main() : sv_target 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 | glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [pixel shader todo(sm<4)] @@ -59,15 +59,15 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 1 0 0 0 if(sm>=4) uniform 0 int4 1 0 0 0 todo(sm<4 | glsl) draw quad -probe all rgba (1, 1, 1, 1) +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 | glsl) draw quad -probe all rgba (-1, -1, -1, -1) +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 | glsl) draw quad -probe all rgba (0, 0, 0, 0) +probe (0, 0) rgba (0, 0, 0, 0) [pixel shader todo(sm<4)] @@ -82,7 +82,7 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 1 2 3 4 if(sm>=4) uniform 0 int4 1 2 3 4 todo(sm<4 | glsl) draw quad -probe all rgba (1, 1, 1, 1) +probe (0, 0) rgba (1, 1, 1, 1) [pixel shader todo(sm<4)] @@ -99,4 +99,4 @@ 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 | glsl) draw quad -probe all rgba (1, 1, 1, 1) +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 9c223972..20b2e2b0 100644 --- a/tests/hlsl/single-numeric-initializer.shader_test +++ b/tests/hlsl/single-numeric-initializer.shader_test @@ -7,7 +7,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (7.0, 7.0, 7.0, 7.0) +probe (0, 0) rgba (7.0, 7.0, 7.0, 7.0) [pixel shader] @@ -23,4 +23,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (7.0, 7.0, 7.0, 8.0) +probe (0, 0) rgba (7.0, 7.0, 7.0, 8.0) diff --git a/tests/hlsl/sm1-const-allocation.shader_test b/tests/hlsl/sm1-const-allocation.shader_test index 3b14c42a..86f9e5f9 100644 --- a/tests/hlsl/sm1-const-allocation.shader_test +++ b/tests/hlsl/sm1-const-allocation.shader_test @@ -26,7 +26,7 @@ float4 main() : sv_target uniform 0 float4 1 2 3 4 uniform 4 float4 100 200 300 400 draw quad -probe all rgba (101, 202, 303, 404) +probe (0, 0) rgba (101, 202, 303, 404) [pixel shader] @@ -50,7 +50,7 @@ uniform 0 float4 1 2 3 4 uniform 4 float4 11 12 13 14 uniform 8 float4 21 22 23 24 draw quad -probe all rgba (21, 22, 23, 11) +probe (0, 0) rgba (21, 22, 23, 11) [pixel shader] @@ -76,7 +76,7 @@ uniform 8 float4 21 22 23 24 uniform 12 float4 31 32 33 34 uniform 16 float4 41 42 43 44 draw quad -probe all rgba (41, 21, 0, 0) +probe (0, 0) rgba (41, 21, 0, 0) [pixel shader] @@ -103,7 +103,7 @@ uniform 12 float4 31 32 33 34 uniform 16 float4 41 42 43 44 uniform 20 float4 51 52 53 54 draw quad -probe all rgba (21, 51, 0, 0) +probe (0, 0) rgba (21, 51, 0, 0) [pixel shader] @@ -130,7 +130,7 @@ uniform 12 float4 31 32 33 34 uniform 16 float4 41 42 43 44 uniform 20 float4 51 52 53 54 draw quad -probe all rgba (51, 21, 0, 0) +probe (0, 0) rgba (51, 21, 0, 0) [pixel shader] @@ -154,7 +154,7 @@ uniform 4 float4 11 12 13 14 uniform 8 float4 21 22 23 24 uniform 12 float4 31 32 33 34 draw quad -probe all rgba (31, 32, 11, 12) +probe (0, 0) rgba (31, 32, 11, 12) [pixel shader] @@ -188,7 +188,7 @@ uniform 16 float4 41 42 43 44 uniform 20 float4 51 52 53 54 uniform 24 float4 61 62 63 64 draw quad -probe all rgba (31, 52, 61, 62) +probe (0, 0) rgba (31, 52, 61, 62) [pixel shader] @@ -224,7 +224,7 @@ uniform 20 float4 51 52 53 54 uniform 24 float4 61 62 63 64 uniform 28 float4 71 72 73 74 draw quad -probe all rgba (74, 31, 63, 0) +probe (0, 0) rgba (74, 31, 63, 0) [pixel shader] @@ -253,7 +253,7 @@ uniform 0 float4 1 2 3 4 uniform 4 float4 11 12 13 14 uniform 8 float4 21 22 23 24 draw quad -probe all rgba (21, 22, 1, 11) +probe (0, 0) rgba (21, 22, 1, 11) [pixel shader] @@ -282,7 +282,7 @@ uniform 16 float 4 uniform 20 float 5 uniform 24 float 6 draw quad -probe all rgba (1, 6, 0, 0) +probe (0, 0) rgba (1, 6, 0, 0) [pixel shader] @@ -311,7 +311,7 @@ uniform 16 float 4 uniform 20 float 5 uniform 24 float 6 draw quad -probe all rgba (1, 6, 0, 0) +probe (0, 0) rgba (1, 6, 0, 0) [pixel shader] @@ -339,7 +339,7 @@ uniform 16 float 4 uniform 20 float 5 uniform 24 float 6 draw quad -probe all rgba (0, 6, 0, 0) +probe (0, 0) rgba (0, 6, 0, 0) [pixel shader] @@ -372,7 +372,7 @@ uniform 16 float 4 uniform 20 float 5 uniform 24 float 6 draw quad -probe all rgba (6, 1, 0, 0) +probe (0, 0) rgba (6, 1, 0, 0) [pixel shader todo] @@ -406,7 +406,7 @@ uniform 12 float 3 uniform 16 float 4 uniform 20 float 3 todo draw quad -probe all rgba (3, 3, 3, 3) +probe (0, 0) rgba (3, 3, 3, 3) uniform 20 float 1 todo draw quad -probe all rgba (1, 1, 1, 1) +probe (0, 0) rgba (1, 1, 1, 1) diff --git a/tests/hlsl/sm1-const-folding.shader_test b/tests/hlsl/sm1-const-folding.shader_test index 1b010eac..2e54f52e 100644 --- a/tests/hlsl/sm1-const-folding.shader_test +++ b/tests/hlsl/sm1-const-folding.shader_test @@ -10,7 +10,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (3.0e+009, 0.0, 0.0, 0.0) +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 [pixel shader] @@ -22,8 +22,8 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -if(sm<4) todo probe all rgba (3.0e+009, 0.0, 0.0, 0.0) -if(sm>=4) probe all rgba (-1.29496730e+009, 0.0, 0.0, 0.0) +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) % On SM1-5 (FXC) the literal is considered signed independently of its value and casted to uint; % on SM1-3 compilation fails because the uint would be negative @@ -36,7 +36,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -if(sm>=4) probe all rgba (3.0e+009, 0.0, 0.0, 0.0) +if(sm>=4) probe (0,0) rgba (3.0e+009, 0.0, 0.0, 0.0) [pixel shader] float4 main() : SV_TARGET @@ -47,7 +47,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (-1.29496730e+009, 0.0, 0.0, 0.0) +probe (0, 0) rgba (-1.29496730e+009, 0.0, 0.0, 0.0) [pixel shader] float4 main() : SV_TARGET @@ -57,7 +57,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (3.0e+009, 0.0, 0.0, 0.0) +probe (0, 0) rgba (3.0e+009, 0.0, 0.0, 0.0) % Unsuffixed literals can instead be considered unsigned on SM6 [pixel shader] @@ -68,8 +68,8 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -if(sm<6) probe all rgba (-1.29496730e+009, 0.0, 0.0, 0.0) -if(sm>=6) probe all rgba (3.0e+009, 0.0, 0.0, 0.0) +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) % Constant folding is done with uint semantics before converting to float; % so constant folding seems to happen before converting integer operations to floats @@ -82,7 +82,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (1.70503270e+009, 0.0, 0.0, 0.0) +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: % the sum should be done before casting to uint, and the result of the int sum should be positive, @@ -97,7 +97,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -todo probe all rgba (2.14748365e+009, 0.0, 0.0, 0.0) +todo probe (0,0) rgba (2.14748365e+009, 0.0, 0.0, 0.0) % Again, no idea of what's happening here [pixel shader] @@ -109,7 +109,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -todo probe all rgba (-2.14748365e+009, 0.0, 0.0, 0.0) +todo probe (0,0) rgba (-2.14748365e+009, 0.0, 0.0, 0.0) % This makes sense [pixel shader] @@ -120,7 +120,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (1.70503270e+009, 0.0, 0.0, 0.0) +probe (0, 0) rgba (1.70503270e+009, 0.0, 0.0, 0.0) % This does not again [pixel shader] @@ -131,7 +131,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -todo probe all rgba (-2.14748365e+009, 0.0, 0.0, 0.0) +todo probe (0,0) rgba (-2.14748365e+009, 0.0, 0.0, 0.0) % Explicit float literals use float semantics, at least [pixel shader] @@ -143,4 +143,4 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (6.0e+009, 0.0, 0.0, 0.0) +probe (0, 0) rgba (6.0e+009, 0.0, 0.0, 0.0) diff --git a/tests/hlsl/sm6-ternary.shader_test b/tests/hlsl/sm6-ternary.shader_test index f1c30af9..d17d5c26 100644 --- a/tests/hlsl/sm6-ternary.shader_test +++ b/tests/hlsl/sm6-ternary.shader_test @@ -15,10 +15,10 @@ float4 main() : sv_target [test] uniform 0 float4 2.0 3.0 4.0 5.0 draw quad -probe all rgba (2.0, 3.0, 4.0, 5.0) +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 -probe all rgba (-1.0, 9.0, 10.0, 11.0) +probe (0, 0) rgba (-1.0, 9.0, 10.0, 11.0) [pixel shader] @@ -34,7 +34,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 0.0 0.0 0.0 draw quad -probe all rgba (0.5, 0.2, 0.7, 0.0) +probe (0, 0) rgba (0.5, 0.2, 0.7, 0.0) [pixel shader fail] diff --git a/tests/hlsl/smoothstep.shader_test b/tests/hlsl/smoothstep.shader_test index 7538baee..5a584a1b 100644 --- a/tests/hlsl/smoothstep.shader_test +++ b/tests/hlsl/smoothstep.shader_test @@ -10,7 +10,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0, 0.784, 1.0, 0.559872) 1 +probe (0, 0) rgba (0, 0.784, 1.0, 0.559872) 1 [pixel shader] @@ -25,7 +25,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0, 0.104, 0.896, 1.000000) 6 +probe (0, 0) rgba (0, 0.104, 0.896, 1.000000) 6 [pixel shader] @@ -40,7 +40,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 0.352, 0, 0) 1 +probe (0, 0) rgba (1.0, 0.352, 0, 0) 1 [pixel shader] @@ -56,7 +56,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.352, 0.352, 0, 0) 1 +probe (0, 0) rgba (0.352, 0.352, 0, 0) 1 [pixel shader] @@ -72,7 +72,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.352, 0.352, 0, 0) 1 +probe (0, 0) rgba (0.352, 0.352, 0, 0) 1 [pixel shader] @@ -88,7 +88,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 1.0, 0, 0) 1 +probe (0, 0) rgba (1.0, 1.0, 0, 0) 1 [pixel shader] @@ -104,7 +104,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.028, 0.104, 0.216, 0.352) 6 +probe (0, 0) rgba (0.028, 0.104, 0.216, 0.352) 6 [pixel shader todo(sm<4)] @@ -133,7 +133,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.5, 0.5, 0.5, 0.0) +probe (0, 0) rgba (0.5, 0.5, 0.5, 0.0) [pixel shader] @@ -149,7 +149,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.5, 0.5, 0.5, 0.5) +probe (0, 0) rgba (0.5, 0.5, 0.5, 0.5) [pixel shader fail] diff --git a/tests/hlsl/sqrt.shader_test b/tests/hlsl/sqrt.shader_test index eb09389c..4868ccdf 100644 --- a/tests/hlsl/sqrt.shader_test +++ b/tests/hlsl/sqrt.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 9.0 32.3 46.5 todo(glsl) draw quad -probe all rgba (1.0, 3.0, 5.683309, 6.819091) 1 +probe (0, 0) rgba (1.0, 3.0, 5.683309, 6.819091) 1 [pixel shader] uniform float4 f; @@ -22,4 +22,4 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 9.0 4.0 16.0 todo(glsl) draw quad -probe all rgba (1.0, 0.33333333, 0.5, 0.25) 1 +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 fea85099..814e99fa 100644 --- a/tests/hlsl/srv-buffers.shader_test +++ b/tests/hlsl/srv-buffers.shader_test @@ -24,7 +24,7 @@ float4 main() : sv_target uniform 0 float4 100 200 300 400 uniform 4 float4 1000 2000 3000 4000 todo(glsl) draw quad -probe all rgba (200, 3000, 4, 7) +probe (0, 0) rgba (200, 3000, 4, 7) [pixel shader] @@ -41,7 +41,7 @@ float4 main() : sv_target uniform 0 float4 100 200 300 400 uniform 4 float4 1000 2000 3000 4000 todo(glsl) draw quad -probe all rgba (4000.0, 8.0, 9.0, 10.0) +probe (0, 0) rgba (4000.0, 8.0, 9.0, 10.0) [srv 0] @@ -68,7 +68,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (3.0, 4.0, -1.0, -1.0) +probe (0, 0) rgba (3.0, 4.0, -1.0, -1.0) [srv 0] @@ -89,7 +89,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (4.0, 5.0, 6.0, 7.0) +probe (0, 0) rgba (4.0, 5.0, 6.0, 7.0) [pixel shader] @@ -102,7 +102,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (8.0, 9.0, 10.0, 11.0) +probe (0, 0) rgba (8.0, 9.0, 10.0, 11.0) [pixel shader fail] @@ -139,10 +139,10 @@ float4 main() : sv_target [test] uniform 0 int 2 todo(glsl) draw quad -probe all rgba (8.0, 9.0, 10.0, 11.0) +probe (0, 0) rgba (8.0, 9.0, 10.0, 11.0) uniform 0 int 0 todo(glsl) draw quad -probe all rgba (0.0, 1.0, 2.0, 3.0) +probe (0, 0) rgba (0.0, 1.0, 2.0, 3.0) % Buffer doesn't have offset_dim or sample_index arguments allowed. @@ -186,4 +186,4 @@ float4 main() : sv_target } [test] todo(sm<6) draw quad -probe all rgba (4.0, 4.0, 4.0, 4.0) +probe (0, 0) rgba (4.0, 4.0, 4.0, 4.0) diff --git a/tests/hlsl/state-block-syntax.shader_test b/tests/hlsl/state-block-syntax.shader_test index fb0e7312..d85a29f5 100644 --- a/tests/hlsl/state-block-syntax.shader_test +++ b/tests/hlsl/state-block-syntax.shader_test @@ -170,7 +170,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0, 1, 0, 1) +probe (0, 0) rgba (0, 1, 0, 1) % Arbitrary names are allowed in the lhs of state block entries. diff --git a/tests/hlsl/static-initializer.shader_test b/tests/hlsl/static-initializer.shader_test index 370070c3..fc736807 100644 --- a/tests/hlsl/static-initializer.shader_test +++ b/tests/hlsl/static-initializer.shader_test @@ -13,7 +13,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.8, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.8, 0.0, 0.0, 0.0) [pixel shader fail(sm<6)] @@ -53,7 +53,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [sampler 0] @@ -148,7 +148,7 @@ float4 main() : sv_target [test] todo(sm<4 | glsl) draw quad -probe all rgba (1, 2, 3, 4) +probe (0, 0) rgba (1, 2, 3, 4) [pixel shader todo(sm<4)] @@ -164,7 +164,7 @@ float4 main() : sv_target [test] todo(sm<4 | glsl) draw quad -probe all rgba (1, 2, 3, 4) +probe (0, 0) rgba (1, 2, 3, 4) [require] diff --git a/tests/hlsl/step.shader_test b/tests/hlsl/step.shader_test index 6a76859d..fd500452 100644 --- a/tests/hlsl/step.shader_test +++ b/tests/hlsl/step.shader_test @@ -10,7 +10,7 @@ float4 main() : sv_target uniform 0 float4 5.0 -2.6 3.0 2.0 uniform 4 float4 1.0 -4.3 3.0 4.0 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 1.0, 1.0) +probe (0, 0) rgba (0.0, 0.0, 1.0, 1.0) [pixel shader] @@ -24,7 +24,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 0.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 0.0) [pixel shader fail] @@ -52,4 +52,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.0, 1.0, 1.0, 0.0) +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 ae477569..c5376c70 100644 --- a/tests/hlsl/storage-qualifiers.shader_test +++ b/tests/hlsl/storage-qualifiers.shader_test @@ -18,7 +18,7 @@ void main(in uniform float4 a, uniform float4 b, out float4 o : sv_target) 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 | glsl) draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) [pixel shader] uniform float4 a; @@ -43,4 +43,4 @@ void main(out float4 o : sv_target) uniform 0 float4 0.1 0.0 0.0 0.0 uniform 4 float4 0.2 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +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 a061927b..9026852e 100644 --- a/tests/hlsl/struct-array.shader_test +++ b/tests/hlsl/struct-array.shader_test @@ -19,4 +19,4 @@ 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 todo(glsl) draw quad -probe all rgba (0.2, 0.3, 0.6, 0.5) +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 9a66d032..16f1c0fc 100644 --- a/tests/hlsl/struct-assignment.shader_test +++ b/tests/hlsl/struct-assignment.shader_test @@ -20,4 +20,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.6, 0.3, 0.7, 0.9) 1 +probe (0, 0) rgba (0.6, 0.3, 0.7, 0.9) 1 diff --git a/tests/hlsl/struct-semantics.shader_test b/tests/hlsl/struct-semantics.shader_test index 13850be4..3698f599 100644 --- a/tests/hlsl/struct-semantics.shader_test +++ b/tests/hlsl/struct-semantics.shader_test @@ -60,4 +60,4 @@ struct output main(struct input i) [test] todo(glsl) draw triangle strip 4 -probe all rgba (0.0, 1.0, 0.0, 1.0) +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 a3e4dd32..38879add 100644 --- a/tests/hlsl/switch.shader_test +++ b/tests/hlsl/switch.shader_test @@ -18,15 +18,15 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 3 0 0 0 if(sm>=4) uniform 0 uint4 3 0 0 0 todo(sm<4 | glsl) draw quad -probe all rgba (5.0, 5.0, 5.0, 5.0) +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 | glsl) draw quad -probe all rgba (4.0, 4.0, 4.0, 4.0) +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 | glsl) draw quad -probe all rgba (3.0, 3.0, 3.0, 3.0) +probe (0, 0) rgba (3.0, 3.0, 3.0, 3.0) % just a default case @@ -46,15 +46,15 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 3 0 0 0 if(sm>=4) uniform 0 uint4 3 0 0 0 todo(sm<4 | glsl) draw quad -probe all rgba (5.0, 5.0, 5.0, 5.0) +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 | glsl) draw quad -probe all rgba (5.0, 5.0, 5.0, 5.0) +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 | glsl) draw quad -probe all rgba (5.0, 5.0, 5.0, 5.0) +probe (0, 0) rgba (5.0, 5.0, 5.0, 5.0) % completely empty @@ -92,15 +92,15 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 2 0 0 0 if(sm>=4) uniform 0 uint4 2 0 0 0 todo(sm<4 | glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +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 | glsl) draw quad -probe all rgba (1.1, 2.0, 3.0, 4.0) +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 | glsl) draw quad -probe all rgba (1.1, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.1, 2.0, 3.0, 4.0) % case value evaluation @@ -128,11 +128,11 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 2 0 0 0 if(sm>=4) uniform 0 uint4 2 0 0 0 todo(sm<4 | glsl) draw quad -probe all rgba (1.1, 2.1, 3.1, 4.1) +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 | glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) % floats are accepted @@ -160,11 +160,11 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 2 0 0 0 if(sm>=4) uniform 0 uint4 2 0 0 0 todo(sm<4 | glsl) draw quad -probe all rgba (1.1, 2.1, 3.1, 4.1) +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 | glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader fail(sm<4 | sm>=6) todo(sm<4)] float4 v; @@ -189,10 +189,10 @@ float4 main() : sv_target [test] uniform 0 float4 2.0 0.0 0.0 0.0 todo(sm<4 | glsl) draw quad -probe all rgba (1.1, 2.1, 3.1, 4.1) +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 | glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader fail] uint4 v; @@ -391,15 +391,15 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 2 0 0 0 if(sm>=4) uniform 0 uint4 2 0 0 0 todo(sm<4 | glsl) draw quad -probe all rgba (1.1, 2.1, 3.1, 4.1) +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 | glsl) draw quad -probe all rgba (1.2, 2.2, 3.2, 4.2) +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 | glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) % switch breaks within a loop [pixel shader todo(sm<4)] @@ -432,7 +432,7 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 2 0 0 0 if(sm>=4) uniform 0 uint4 2 0 0 0 todo(sm<4 | glsl) draw quad -probe all rgba (5.0, 6.0, 7.0, 8.0) +probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) % default case placement @@ -465,15 +465,15 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 0 0 0 0 if(sm>=4) uniform 0 uint4 0 0 0 0 todo(sm<4 | glsl) draw quad -probe all rgba (4.0, 5.0, 6.0, 7.0) +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 | glsl) draw quad -probe all rgba (2.0, 3.0, 4.0, 5.0) +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 | glsl) draw quad -probe all rgba (4.0, 5.0, 6.0, 7.0) +probe (0, 0) rgba (4.0, 5.0, 6.0, 7.0) [pixel shader todo(sm<4)] @@ -506,15 +506,15 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 3 0 0 0 if(sm>=4) uniform 0 uint4 3 0 0 0 todo(sm<4 | glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +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 | glsl) draw quad -probe all rgba (4.0, 5.0, 6.0, 7.0) +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 | glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) % 'continue' is not supported in switches [pixel shader fail(sm<6)] @@ -575,11 +575,11 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 1 0 3 1 if(sm>=4) uniform 0 uint4 1 0 3 1 todo(glsl) draw quad -probe all rgba (10.0, 11.0, 12.0, 13.0) +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 todo(glsl) draw quad -probe all rgba (7.0, 8.0, 9.0, 10.0) +probe (0, 0) rgba (7.0, 8.0, 9.0, 10.0) % return from a switch nested in a loop [pixel shader fail(sm<4) todo(sm<4)] @@ -611,11 +611,11 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 0 0 3 1 if(sm>=4) uniform 0 uint4 0 0 3 1 todo(glsl) draw quad -probe all rgba (304.0, 305.0, 306.0, 307.0) +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 todo(glsl) draw quad -probe all rgba (3.0, 4.0, 5.0, 6.0) +probe (0, 0) rgba (3.0, 4.0, 5.0, 6.0) [require] shader model >= 6.0 @@ -642,10 +642,10 @@ float4 main() : sv_target [test] uniform 0 uint64_t2 2 0 draw quad -probe all rgba (5.0, 5.0, 5.0, 5.0) +probe (0, 0) rgba (5.0, 5.0, 5.0, 5.0) uniform 0 uint64_t2 0x100000002 0 draw quad -probe all rgba (4.0, 4.0, 4.0, 4.0) +probe (0, 0) rgba (4.0, 4.0, 4.0, 4.0) uniform 0 uint64_t2 0 0 draw quad -probe all rgba (3.0, 3.0, 3.0, 3.0) +probe (0, 0) rgba (3.0, 3.0, 3.0, 3.0) diff --git a/tests/hlsl/swizzle-constant-prop.shader_test b/tests/hlsl/swizzle-constant-prop.shader_test index c837e954..6dc22988 100644 --- a/tests/hlsl/swizzle-constant-prop.shader_test +++ b/tests/hlsl/swizzle-constant-prop.shader_test @@ -26,7 +26,7 @@ float4 main() : sv_target [test] uniform 0 int 4 todo(glsl) draw quad -probe all rgba (110, 210, 410, 410) +probe (0, 0) rgba (110, 210, 410, 410) [pixel shader] @@ -44,7 +44,7 @@ float4 main() : sv_target [test] uniform 0 int 3 todo(glsl) draw quad -probe all rgba (105, 5, 305, 305) +probe (0, 0) rgba (105, 5, 305, 305) [pixel shader] @@ -60,4 +60,4 @@ float4 main() : sv_target [test] uniform 0 int 1 todo(glsl) draw quad -probe all rgba (14.0, 14.0, 14.0, 14.0) +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 32b3ef85..7be73a08 100644 --- a/tests/hlsl/swizzle-matrix.shader_test +++ b/tests/hlsl/swizzle-matrix.shader_test @@ -10,7 +10,7 @@ float4 main() : sv_target uniform 0 float4 11 21 31 -1 uniform 4 float4 12 22 32 -1 todo(glsl) draw quad -probe all rgba (21.0, 31.0, 11.0, 12.0) +probe (0, 0) rgba (21.0, 31.0, 11.0, 12.0) [pixel shader] @@ -25,7 +25,7 @@ float4 main() : sv_target uniform 0 float4 11 21 31 -1 uniform 4 float4 12 22 32 -1 todo(glsl) draw quad -probe all rgba (11.0, 31.0, 12.0, 32.0) +probe (0, 0) rgba (11.0, 31.0, 12.0, 32.0) [pixel shader] @@ -41,7 +41,7 @@ uniform 0 float4 11 12 -1 -1 uniform 4 float4 21 22 -1 -1 uniform 8 float4 31 32 -1 -1 todo(glsl) draw quad -probe all rgba (11.0, 31.0, 12.0, 32.0) +probe (0, 0) rgba (11.0, 31.0, 12.0, 32.0) [pixel shader] @@ -55,7 +55,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 6.0, 1.0, 6.0) +probe (0, 0) rgba (1.0, 6.0, 1.0, 6.0) % zero-based and one-based subscripts cannot be used in the same swizzle. @@ -152,7 +152,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (40.0, 40.0, 40.0, 40.0) +probe (0, 0) rgba (40.0, 40.0, 40.0, 40.0) [pixel shader todo] @@ -170,7 +170,7 @@ float4 main() : sv_target [test] uniform 0 float4 20 30 40 -1 todo(sm<6) draw quad -todo(sm<6) probe all rgba (10.0, 20.0, 30.0, 40.0) +todo(sm<6) probe (0,0) rgba (10.0, 20.0, 30.0, 40.0) [pixel shader todo] @@ -188,7 +188,7 @@ float4 main() : sv_target [test] uniform 0 float4 20 30 80 -1 todo(sm<6) draw quad -todo(sm<6) probe all rgba (80.0, 30.0, 20.0, 10.0) +todo(sm<6) probe (0,0) rgba (80.0, 30.0, 20.0, 10.0) % Cannot repeat components when assigning to a swizzle. diff --git a/tests/hlsl/swizzles.shader_test b/tests/hlsl/swizzles.shader_test index 0bee344b..b970c25a 100644 --- a/tests/hlsl/swizzles.shader_test +++ b/tests/hlsl/swizzles.shader_test @@ -12,7 +12,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.0303 0.08 0.07 0.0202 todo(glsl) draw quad -probe all rgba (0.0101, 0.0303, 0.0202, 0.0404) +probe (0, 0) rgba (0.0101, 0.0303, 0.0202, 0.0404) [pixel shader] @@ -25,7 +25,7 @@ float4 main() : SV_target [test] todo(glsl) draw quad -probe all rgba (0.1, 0.6, 0.3, 0.5) +probe (0, 0) rgba (0.1, 0.6, 0.3, 0.5) [pixel shader] @@ -38,7 +38,7 @@ float4 main() : SV_target [test] todo(glsl) draw quad -probe all rgba (0.4, 0.3, 0.1, 0.2) +probe (0, 0) rgba (0.4, 0.3, 0.1, 0.2) [pixel shader] @@ -54,7 +54,7 @@ float4 main() : SV_target [test] todo(glsl) draw quad -probe all rgba (0.3, 0.2, 0.4, 0.1) +probe (0, 0) rgba (0.3, 0.2, 0.4, 0.1) [pixel shader] @@ -69,7 +69,7 @@ float4 main() : SV_target [test] todo(glsl) draw quad -probe all rgba (0.1, 0.2, 0.4, 0.3) +probe (0, 0) rgba (0.1, 0.2, 0.4, 0.3) [pixel shader] @@ -81,7 +81,7 @@ float4 main() : SV_target [test] todo(glsl) draw quad -probe all rgba (0.1, 0.4, 0.4, 0.1) +probe (0, 0) rgba (0.1, 0.4, 0.4, 0.1) [pixel shader] @@ -95,7 +95,7 @@ float4 main() : SV_target [test] todo(glsl) draw quad -probe all rgba (0.3, 0.1, 0.4, 0.2) +probe (0, 0) rgba (0.3, 0.1, 0.4, 0.2) [pixel shader] @@ -108,7 +108,7 @@ float4 main() : SV_target [test] todo(glsl) draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) [pixel shader] @@ -121,7 +121,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (20.0, 20.0, 20.0, 20.0) +probe (0, 0) rgba (20.0, 20.0, 20.0, 20.0) [pixel shader] @@ -134,7 +134,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 3.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 3.0) [pixel shader] @@ -150,7 +150,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader] @@ -167,4 +167,4 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 todo(glsl) draw quad -probe all rgba (1.0, 4.0, 2.0, 3.0) +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 bd68dbc3..72666df4 100644 --- a/tests/hlsl/ternary.shader_test +++ b/tests/hlsl/ternary.shader_test @@ -14,10 +14,10 @@ float4 main() : sv_target [test] uniform 0 float4 2.0 3.0 4.0 5.0 todo(glsl) draw quad -probe all rgba (2.0, 3.0, 4.0, 5.0) +probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) uniform 0 float4 0.0 10.0 11.0 12.0 todo(glsl) draw quad -probe all rgba (-1.0, 9.0, 10.0, 11.0) +probe (0, 0) rgba (-1.0, 9.0, 10.0, 11.0) [pixel shader] @@ -36,7 +36,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.1 3.0 4.0 5.0 todo(glsl) draw quad -probe all rgba (1.1, 2.0, 0.0, 0.0) +probe (0, 0) rgba (1.1, 2.0, 0.0, 0.0) [pixel shader] @@ -52,7 +52,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.5, 0.6, 0.7, 0.0) +probe (0, 0) rgba (0.5, 0.6, 0.7, 0.0) [pixel shader] @@ -68,7 +68,7 @@ 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 todo(glsl) draw quad -probe all rgba (5.0, 2.0, 7.0, 4.0) +probe (0, 0) rgba (5.0, 2.0, 7.0, 4.0) % The usual type conversion is applied to the first and second expression, as @@ -98,7 +98,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.0, 1.0, 3.0, 4.0) +probe (0, 0) rgba (0.0, 1.0, 3.0, 4.0) [pixel shader] @@ -113,7 +113,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (5.0, 6.0, 7.0, 1.0) +probe (0, 0) rgba (5.0, 6.0, 7.0, 1.0) % More restrictions are placed on the type of the first (condition) operand, @@ -158,7 +158,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 6.0, 7.0, 4.0) +probe (0, 0) rgba (1.0, 6.0, 7.0, 4.0) [pixel shader fail] @@ -200,7 +200,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 6.0, 7.0, 4.0) +probe (0, 0) rgba (1.0, 6.0, 7.0, 4.0) [pixel shader todo] @@ -216,7 +216,7 @@ float4 main() : sv_target [test] todo draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [pixel shader fail] @@ -243,7 +243,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (3.0, 3.0, 3.0, 3.0) +probe (0, 0) rgba (3.0, 3.0, 3.0, 3.0) [pixel shader] @@ -261,7 +261,7 @@ 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 todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader] @@ -278,7 +278,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (5.0, 6.0, 7.0, 8.0) +probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0) [pixel shader] @@ -296,7 +296,7 @@ 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 todo(glsl) draw quad -probe all rgba (1.0, 5.0, 1.0, 5.0) +probe (0, 0) rgba (1.0, 5.0, 1.0, 5.0) [pixel shader] @@ -313,7 +313,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 3.0, 3.0, 2.0) +probe (0, 0) rgba (2.0, 3.0, 3.0, 2.0) % Objects can be used, but their types have to be identical. diff --git a/tests/hlsl/tessellation.shader_test b/tests/hlsl/tessellation.shader_test index 77bc49ee..f5148ba0 100644 --- a/tests/hlsl/tessellation.shader_test +++ b/tests/hlsl/tessellation.shader_test @@ -95,4 +95,4 @@ float4 main(data input) : sv_target [test] todo(sm<6) draw 3 control point patch list 3 -probe all rgba (0.0, 1.0, 0.0, 1.0) +probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) diff --git a/tests/hlsl/texture-load-typed.shader_test b/tests/hlsl/texture-load-typed.shader_test index bbded28e..eef74e43 100644 --- a/tests/hlsl/texture-load-typed.shader_test +++ b/tests/hlsl/texture-load-typed.shader_test @@ -49,7 +49,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.8, -3.0, 4294967295.0, 123.0) +probe (0, 0) rgba (0.8, -3.0, 4294967295.0, 123.0) % lowercase 'texture2D' @@ -66,4 +66,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (0.8, -3.0, 4294967295.0, 123.0) +probe (0, 0) rgba (0.8, -3.0, 4294967295.0, 123.0) diff --git a/tests/hlsl/texture-ordering.shader_test b/tests/hlsl/texture-ordering.shader_test index dce1498b..1bedd3c5 100644 --- a/tests/hlsl/texture-ordering.shader_test +++ b/tests/hlsl/texture-ordering.shader_test @@ -137,7 +137,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (450, 139, 876, 333) +probe (0, 0) rgba (450, 139, 876, 333) % Same as the first test, but inverting the declaration order. @@ -190,7 +190,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (450, 138, 796, 333) +probe (0, 0) rgba (450, 138, 796, 333) % Same as the first test, but inverting the resource loads order. @@ -243,7 +243,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (478, 913, 256, 333) +probe (0, 0) rgba (478, 913, 256, 333) % We can conclude that for declared texture arrays, if they are used, the "allocation size" is the @@ -276,7 +276,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (215, 215, 215, 111) +probe (0, 0) rgba (215, 215, 215, 111) % Test that textures created from SM1-style samples allocation order is in decreasing "bind count". @@ -306,4 +306,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (5, 4, 2, 0) +probe (0, 0) rgba (5, 4, 2, 0) diff --git a/tests/hlsl/transpose.shader_test b/tests/hlsl/transpose.shader_test index 2026367a..0c819a52 100644 --- a/tests/hlsl/transpose.shader_test +++ b/tests/hlsl/transpose.shader_test @@ -6,7 +6,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (5.0, 5.0, 5.0, 5.0) +probe (0, 0) rgba (5.0, 5.0, 5.0, 5.0) [pixel shader] @@ -19,7 +19,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (5.0, 5.0, 5.0, 5.0) +probe (0, 0) rgba (5.0, 5.0, 5.0, 5.0) [pixel shader fail] @@ -40,7 +40,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (1.0, 2.0, 3.0, 4.0) +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) [pixel shader] @@ -56,7 +56,7 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 5.0, 8.0, 11.0) +probe (0, 0) rgba (2.0, 5.0, 8.0, 11.0) [pixel shader] @@ -72,4 +72,4 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe all rgba (2.0, 5.0, 8.0, 11.0) +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 cf616587..0b3e4c1a 100644 --- a/tests/hlsl/trigonometry.shader_test +++ b/tests/hlsl/trigonometry.shader_test @@ -43,7 +43,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.52359877 2.61799387 3.14159265 todo(sm<4 | glsl) draw quad -probe all rgba (0.0, 500.0, 500.0, 0.0) +probe (0, 0) rgba (0.0, 500.0, 500.0, 0.0) [pixel shader todo(sm<4)] @@ -57,7 +57,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.78539816 1.57079632 2.35619449 todo(sm<4 | glsl) draw quad -probe all rgba (1000.0, 707.0, -0.0, -707.0) +probe (0, 0) rgba (1000.0, 707.0, -0.0, -707.0) [pixel shader todo(sm<4)] @@ -73,7 +73,7 @@ float4 main() : sv_target % so check 0, pi/4, 3pi/4, pi uniform 0 float4 0.0 0.78539816 2.35619449 3.14159265 todo(sm<4 | glsl) draw quad -probe all rgba (0, 1000, -1000.0, 0) +probe (0, 0) rgba (0, 1000, -1000.0, 0) [pixel shader] @@ -87,11 +87,11 @@ float4 main() : sv_target [test] uniform 0 float4 -6.28318531 -0.88137359 0.88137359 6.28318531 todo(glsl) draw quad -probe all rgba (-267.744894, -1.0, 1.0, 267.744894) 2 +probe (0, 0) rgba (-267.744894, -1.0, 1.0, 267.744894) 2 uniform 0 float4 -0.0 0.0 -90.0 90.0 todo(glsl) draw quad % mingw does not support "inf" for scanf(), but numbers beyond FLOAT_MAX consistently result in inf. -probe all rgba (0.0, 0.0, -1.0e39, 1.0e39) 1 +probe (0, 0) rgba (0.0, 0.0, -1.0e39, 1.0e39) 1 [pixel shader] @@ -105,10 +105,10 @@ float4 main() : sv_target [test] uniform 0 float4 -1.76274717 -1.3169579 1.3169579 1.76274717 todo(glsl) draw quad -probe all rgba (3.0, 2.0, 2.0, 3.0) 2 +probe (0, 0) rgba (3.0, 2.0, 2.0, 3.0) 2 uniform 0 float4 -0.0 0.0 -90.0 90.0 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0e39, 1.0e39) 1 +probe (0, 0) rgba (1.0, 1.0, 1.0e39, 1.0e39) 1 [pixel shader] @@ -122,7 +122,7 @@ float4 main() : sv_target [test] uniform 0 float4 -1.57079633 -0.54930614 0.54930614 1.57079633 todo(glsl) draw quad -probe all rgba (-0.91715234, -0.5, 0.5, 0.91715234) 2 +probe (0, 0) rgba (-0.91715234, -0.5, 0.5, 0.91715234) 2 uniform 0 float4 -10.0 -0.0 0.0 10.0 todo(glsl) draw quad -probe all rgba (-1.0, 0.0, 0.0, 1.0) 1 +probe (0, 0) rgba (-1.0, 0.0, 0.0, 1.0) 1 diff --git a/tests/hlsl/trunc.shader_test b/tests/hlsl/trunc.shader_test index db998ff3..5e3ebd41 100644 --- a/tests/hlsl/trunc.shader_test +++ b/tests/hlsl/trunc.shader_test @@ -9,10 +9,10 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 todo(sm<4 | glsl) draw quad -probe all rgba (0.0, 6.0, 7.0, 3.0) +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 | glsl) draw quad -probe all rgba (-1.0, 6.0, 7.0, 3.0) +probe (0, 0) rgba (-1.0, 6.0, 7.0, 3.0) [pixel shader todo(sm<4)] uniform float4 u; @@ -28,7 +28,7 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 todo(sm<4 | glsl) draw quad -probe all rgba (6.0, 7.0, 0.0, 3.0) +probe (0, 0) rgba (6.0, 7.0, 0.0, 3.0) [pixel shader todo(sm<4)] @@ -46,4 +46,4 @@ float4 main() : sv_target if(sm<4) uniform 0 float4 -1 6 7 3 if(sm>=4) uniform 0 int4 -1 6 7 3 todo(sm<4 | glsl) draw quad -probe all rgba (6.0, 7.0, -1.0, 3.0) +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 2cf82dbb..55d09ddf 100644 --- a/tests/hlsl/type-names.shader_test +++ b/tests/hlsl/type-names.shader_test @@ -38,7 +38,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (2.0, 3.0, 4.0, 5.0) +probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0) % The "dword" alias is pre-defined as lowercase [pixel shader fail] diff --git a/tests/hlsl/uniform-semantics.shader_test b/tests/hlsl/uniform-semantics.shader_test index f7300266..33de9dcb 100644 --- a/tests/hlsl/uniform-semantics.shader_test +++ b/tests/hlsl/uniform-semantics.shader_test @@ -11,7 +11,7 @@ float4 main() : sv_target [test] uniform 0 float 3.5 todo(glsl) draw quad -probe all rgba (3.5, 3.5, 3.5, 3.5) +probe (0, 0) rgba (3.5, 3.5, 3.5, 3.5) [pixel shader] @@ -25,4 +25,4 @@ float4 main() : sv_target [test] uniform 0 float4 4.0 5.0 6.0 7.0 todo(glsl) draw quad -probe all rgba (4.0, 5.0, 4.0, 5.0) +probe (0, 0) rgba (4.0, 5.0, 4.0, 5.0) diff --git a/tests/hlsl/vector-indexing-uniform.shader_test b/tests/hlsl/vector-indexing-uniform.shader_test index bfe261cf..a3fe15d4 100644 --- a/tests/hlsl/vector-indexing-uniform.shader_test +++ b/tests/hlsl/vector-indexing-uniform.shader_test @@ -13,4 +13,4 @@ float4 main() : SV_TARGET [test] uniform 0 float 2 todo(glsl) draw quad -probe all rgba (0.5, 0.3, 0.8, 0.2) +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 f2634f89..45379142 100644 --- a/tests/hlsl/vector-indexing.shader_test +++ b/tests/hlsl/vector-indexing.shader_test @@ -11,7 +11,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (0.02, 0.245, 0.351, 1.0) +probe (0, 0) rgba (0.02, 0.245, 0.351, 1.0) [pixel shader] uniform float4 m; @@ -24,7 +24,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 1.0 2.0 3.0 4.0 todo(glsl) draw quad -probe all rgba (1.0, 2.0, 2.0, 3.0) +probe (0, 0) rgba (1.0, 2.0, 2.0, 3.0) [pixel shader fail(sm<6)] @@ -48,7 +48,7 @@ float4 main() : SV_TARGET [test] todo(glsl) draw quad -probe all rgba (2.0, 2.0, 2.0, 2.0) +probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) [pixel shader fail(sm<6) todo] diff --git a/tests/hlsl/vertex-shader-ops.shader_test b/tests/hlsl/vertex-shader-ops.shader_test index ea2a3df8..209e8516 100644 --- a/tests/hlsl/vertex-shader-ops.shader_test +++ b/tests/hlsl/vertex-shader-ops.shader_test @@ -29,7 +29,7 @@ void main(out float4 res : COLOR1, in float4 pos : position, out float4 out_pos if(sm<4) uniform 0 float 0.0 if(sm>=4) uniform 0 float4 0.0 0.0 0.0 0.0 todo(glsl) draw quad -probe all rgba (0.0, 0.0, 0.0, 0.0) +probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) [vertex shader] @@ -50,12 +50,12 @@ if(sm<4) uniform 0 float 3 if(sm<4) uniform 4 float 4 if(sm>=4) uniform 0 int4 3 4 0 0 todo(glsl) draw quad -probe all rgba (0.0, 1.0, 0.0, 1.0) +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 todo(glsl) draw quad -probe all rgba (1.0, 0.0, 0.0, 1.0) +probe (0, 0) rgba (1.0, 0.0, 0.0, 1.0) [vertex shader] @@ -76,12 +76,12 @@ if(sm<4) uniform 0 float 0 if(sm<4) uniform 4 float 2 if(sm>=4) uniform 0 int4 0 2 0 0 todo(glsl) draw quad -probe all rgba (0.0, 1.0, 0.0, 1.0) +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 todo(glsl) draw quad -probe all rgba (1.0, 1.0, 1.0, 1.0) +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) [require] @@ -104,10 +104,10 @@ if(sm<4) uniform 4 float 100 if(sm<4) uniform 8 float 200 if(sm>=4) uniform 0 int4 0 100 200 0 todo(glsl) draw quad -probe all rgba (0.2, 0.2, 0.2, 0.2) +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 todo(glsl) draw quad -probe all rgba (0.1, 0.1, 0.1, 0.1) +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 d0ffa7e5..c5deb0cd 100644 --- a/tests/hlsl/writemask-assignop-0.shader_test +++ b/tests/hlsl/writemask-assignop-0.shader_test @@ -12,4 +12,4 @@ float4 main() : SV_target [test] uniform 0 float4 0.0303 0.08 0.07 0.0202 todo(glsl) draw quad -probe all rgba (-0.4697, -0.02, 0.57, 0.3202) 2 +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 0e5a01f3..e45a0bc9 100644 --- a/tests/hlsl/writemask-assignop-1.shader_test +++ b/tests/hlsl/writemask-assignop-1.shader_test @@ -13,4 +13,4 @@ float4 main() : SV_target [test] uniform 0 float4 0.0303 0.08 0.07 0.0202 todo(glsl) draw quad -probe all rgba (0.5697, -0.08, -0.27, -0.4202) +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 feb6ba90..1b334824 100644 --- a/tests/hlsl/writemask-assignop-2.shader_test +++ b/tests/hlsl/writemask-assignop-2.shader_test @@ -10,4 +10,4 @@ float4 main() : SV_target [test] todo(glsl) draw quad -probe all rgba (2.1, 2.2, 0.8, 1.7) +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 895afca1..9c85f162 100644 --- a/tests/hlsl/writemask-assignop-3.shader_test +++ b/tests/hlsl/writemask-assignop-3.shader_test @@ -8,4 +8,4 @@ float4 main() : SV_target [test] todo(glsl) draw quad -probe all rgba (1.9, 1.8, 1.7, 1.6) +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 dd2f0b0d..f8e18348 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -1039,11 +1039,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) rb = runner->ops->get_resource_readback(runner, resource); - if (match_string(line, "all", &line)) - { - set_rect(&rect, 0, 0, resource->width, resource->height); - } - else if (sscanf(line, " ( %d , %d , %d , %d )%n", &left, &top, &right, &bottom, &len) == 4) + if (sscanf(line, " ( %d , %d , %d , %d )%n", &left, &top, &right, &bottom, &len) == 4) { set_rect(&rect, left, top, right, bottom); line += len;