[PATCH 0/1] MR730: tests/shader_runner: Add GLSL support to the GL runner.

[PATCH 1/1] tests/shader_runner: Add GLSL support to the GL runner.

[Henri Verbeet]

From: Henri Verbeet

---
 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 |  12 +-
 tests/hlsl/arithmetic-float.shader_test       |  12 +-
 tests/hlsl/arithmetic-int-uniform.shader_test |  16 +--
 tests/hlsl/arithmetic-int.shader_test         |  20 +--
 tests/hlsl/arithmetic-uint.shader_test        |   8 +-
 tests/hlsl/array-parameters.shader_test       |   8 +-
 tests/hlsl/array-size-expr.shader_test        |   6 +-
 tests/hlsl/asfloat.shader_test                |   4 +-
 tests/hlsl/asuint.shader_test                 |   4 +-
 tests/hlsl/bitwise.shader_test                |  24 ++--
 tests/hlsl/bool-cast.shader_test              |   6 +-
 tests/hlsl/bool-semantics.shader_test         |   2 +-
 tests/hlsl/cast-broadcast.shader_test         |   4 +-
 .../cast-componentwise-compatible.shader_test |  46 +++----
 .../hlsl/cast-componentwise-equal.shader_test |  10 +-
 tests/hlsl/cast-to-float.shader_test          |   4 +-
 tests/hlsl/cast-to-half.shader_test           |   4 +-
 tests/hlsl/cast-to-int.shader_test            |   6 +-
 tests/hlsl/cast-to-uint.shader_test           |   4 +-
 tests/hlsl/cbuffer.shader_test                |  30 ++--
 tests/hlsl/ceil.shader_test                   |   8 +-
 tests/hlsl/cf-cond-types.shader_test          |   4 +-
 tests/hlsl/clamp.shader_test                  |   4 +-
 tests/hlsl/clip.shader_test                   |   8 +-
 tests/hlsl/combined-samplers.shader_test      |  12 +-
 tests/hlsl/comma.shader_test                  |   2 +-
 tests/hlsl/compute.shader_test                |   2 +-
 tests/hlsl/conditional.shader_test            |  10 +-
 tests/hlsl/const.shader_test                  |   2 +-
 tests/hlsl/cross.shader_test                  |   4 +-
 tests/hlsl/d3dcolor-to-ubyte4.shader_test     |   4 +-
 tests/hlsl/ddxddy.shader_test                 |   8 +-
 tests/hlsl/determinant.shader_test            |  14 +-
 tests/hlsl/discard.shader_test                |   4 +-
 tests/hlsl/distance.shader_test               |   2 +-
 tests/hlsl/dot.shader_test                    |  14 +-
 tests/hlsl/duplicate-modifiers.shader_test    |   2 +-
 tests/hlsl/entry-point-semantics.shader_test  |  18 +--
 tests/hlsl/exp.shader_test                    |   4 +-
 tests/hlsl/expr-indexing.shader_test          |  14 +-
 tests/hlsl/float-comparison.shader_test       |   4 +-
 tests/hlsl/floor.shader_test                  |   8 +-
 tests/hlsl/fmod.shader_test                   |   8 +-
 tests/hlsl/for.shader_test                    |   6 +-
 tests/hlsl/frac.shader_test                   |   2 +-
 tests/hlsl/function-return.shader_test        |  38 +++---
 tests/hlsl/function.shader_test               |  14 +-
 tests/hlsl/fwidth.shader_test                 |   2 +-
 tests/hlsl/gather-offset.shader_test          |  14 +-
 tests/hlsl/gather.shader_test                 |  12 +-
 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    |  12 +-
 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           |  60 ++++----
 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       |  24 ++--
 tests/hlsl/loop.shader_test                   |  14 +-
 tests/hlsl/majority-pragma.shader_test        |  30 ++--
 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       |  12 +-
 tests/hlsl/max.shader_test                    |   6 +-
 tests/hlsl/minimum-precision.shader_test      |   4 +-
 tests/hlsl/mul.shader_test                    |  40 +++---
 tests/hlsl/multiple-rt.shader_test            |   2 +-
 tests/hlsl/nested-arrays.shader_test          |   2 +-
 tests/hlsl/nointerpolation.shader_test        |  10 +-
 tests/hlsl/non-const-indexing.shader_test     |  48 +++----
 tests/hlsl/normalize.shader_test              |  10 +-
 ...numeric-constructor-truncation.shader_test |   4 +-
 tests/hlsl/numeric-types.shader_test          |  10 +-
 tests/hlsl/numthreads.shader_test             |   2 +-
 tests/hlsl/object-field-offsets.shader_test   |   6 +-
 tests/hlsl/object-references.shader_test      |  10 +-
 tests/hlsl/pow.shader_test                    |   4 +-
 tests/hlsl/precise-modifier.shader_test       |   6 +-
 .../hlsl/rasteriser-ordered-views.shader_test |   2 +-
 tests/hlsl/reflect.shader_test                |  12 +-
 .../register-reservations-numeric.shader_test |  12 +-
 ...egister-reservations-resources.shader_test |  20 +--
 .../return-implicit-conversion.shader_test    |  28 ++--
 tests/hlsl/return.shader_test                 |  50 +++----
 tests/hlsl/round.shader_test                  |   6 +-
 tests/hlsl/sample-bias.shader_test            |   6 +-
 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-folding.shader_test      |  24 ++--
 tests/hlsl/smoothstep.shader_test             |  18 +--
 tests/hlsl/sqrt.shader_test                   |   4 +-
 tests/hlsl/srv-buffers.shader_test            |  14 +-
 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                 |  58 ++++----
 tests/hlsl/swizzle-constant-prop.shader_test  |   6 +-
 tests/hlsl/swizzle-matrix.shader_test         |  10 +-
 tests/hlsl/swizzles.shader_test               |  24 ++--
 tests/hlsl/ternary.shader_test                |  28 ++--
 tests/hlsl/texture-load-offset.shader_test    |   4 +-
 tests/hlsl/texture-load-typed.shader_test     |   4 +-
 tests/hlsl/texture-load.shader_test           |   8 +-
 tests/hlsl/texture-ordering.shader_test       |  10 +-
 tests/hlsl/transpose.shader_test              |  10 +-
 tests/hlsl/trigonometry.shader_test           |   8 +-
 tests/hlsl/trunc.shader_test                  |   8 +-
 tests/hlsl/type-names.shader_test             |   2 +-
 tests/hlsl/uav-load.shader_test               |   2 +-
 tests/hlsl/uav-out-param.shader_test          |   4 +-
 tests/hlsl/uav-rwbuffer.shader_test           |   4 +-
 tests/hlsl/uav-rwtexture.shader_test          |  10 +-
 tests/hlsl/uniform-parameters.shader_test     |   4 +-
 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                         | 108 +++++++++++----
 tests/shader_runner.h                         |   3 +
 tests/shader_runner_gl.c                      | 129 ++++++++++++++----
 159 files changed, 989 insertions(+), 859 deletions(-)

diff --git a/tests/hlsl/abs.shader_test b/tests/hlsl/abs.shader_test
index 46acdea85..fe28ae74f 100644
--- a/tests/hlsl/abs.shader_test
+++ b/tests/hlsl/abs.shader_test
@@ -8,8 +8,8 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.1 0.7 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.1, 0.7, 0.4, 0.4)
 uniform 0 float4 -0.7 0.1 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.7, 0.1, 1.2, 0.4)
diff --git a/tests/hlsl/all.shader_test b/tests/hlsl/all.shader_test
index 7bdb0dc82..728d50081 100644
--- a/tests/hlsl/all.shader_test
+++ b/tests/hlsl/all.shader_test
@@ -11,17 +11,17 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -1.1 1.6 1.3 0.5
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)

[test]
 uniform 0 float4 0.0 1.6 1.3 0.5
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0)

[test]
 uniform 0 float4 1.0 0.0 1.3 0.5
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0)

[pixel shader]
@@ -34,12 +34,12 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.0 0.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)

[test]
 uniform 0 float4 0.0 0.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0)

[pixel shader]
@@ -53,11 +53,11 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 1.0 2.0 0.0 0.0
 uniform 4 float4 3.0 4.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)

[test]
 uniform 0 float4 1.0 2.0 0.0 0.0
 uniform 4 float4 0.0 4.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all 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 407d24139..fbf853a6f 100644
--- a/tests/hlsl/angle-unit.shader_test
+++ b/tests/hlsl/angle-unit.shader_test
@@ -8,7 +8,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.0 30.0 150.0 180.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.52359877, 2.61799387, 3.14159265)

@@ -22,5 +22,5 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.0 0.78539816 1.57079632 2.35619449
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 45.0, 90.0, 135.0)
diff --git a/tests/hlsl/any.shader_test b/tests/hlsl/any.shader_test
index 45df3bdc4..b143dd414 100644
--- a/tests/hlsl/any.shader_test
+++ b/tests/hlsl/any.shader_test
@@ -8,25 +8,25 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.0 1.0 1.0 1.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)
 uniform 0 float4 1.0 0.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)
 uniform 0 float4 0.0 1.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)
 uniform 0 float4 0.0 0.0 1.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)
 uniform 0 float4 0.0 0.0 0.0 1.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)
 uniform 0 float4 0.0 0.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0)
 uniform 0 float4 -1.0 -1.0 -1.0 -1.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)

[pixel shader]
@@ -39,13 +39,13 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.0 0.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)
 uniform 0 float4 0.0 0.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0)
 uniform 0 float4 -1.0 0.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)

@@ -60,27 +60,27 @@ float4 main() : sv_target
 [test]
 if(sm<4)  uniform 0 float4 1 1 1 1
 if(sm>=4) uniform 0 uint4 1 1 1 1
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0)

[pixel shader todo(sm<4)]
@@ -94,9 +94,9 @@ float4 main() : sv_target
 [test]
 if(sm<4)  uniform 0 float4 1 0 0 0
 if(sm>=4) uniform 0 uint4 1 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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 7fcf8493d..8bc3992e7 100644
--- a/tests/hlsl/arithmetic-float-uniform.shader_test
+++ b/tests/hlsl/arithmetic-float-uniform.shader_test
@@ -10,7 +10,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 5.0 15.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (20.0, -10.0, 75.0, 0.33333333) 1

[pixel shader todo(sm<4)]
@@ -25,7 +25,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 5.0 15.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (5.0, 5.0, -5.0, 3.0) 1

[pixel shader todo(sm<4)]
@@ -40,7 +40,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 42.0 5.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (2.0, -2.0, 2.0, -2.0) 16

[pixel shader todo(sm<4)]
@@ -55,7 +55,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 45.0 5.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0)

[pixel shader todo(sm<4)]
@@ -69,7 +69,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 5.0 -42.1 4.0 45.0
 uniform 4 float4 15.0 -5.0 4.1 5.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (5.0, -2.1, 4.0, 0.0) 6

[require]
@@ -88,7 +88,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 1.0 0.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1e99, 1e99, 1e99, 1e99)

[pixel shader todo]
diff --git a/tests/hlsl/arithmetic-float.shader_test b/tests/hlsl/arithmetic-float.shader_test
index 71835082c..8220a7bf5 100644
--- a/tests/hlsl/arithmetic-float.shader_test
+++ b/tests/hlsl/arithmetic-float.shader_test
@@ -8,7 +8,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (20.0, -10.0, 75.0, 0.33333333)

[pixel shader]
@@ -21,7 +21,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (5.0, 5.0, -5.0, 3.0)

[pixel shader]
@@ -34,7 +34,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, -2.0, 2.0, -2.0) 16

[pixel shader]
@@ -47,7 +47,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0)

[pixel shader]
@@ -60,7 +60,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (5.0, -2.1, 4.0, 0.0) 6

[require]
@@ -77,5 +77,5 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1e99, 1e99, 1e99, 1e99)
diff --git a/tests/hlsl/arithmetic-int-uniform.shader_test b/tests/hlsl/arithmetic-int-uniform.shader_test
index 48e1ae1a1..e33381ab7 100644
--- a/tests/hlsl/arithmetic-int-uniform.shader_test
+++ b/tests/hlsl/arithmetic-int-uniform.shader_test
@@ -10,7 +10,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 5.0 16.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (21.0, -11.0, 80.0, 0.0)

[pixel shader todo(sm<4)]
@@ -25,7 +25,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 5.0 16.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (5.0, 5.0, -5.0, 3.0)

[pixel shader todo(sm<4)]
@@ -40,7 +40,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 42.0 5.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (8.0, -8.0, -8.0, 8.0)

[pixel shader todo(sm<4)]
@@ -55,7 +55,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 42.0 5.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (2.0, -2.0, 2.0, -2.0)

[pixel shader todo(sm<4)]
@@ -70,7 +70,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 45.0 5.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (9.0, -9.0, -9.0, 9.0)

[pixel shader todo(sm<4)]
@@ -85,7 +85,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 45.0 5.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0)

[pixel shader]
@@ -98,7 +98,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 5.0 -7.0 0.0 -10.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (5.0, 7.0, 0.0, 10.0)

[pixel shader todo(sm<4)]
@@ -117,7 +117,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 45.0 5.0 50.0 10.0
 uniform 4 float4 3.0 8.0 2.0 5.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (9.0, 5.0, 1.0, 3.0)

[require]
diff --git a/tests/hlsl/arithmetic-int.shader_test b/tests/hlsl/arithmetic-int.shader_test
index 7a64894d1..58aa70f65 100644
--- a/tests/hlsl/arithmetic-int.shader_test
+++ b/tests/hlsl/arithmetic-int.shader_test
@@ -8,7 +8,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (20.0, -10.0, 75.0, 0.0)

[pixel shader]
@@ -21,7 +21,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (5.0, 5.0, -5.0, 3.0)

[pixel shader]
@@ -34,7 +34,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (8.0, -8.0, -8.0, 8.0)

[pixel shader]
@@ -47,7 +47,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, -2.0, 2.0, -2.0)

[pixel shader]
@@ -60,7 +60,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (9.0, -9.0, -9.0, 9.0)

[pixel shader]
@@ -73,7 +73,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0)

[pixel shader fail(sm<6)]
@@ -87,7 +87,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0)

[pixel shader fail(sm<6)]
@@ -101,7 +101,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0)

@@ -118,7 +118,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+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)

@@ -134,5 +134,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all 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 c245d447d..3f4759d8e 100644
--- a/tests/hlsl/arithmetic-uint.shader_test
+++ b/tests/hlsl/arithmetic-uint.shader_test
@@ -11,7 +11,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (20.0, 4294967296.0, 75.0, 0.0)

[pixel shader]
@@ -24,7 +24,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (5.0, 5.0, 4294967296.0, 3.0)

[pixel shader fail(sm<6)]
@@ -37,7 +37,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0)

[pixel shader fail(sm<6)]
@@ -50,5 +50,5 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0)
diff --git a/tests/hlsl/array-parameters.shader_test b/tests/hlsl/array-parameters.shader_test
index 28a3c5996..6755c30a4 100644
--- a/tests/hlsl/array-parameters.shader_test
+++ b/tests/hlsl/array-parameters.shader_test
@@ -12,7 +12,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (25.0, 25.0, 25.0, 25.0)

@@ -78,7 +78,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (15.0, 26.0, 37.0, 48.0)

@@ -153,7 +153,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (136.0, 136.0, 136.0, 136.0)

@@ -171,5 +171,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all 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 55af741da..a5666fd28 100644
--- a/tests/hlsl/array-size-expr.shader_test
+++ b/tests/hlsl/array-size-expr.shader_test
@@ -14,7 +14,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (21, 22, 23, 24)

@@ -36,7 +36,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (61, 62, 63, 64)

[pixel shader]
@@ -49,7 +49,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2, 3, 6, 1)

% Additional level of indirection
diff --git a/tests/hlsl/asfloat.shader_test b/tests/hlsl/asfloat.shader_test
index 2184c1869..58b880855 100644
--- a/tests/hlsl/asfloat.shader_test
+++ b/tests/hlsl/asfloat.shader_test
@@ -20,7 +20,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 123.0 -2.0 456 0.01
-draw quad
+todo(glsl) draw quad
 probe (320,240) rgba (123.0, -2.0, 456.0, 0.01)

[pixel shader]
@@ -36,7 +36,7 @@ float4 main() : sv_target
 uniform 0 float4 11 12 0 0
 uniform 4 float4 13 14 0 0
 uniform 8 float4 20 21 22 23
-draw quad
+todo(glsl) draw quad
 probe (320,240) rgba (13.0, 21.0, 0.0, 0.0)

[pixel shader fail]
diff --git a/tests/hlsl/asuint.shader_test b/tests/hlsl/asuint.shader_test
index 50b0895e9..6dfd1a967 100644
--- a/tests/hlsl/asuint.shader_test
+++ b/tests/hlsl/asuint.shader_test
@@ -20,7 +20,7 @@ float4 main() : sv_target

[test]
 uniform 0 uint4 123 0xc0000000 456 0x7fd69345
-draw quad
+todo(glsl) draw quad
 probe (320,240) rgba (123.0, 3221225472.0, 456.0, 2144768896.0)

@@ -37,7 +37,7 @@ float4 main() : sv_target
 uniform 0 uint4 11 12 0 0
 uniform 4 uint4 13 14 0 0
 uniform 8 uint4 20 21 22 23
-draw quad
+todo(glsl) draw quad
 probe (320,240) rgba (13.0, 21.0, 0.0, 0.0)

diff --git a/tests/hlsl/bitwise.shader_test b/tests/hlsl/bitwise.shader_test
index ae2ce771d..03b4282c1 100644
--- a/tests/hlsl/bitwise.shader_test
+++ b/tests/hlsl/bitwise.shader_test
@@ -11,7 +11,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 163840.0, 480.0)

[pixel shader]
@@ -26,7 +26,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (-2147483648.0, 4.0, 2147483650.0, 4.0)

[pixel shader]
@@ -41,7 +41,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 536870912.0, 1.0, 1073741824.0)

[pixel shader]
@@ -54,7 +54,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (5.0, 15.0, 10.0, -6.0)

[pixel shader]
@@ -67,7 +67,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 1.0)

[pixel shader]
@@ -80,7 +80,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 1.0, 1.0, 1.0)

[pixel shader]
@@ -93,7 +93,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 1.0, 1.0, 0.0)

[pixel shader]
@@ -106,7 +106,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 163840.0, 480.0)

[pixel shader]
@@ -119,7 +119,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (5.0, 15.0, 10.0, 4294967296.0)

[pixel shader]
@@ -132,7 +132,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 1.0)

[pixel shader]
@@ -145,7 +145,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 1.0, 1.0, 1.0)

[pixel shader]
@@ -158,7 +158,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 1.0, 1.0, 0.0)

[pixel shader todo]
diff --git a/tests/hlsl/bool-cast.shader_test b/tests/hlsl/bool-cast.shader_test
index f3e4cf0d6..02f6e424d 100644
--- a/tests/hlsl/bool-cast.shader_test
+++ b/tests/hlsl/bool-cast.shader_test
@@ -10,7 +10,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 1.0, 1.0)

@@ -27,7 +27,7 @@ float4 main() : SV_TARGET
 uniform 0 float4 0.0 0.0 2.0 4.0
 if(sm<4)  uniform 4 float4 0 1 0 10
 if(sm>=4) uniform 4 int4 0 1 0 10
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.0, 10.0, 1.0, 11.0)

@@ -42,5 +42,5 @@ float4 main() : sv_target
 [test]
 if(sm<4)  uniform 0 float4 1.0 1.0 1.0 0.0
 if(sm>=4) uniform 0 uint4 0x00000001 0x00000002 0x80000000 0x00000000
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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 a30254a5e..af945397d 100644
--- a/tests/hlsl/bool-semantics.shader_test
+++ b/tests/hlsl/bool-semantics.shader_test
@@ -49,5 +49,5 @@ float4 main(struct input i) : sv_target
 }

[test]
-todo(sm>=6) draw triangle strip 4
+todo(sm>=6 | glsl) draw triangle strip 4
 probe all rgba (0.0, 2.0, 2.0, 2.0)
diff --git a/tests/hlsl/cast-broadcast.shader_test b/tests/hlsl/cast-broadcast.shader_test
index 3ec9cd40a..c901673b1 100644
--- a/tests/hlsl/cast-broadcast.shader_test
+++ b/tests/hlsl/cast-broadcast.shader_test
@@ -19,7 +19,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (84.0, 84.0, 84.0, 84.0)

@@ -94,5 +94,5 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all 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 8ad21d12a..d60557a81 100644
--- a/tests/hlsl/cast-componentwise-compatible.shader_test
+++ b/tests/hlsl/cast-componentwise-compatible.shader_test
@@ -16,7 +16,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 1.0)

@@ -39,7 +39,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (5.0, 6.0, 7.0, 8.0)

@@ -55,7 +55,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

@@ -86,7 +86,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (7.0, 7.0, 7.0, 7.0)

@@ -119,7 +119,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (3.0, 3.0, 3.0, 3.0)

@@ -159,7 +159,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (10.0, 20.0, 30.0, 30.0)

@@ -181,7 +181,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (10.0, 10.0, 11.4, 12.4)

@@ -197,7 +197,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (11.0, 12.0, 13.0, 14.0)

@@ -220,7 +220,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (21.0, 22.0, 23.0, 24.0)

@@ -236,7 +236,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (31.0, 32.0, 33.0, 33.0)

@@ -258,7 +258,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (41.0, 42.0, 43.0, 44.0)

@@ -297,7 +297,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (55.0, 56.0, 57.0, 58.0)

@@ -329,7 +329,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (61.0, 62.0, 63.0, 64.0)

@@ -355,7 +355,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (71.0, 72.0, 73.0, 74.0)

@@ -404,7 +404,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (81.0, 82.0, 83.0, 84.0)

@@ -420,7 +420,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (91.0, 92.0, 93.0, 0.0)

@@ -436,7 +436,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (11.0, 12.0, 13.0, 0.0)

@@ -477,7 +477,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (21.0, 22.0, 23.0, 24.0)

@@ -499,7 +499,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (31.0, 32.0, 33.0, 0.0)

@@ -521,7 +521,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (41.0, 42.0, 43.0, 0.0)

@@ -537,7 +537,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (51.0, 52.0, 53.0, 0.0)

@@ -564,7 +564,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (61.0, 62.0, 63.0, 0.0)

@@ -580,5 +580,5 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all 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 bb1c26fe0..dd1986c60 100644
--- a/tests/hlsl/cast-componentwise-equal.shader_test
+++ b/tests/hlsl/cast-componentwise-equal.shader_test
@@ -50,7 +50,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 1.0)

@@ -89,7 +89,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (5.0, 6.0, 7.0, 8.0)

@@ -120,7 +120,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (4.0, 4.0, 4.0, 4.0)

@@ -154,7 +154,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (5.0, 5.0, 5.0, 5.0)

@@ -199,7 +199,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (71.0, 73.0, 73.0, 74.0)

diff --git a/tests/hlsl/cast-to-float.shader_test b/tests/hlsl/cast-to-float.shader_test
index d80d42909..e15ba7333 100644
--- a/tests/hlsl/cast-to-float.shader_test
+++ b/tests/hlsl/cast-to-float.shader_test
@@ -18,7 +18,7 @@ if(sm>=4) uniform 0 int -1
 if(sm>=4) uniform 1 uint 3
 if(sm>=4) uniform 2 int -2
 if(sm>=4) uniform 3 float 0.5
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.5, 0.5, 0.5, 0.5)

@@ -33,5 +33,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all 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 8094a10a3..4409273e1 100644
--- a/tests/hlsl/cast-to-half.shader_test
+++ b/tests/hlsl/cast-to-half.shader_test
@@ -18,7 +18,7 @@ if(sm>=4) uniform 0 int -1
 if(sm>=4) uniform 1 uint 3
 if(sm>=4) uniform 2 int -2
 if(sm>=4) uniform 3 float 0.5
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.5, 0.5, 0.5, 0.5)

@@ -33,5 +33,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all 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 f35bb5604..7ebcd8cef 100644
--- a/tests/hlsl/cast-to-int.shader_test
+++ b/tests/hlsl/cast-to-int.shader_test
@@ -10,7 +10,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 10.3 11.5 12.8 13.1
-draw quad
+todo(glsl) draw quad
 probe all rgba (10, 11, 12, 0)

@@ -40,7 +40,7 @@ if(sm>=4) uniform 0 float 2.6
 if(sm>=4) uniform 1 int -2
 if(sm>=4) uniform 2 int -2
 if(sm>=4) uniform 3 float -3.6
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.5, 0.5, 0.5, 0.5)

@@ -61,6 +61,6 @@ float4 main() : sv_target
 }

[test]
-draw quad
+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)
diff --git a/tests/hlsl/cast-to-uint.shader_test b/tests/hlsl/cast-to-uint.shader_test
index 9344fffc8..14f81b7f6 100644
--- a/tests/hlsl/cast-to-uint.shader_test
+++ b/tests/hlsl/cast-to-uint.shader_test
@@ -25,7 +25,7 @@ uniform 0 float 2.6
 uniform 1 int 2
 uniform 2 int -2
 uniform 3 float -3.6
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.5, 0.5, 0.5, 0.5)

@@ -46,5 +46,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.5, 0.5, 0.5, 0.5)
diff --git a/tests/hlsl/cbuffer.shader_test b/tests/hlsl/cbuffer.shader_test
index 517fe6367..690491b79 100644
--- a/tests/hlsl/cbuffer.shader_test
+++ b/tests/hlsl/cbuffer.shader_test
@@ -13,7 +13,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

[pixel shader]
@@ -43,7 +43,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

[pixel shader fail(sm>=6)]
@@ -65,7 +65,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

[pixel shader]
@@ -79,7 +79,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

[pixel shader fail]
@@ -132,7 +132,7 @@ uniform 0 float4 0.0 1.0 2.0 3.0
 uniform 4 float4 4.0 5.0 6.0 7.0
 uniform 8 float4 8.0 9.0 10.0 11.0
 uniform 12 float4 12.0 13.0 14.0 15.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 2.0, 4.0, 8.0)

@@ -153,7 +153,7 @@ float4 main() : sv_target
 uniform 0 float4 0.0 1.0 2.0 3.0
 uniform 4 float4 4.0 5.0 6.0 7.0
 uniform 8 float4 8.0 9.0 10.0 11.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 4.0, 8.0, 9.0)

@@ -179,7 +179,7 @@ uniform 0 float4 0.0 1.0 2.0 3.0
 uniform 4 float4 4.0 5.0 6.0 7.0
 uniform 8 float4 8.0 9.0 10.0 11.0
 uniform 12 float4 12.0 13.0 14.0 15.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 4.0, 5.0, 6.0)

@@ -236,7 +236,7 @@ float4 main() : sv_target
 uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 5.0 6.0 7.0 8.0
 uniform 8 float4 9.0 10.0 11.0 12.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (509, 610, 711, 812)

@@ -264,7 +264,7 @@ uniform 0 float4 0.0 1.0 2.0 3.0
 uniform 4 float4 4.0 5.0 6.0 7.0
 uniform 8 float4 8.0 9.0 10.0 11.0
 uniform 12 float4 12.0 13.0 14.0 15.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (12468.0, 13509.0, 14010.0, 15011.0)

@@ -281,7 +281,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 3.0, 2.0, 3.0)

@@ -386,7 +386,7 @@ float4 main() : sv_target
 uniform 0 float 1.0
 uniform 1 float 2.0
 uniform 4 float4 5.0 6.0 7.0 8.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (512.0, 612.0, 712.0, 812.0)

@@ -417,7 +417,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (3.0, 4.0, 3.0, 4.0)

@@ -559,7 +559,7 @@ float4 main() : sv_target
 uniform 0 float4 1.0 0.0 0.0 0.0
 uniform 4 float4 0.0 2.0 0.0 0.0
 uniform 8 float4 0.0 0.0 3.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 0.0, 4.0)

@@ -609,7 +609,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)

@@ -786,5 +786,5 @@ uniform 0 float4 0.0 1.0 2.0 3.0
 uniform 4 float4 4.0 5.0 6.0 7.0
 uniform 8 float4 8.0 9.0 10.0 11.0
 uniform 12 float4 12.0 13.0 14.0 15.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (124.0, 135.0, 146.0, 150.5)
diff --git a/tests/hlsl/ceil.shader_test b/tests/hlsl/ceil.shader_test
index 91bfe1991..9917f044a 100644
--- a/tests/hlsl/ceil.shader_test
+++ b/tests/hlsl/ceil.shader_test
@@ -5,7 +5,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 7.0, 8.0, 4.0) 4

[pixel shader]
@@ -18,7 +18,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -0.5 6.5 7.5 3.4
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 7.0, 8.0, 4.0) 4

[pixel shader]
@@ -34,7 +34,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -0.5 6.5 7.5 3.4
-draw quad
+todo(glsl) draw quad
 probe all rgba (7.0, 8.0, 0.0, 4.0) 4

[pixel shader]
@@ -51,5 +51,5 @@ float4 main() : sv_target
 [test]
 if(sm<4)  uniform 0 float4 -1 6 7 3
 if(sm>=4) uniform 0 int4 -1 6 7 3
-draw quad
+todo(glsl) draw quad
 probe all 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 0f533f7ba..0a22613bf 100644
--- a/tests/hlsl/cf-cond-types.shader_test
+++ b/tests/hlsl/cf-cond-types.shader_test
@@ -124,8 +124,8 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -2.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)
 uniform 0 float4 -0.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0)
diff --git a/tests/hlsl/clamp.shader_test b/tests/hlsl/clamp.shader_test
index 40d0294bd..5f4c0895d 100644
--- a/tests/hlsl/clamp.shader_test
+++ b/tests/hlsl/clamp.shader_test
@@ -8,7 +8,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -0.3 -0.1 0.7 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (-0.1, 0.7, -0.3, 0.3)

@@ -24,7 +24,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (5.5, 5.0, 4.2, 5.2)

diff --git a/tests/hlsl/clip.shader_test b/tests/hlsl/clip.shader_test
index d7473c999..3c003f1f5 100644
--- a/tests/hlsl/clip.shader_test
+++ b/tests/hlsl/clip.shader_test
@@ -9,14 +9,14 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1 2 3 4
-todo(sm>=6) draw quad
+todo(sm>=6 | glsl) draw quad
 probe all rgba (1, 2, 3, 4)
 uniform 0 float4 9 8 7 6
-todo(sm>=6) draw quad
+todo(sm>=6 | glsl) draw quad
 probe all rgba (9, 8, 7, 6)
 uniform 0 float4 -1 8 7 6
-todo(sm>=6) draw quad
+todo(sm>=6 | glsl) draw quad
 probe all rgba (9, 8, 7, 6)
 uniform 0 float4 9 0 7 6
-todo(sm>=6) draw quad
+todo(sm>=6 | glsl) draw quad
 probe all rgba (9, 0, 7, 6)
diff --git a/tests/hlsl/combined-samplers.shader_test b/tests/hlsl/combined-samplers.shader_test
index 10720fa43..7bfe9d219 100644
--- a/tests/hlsl/combined-samplers.shader_test
+++ b/tests/hlsl/combined-samplers.shader_test
@@ -45,7 +45,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0, 0, 0, 1)

@@ -60,7 +60,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (10, 10, 10, 11)

@@ -74,7 +74,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (21, 21, 21, 11)

@@ -90,7 +90,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (12, 12, 12, 111)

@@ -105,7 +105,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (104, 104, 104, 111)

@@ -129,7 +129,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1, 1, 1, 11)

diff --git a/tests/hlsl/comma.shader_test b/tests/hlsl/comma.shader_test
index 23bee71a1..b4796c658 100644
--- a/tests/hlsl/comma.shader_test
+++ b/tests/hlsl/comma.shader_test
@@ -6,5 +6,5 @@ float4 main(): sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.6, 0.7, 0.8, 0.9)
diff --git a/tests/hlsl/compute.shader_test b/tests/hlsl/compute.shader_test
index 1d780d500..9a0c1b469 100644
--- a/tests/hlsl/compute.shader_test
+++ b/tests/hlsl/compute.shader_test
@@ -17,5 +17,5 @@ void main()
 }

[test]
-dispatch 1 1 1
+todo(glsl) dispatch 1 1 1
 probe uav 0 (0, 0) r (-123.0)
diff --git a/tests/hlsl/conditional.shader_test b/tests/hlsl/conditional.shader_test
index f32b0e86d..89e00dce8 100644
--- a/tests/hlsl/conditional.shader_test
+++ b/tests/hlsl/conditional.shader_test
@@ -11,10 +11,10 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.9, 0.8, 0.7, 0.6)
 uniform 0 float4 0.1 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.1, 0.2, 0.3, 0.4)

[pixel shader todo(sm<4)]
@@ -43,7 +43,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.9, 0.8, 0.7, 0.6)

[pixel shader fail(sm<6)]
@@ -88,7 +88,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.9, 0.8, 0.7, 0.6)

[pixel shader]
@@ -105,5 +105,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (9.0, 10.0, 11.0, 12.0)
diff --git a/tests/hlsl/const.shader_test b/tests/hlsl/const.shader_test
index 9541203dc..968a288ce 100644
--- a/tests/hlsl/const.shader_test
+++ b/tests/hlsl/const.shader_test
@@ -10,7 +10,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 0.1 0.2 0.3 0.4
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.1, 2.2, 3.3, 4.4)

[pixel shader fail(sm<6)]
diff --git a/tests/hlsl/cross.shader_test b/tests/hlsl/cross.shader_test
index 22f373a6d..2cd8ad83d 100644
--- a/tests/hlsl/cross.shader_test
+++ b/tests/hlsl/cross.shader_test
@@ -12,7 +12,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 1 -2 3 4
 uniform 4 float4 10 100 1000 10000
-draw quad
+todo(glsl) draw quad
 probe all rgba (-2300, -970, 120, 0)

@@ -29,5 +29,5 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1 -2 3 4
-draw quad
+todo(glsl) draw quad
 probe all 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 dca307cdb..87c9de351 100644
--- a/tests/hlsl/d3dcolor-to-ubyte4.shader_test
+++ b/tests/hlsl/d3dcolor-to-ubyte4.shader_test
@@ -11,7 +11,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -0.5 6.5 7.5 3.4
-draw quad
+todo(glsl) draw quad
 probe all rgba (1912.0, 1657.0, -127.0, 867.0) 1

[pixel shader]
@@ -24,5 +24,5 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -0.5 6.5 7.5 3.4
-draw quad
+todo(glsl) draw quad
 probe all 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 72925b975..c0db937f2 100644
--- a/tests/hlsl/ddxddy.shader_test
+++ b/tests/hlsl/ddxddy.shader_test
@@ -8,7 +8,7 @@ float4 main(float4 pos : sv_position) : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 todo(sm<4) probe all rgba (1.0, 1.0, 0.0, 0.0)

@@ -29,7 +29,7 @@ float4 main(float4 pos : sv_position) : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 todo(sm<4) probe (10, 10) rgba (-16.0, -5.0, 3.0, 0.0)
 todo(sm<4) probe (11, 10) rgba (-21.0, -5.0, 3.0, 0.0)
 todo(sm<4) probe (10, 11) rgba (-13.0, -5.0, 3.0, 0.0)
@@ -55,7 +55,7 @@ float4 main(float4 pos : sv_position) : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe (10, 10) rgba (-16.0, -5.0, 3.0, 0.0)
 probe (11, 10) rgba (-21.0, -5.0, 3.0, 0.0)
 probe (10, 11) rgba (-13.0, -5.0, 3.0, 0.0)
@@ -74,7 +74,7 @@ float4 main(float4 pos : sv_position) : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe (10, 10) rgba (-0.524999976, -0.164999843, 0.104999900, 0.0) 16
 probe (11, 10) rgba (-0.689999819, -0.164999843, 0.114999890, 0.0) 32
 probe (10, 11) rgba (-0.420000076, -0.154999852, 0.104999900, 0.0) 32
diff --git a/tests/hlsl/determinant.shader_test b/tests/hlsl/determinant.shader_test
index d7dcaa563..5df5526cf 100644
--- a/tests/hlsl/determinant.shader_test
+++ b/tests/hlsl/determinant.shader_test
@@ -8,7 +8,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 9.0 2.0 3.0 4.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (9.0, 9.0, 9.0, 9.0)

[pixel shader]
@@ -21,7 +21,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)

[pixel shader]
@@ -35,7 +35,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 5.0 6.0 7.0 8.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (-4.0, -4.0, -4.0, -4.0)

[pixel shader]
@@ -49,7 +49,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 5.0 6.0 7.0 8.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)

[pixel shader]
@@ -64,7 +64,7 @@ float4 main() : sv_target
 uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 5.0 -6.0 7.0 8.0
 uniform 8 float4 9.0 10.0 11.0 12.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (192.0, 192.0, 192.0, 192.0)

[pixel shader]
@@ -80,7 +80,7 @@ uniform  0 float4  1.0 -2.0  3.0  4.0
 uniform  4 float4  5.0  6.0 -7.0  8.0
 uniform  8 float4  9.0 10.0 11.0 12.0
 uniform 12 float4 13.0 14.0 15.0 16.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (-672.0, -672.0, -672.0, -672.0)

[pixel shader]
@@ -96,7 +96,7 @@ uniform  0 float4  1.0  2.0  3.0 0.0
 uniform  4 float4  5.0 -6.0  7.0 0.0
 uniform  8 float4  9.0 10.0 11.0 0.0
 uniform 12 float4  0.0  0.0  0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (192.0, 192.0, 192.0, 192.0)

[pixel shader fail]
diff --git a/tests/hlsl/discard.shader_test b/tests/hlsl/discard.shader_test
index a5cdde475..dba1b9b8e 100644
--- a/tests/hlsl/discard.shader_test
+++ b/tests/hlsl/discard.shader_test
@@ -9,8 +9,8 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1 2 3 4
-todo(sm<4 | sm>=6) draw quad
+todo(sm<4 | sm>=6 | glsl) draw quad
 probe all rgba (1, 2, 3, 4)
 uniform 0 float4 9 8 7 6
-todo(sm<4 | sm>=6) draw quad
+todo(sm<4 | sm>=6 | glsl) draw quad
 probe all rgba (1, 2, 3, 4)
diff --git a/tests/hlsl/distance.shader_test b/tests/hlsl/distance.shader_test
index 3f5446451..a9feb40dd 100644
--- a/tests/hlsl/distance.shader_test
+++ b/tests/hlsl/distance.shader_test
@@ -10,7 +10,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 -2.0 3.0 4.0 0.1
 uniform 4 float4 2.0 -1.0 4.0 5.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (7.483983, 7.483983, 7.483983, 7.483983) 1

[pixel shader]
diff --git a/tests/hlsl/dot.shader_test b/tests/hlsl/dot.shader_test
index c6a96cc1e..87bb82d19 100644
--- a/tests/hlsl/dot.shader_test
+++ b/tests/hlsl/dot.shader_test
@@ -10,7 +10,7 @@ float4 main() : SV_TARGET
 [test]
 uniform 0 float4 2.0 3.0 4.0 5.0
 uniform 4 float4 10.0 11.0 12.0 13.0
-todo(sm>=6) draw quad
+todo(sm>=6 | glsl) draw quad
 probe all rgba (166.0, 166.0, 166.0, 166.0)

[pixel shader]
@@ -25,7 +25,7 @@ float4 main() : SV_TARGET
 [test]
 uniform 0 float4 2.0 3.0 0.0 0.0
 uniform 4 float4 10.0 11.0 12.0 13.0
-todo(sm<4 | sm>=6) draw quad
+todo(sm<4 | sm>=6 | glsl) draw quad
 probe all rgba (53.0, 53.0, 53.0, 53.0)

[pixel shader]
@@ -40,7 +40,7 @@ float4 main() : SV_TARGET
 [test]
 uniform 0 float4 2.0 0.0 0.0 0.0
 uniform 4 float4 10.0 11.0 12.0 13.0
-todo(sm>=6) draw quad
+todo(sm>=6 | glsl) draw quad
 probe all rgba (92.0, 92.0, 92.0, 92.0)

[pixel shader]
@@ -55,8 +55,8 @@ float4 main() : SV_TARGET
 [test]
 uniform 0 float4 10.0 11.0 12.0 13.0
 uniform 4 float4 2.0 0.0 0.0 0.0
-todo(sm>=6) draw quad
- probe all rgba (92.0, 92.0, 92.0, 92.0)
+todo(sm>=6 | glsl) draw quad
+probe all rgba (92.0, 92.0, 92.0, 92.0)

[pixel shader]
 uniform float x;
@@ -71,7 +71,7 @@ float4 main() : SV_TARGET
 % Account for both the SM1 and SM4 uniform layout
 uniform 0 float4 2.0 3.0 0.0 0.0
 uniform 4 float4 3.0 0.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (6.0, 6.0, 6.0, 6.0)

[pixel shader]
@@ -84,7 +84,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (110.0, 110.0, 110.0, 110.0)

[pixel shader fail]
diff --git a/tests/hlsl/duplicate-modifiers.shader_test b/tests/hlsl/duplicate-modifiers.shader_test
index 87f564952..a62c75481 100644
--- a/tests/hlsl/duplicate-modifiers.shader_test
+++ b/tests/hlsl/duplicate-modifiers.shader_test
@@ -7,6 +7,6 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(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)
diff --git a/tests/hlsl/entry-point-semantics.shader_test b/tests/hlsl/entry-point-semantics.shader_test
index 403fd66cc..a4f851873 100644
--- a/tests/hlsl/entry-point-semantics.shader_test
+++ b/tests/hlsl/entry-point-semantics.shader_test
@@ -36,7 +36,7 @@ float4 main(float tex : texcoord) : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe (0, 0) rgba (0.2, 0.2, 0.2, 0.2)

[pixel shader]
@@ -49,7 +49,7 @@ float4 main(float tex : texcoord) : sv_target
 float4 main(float tex : bogus) : bogus;

[test]
-draw quad
+todo(glsl) draw quad
 probe (0, 0) rgba (0.2, 0.2, 0.2, 0.2)

@@ -85,7 +85,7 @@ float4 main(in apple a) : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe (0, 0) rgba (10.0, 20.0, 30.0, 40.0)

@@ -102,7 +102,7 @@ float4 main(in apple a) : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe (0, 0) rgba (10.0, 11.0, 30.0, 31.0)

@@ -126,7 +126,7 @@ float4 main(in apple aps[2][2]) : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe (0, 0) rgba (10.0, 10.0, 20.0, 20.0)

@@ -148,7 +148,7 @@ float4 main(in banana bans[2]) : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 todo(sm>=6) probe (0, 0) rgba (10.0, 11.0, 20.0, 21.0)

@@ -212,7 +212,7 @@ float4 main(in float4 tex0 : TEXCOORD0, in float4 tex1 : TEXCOORD1) : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe (0, 0) rgba (1.0, 2.0, 10.0, 20.0)

@@ -275,7 +275,7 @@ float4 main(in float4 t1 : TEXCOORD0, in float4 t2 : TEXCOORD0) : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 todo(sm>=6) probe (0, 0) rgba (99.0, 99.0, 10.0, 11.0)

@@ -287,7 +287,7 @@ float4 main(in float4 a : TEXCOORD0, in float3 b : TEXCOORD1) : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe (0, 0) rgba (10.0, 11.0, 20.0, 21.0)

diff --git a/tests/hlsl/exp.shader_test b/tests/hlsl/exp.shader_test
index 1d1889977..38e9d4cb9 100644
--- a/tests/hlsl/exp.shader_test
+++ b/tests/hlsl/exp.shader_test
@@ -8,7 +8,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -1.0 0.0 1.0 2.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.5, 1.0, 2.0, 4.0) 2

[pixel shader]
@@ -21,5 +21,5 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -1.0 0.0 1.0 2.0
-draw quad
+todo(glsl) draw quad
 probe all 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 3dcc5727e..4a8508601 100644
--- a/tests/hlsl/expr-indexing.shader_test
+++ b/tests/hlsl/expr-indexing.shader_test
@@ -9,7 +9,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 5.0 6.0 7.0 8.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (8.0, 8.0, 8.0, 8.0)

@@ -26,7 +26,7 @@ float4 main() : sv_target
 uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 5.0 6.0 7.0 8.0
 uniform 8 float 2
-draw quad
+todo(glsl) draw quad
 probe all rgba (10.0, 10.0, 10.0, 10.0)

@@ -40,7 +40,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (3.0, 3.0, 3.0, 3.0)

@@ -56,10 +56,10 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float 0
-draw quad
+todo(glsl) draw quad
 probe all rgba (4.0, 4.0, 4.0, 4.0)
 uniform 4 float 2
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)

@@ -78,7 +78,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (4.0, 4.0, 4.0, 4.0)

@@ -99,5 +99,5 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float 1
-draw quad
+todo(glsl) draw quad
 probe all 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 9a5ec93c7..1f481e319 100644
--- a/tests/hlsl/float-comparison.shader_test
+++ b/tests/hlsl/float-comparison.shader_test
@@ -9,7 +9,7 @@ float4 main() : sv_target

[test]
 uniform 0 float 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0)

@@ -55,7 +55,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.0 1.5 1.5 0.0
-todo(sm<4) draw quad
+todo(sm<4 | 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)
 % SM4-5 optimises away the 'not' by inverting the condition, even though this is invalid for NaN.
diff --git a/tests/hlsl/floor.shader_test b/tests/hlsl/floor.shader_test
index b3552515a..dfbbd37ae 100644
--- a/tests/hlsl/floor.shader_test
+++ b/tests/hlsl/floor.shader_test
@@ -5,7 +5,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (-1.0, 6.0, 7.0, 3.0) 4

[pixel shader]
@@ -18,7 +18,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -0.5 6.5 7.5 3.4
-draw quad
+todo(glsl) draw quad
 probe all rgba (-1.0, 6.0, 7.0, 3.0) 4

[pixel shader]
@@ -34,7 +34,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -0.5 6.5 7.5 3.4
-draw quad
+todo(glsl) draw quad
 probe all rgba (6.0, 7.0, -1.0, 3.0) 4

@@ -52,5 +52,5 @@ float4 main() : sv_target
 [test]
 if(sm<4)  uniform 0 float4 -1 6 7 3
 if(sm>=4) uniform 0 int4 -1 6 7 3
-draw quad
+todo(glsl) draw quad
 probe all 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 62f7573de..ccb7b99e7 100644
--- a/tests/hlsl/fmod.shader_test
+++ b/tests/hlsl/fmod.shader_test
@@ -8,10 +8,10 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -0.5 6.5 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (-0.5, 0.0, 0.0, 0.0) 4
 uniform 0 float4 1.1 0.3 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.2, 0.0, 0.0, 0.0) 4

[pixel shader todo(sm<4)]
@@ -24,8 +24,8 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -0.5 6.5 2.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (-0.5, 0.5, 0.0, 0.0) 4
 uniform 0 float4 1.1 0.3 3.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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 ad7b5e4c4..7ce6c8213 100644
--- a/tests/hlsl/for.shader_test
+++ b/tests/hlsl/for.shader_test
@@ -23,7 +23,7 @@ float4 main(float tex : texcoord) : sv_target
 }

[test]
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe (  0, 0, 159, 480) rgba (10.0, 35.0, 0.0, 0.0)
 probe (161, 0, 479, 480) rgba (10.0, 38.0, 0.0, 0.0)
 probe (481, 0, 640, 480) rgba ( 5.0, 10.0, 0.0, 0.0)
@@ -54,7 +54,7 @@ float4 main(float tex : texcoord) : sv_target

[test]
 uniform 0 uint4 10 0 0 0
-draw quad
+todo(glsl) draw quad
 probe (  0, 0, 159, 480) rgba (10.0, 35.0, 0.0, 0.0)
 probe (161, 0, 479, 480) rgba (10.0, 38.0, 0.0, 0.0)
 probe (481, 0, 640, 480) rgba ( 5.0, 10.0, 0.0, 0.0)
@@ -76,7 +76,7 @@ float4 main(float tex : texcoord) : sv_target
 }

[test]
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (10.0, 45.0, 0.0, 0.0)

[pixel shader fail(sm<6)]
diff --git a/tests/hlsl/frac.shader_test b/tests/hlsl/frac.shader_test
index f54f3fe88..5e7d480c9 100644
--- a/tests/hlsl/frac.shader_test
+++ b/tests/hlsl/frac.shader_test
@@ -8,5 +8,5 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -1.1 1.6 1.3 0.5
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.9, 0.6, 0.3, 0.5) 2
diff --git a/tests/hlsl/function-return.shader_test b/tests/hlsl/function-return.shader_test
index e1477b0aa..3c085a578 100644
--- a/tests/hlsl/function-return.shader_test
+++ b/tests/hlsl/function-return.shader_test
@@ -29,7 +29,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.2, 0.1, 0.8, 0.5);

[pixel shader todo(sm<4)]
@@ -79,16 +79,16 @@ float4 main() : sv_target

[test]
 uniform 0 float 0.1
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.3, 0.2, 0.6, 0.3) 1
 uniform 0 float 0.4
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.6, 0.5, 0.6, 0.3) 1
 uniform 0 float 0.6
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.6, 0.5, 0.4, 0.5) 1
 uniform 0 float 0.8
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.8, 0.7, 0.4, 0.5) 1

[pixel shader todo(sm<4)]
@@ -134,13 +134,13 @@ float4 main() : sv_target

[test]
 uniform 0 float 0.1
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.2, 0.1, 0.2, 0.1) 1
 uniform 0 float 0.5
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.5, 0.4, 1.0, 0.9) 1
 uniform 0 float 0.9
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 0.9, 1.0, 0.6) 1

[pixel shader todo(sm<4)]
@@ -181,7 +181,7 @@ float4 main() : sv_target
 }

[test]
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.4, 0.3, 0.3, 0.9) 1

[pixel shader todo(sm<4)]
@@ -235,23 +235,23 @@ float4 main() : sv_target

[test]
 uniform 0 float 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.3, 0.2, 0.3, 0.3) 1

uniform 0 float 0.1
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.3, 0.3, 0.3, 0.3) 1

uniform 0 float 0.3
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.3, 0.5, 0.3, 0.3) 1

uniform 0 float 0.7
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.3, 0.9, 0.7, 0.6) 1

uniform 0 float 0.9
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.4, 0.1, 0.7, 0.6) 1

[pixel shader todo(sm<4)]
@@ -291,21 +291,21 @@ float4 main() : sv_target
 uniform 0 float4 0.3 0.0 0.0 0.0
 uniform 4 float4 0.0 0.0 0.0 0.0
 uniform 8 float4 0.1 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.3, 0.2, 0.6, 0.6) 1

uniform 4 float4 0.35 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.3, 0.3, 0.6, 0.6) 1

uniform 8 float4 0.5 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.3, 0.5, 0.6, 0.6) 1

uniform 0 float4 1.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.3, 0.5, 0.6, 0.6) 1

uniform 4 float4 2.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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 d712f8522..dbe9d3a33 100644
--- a/tests/hlsl/function.shader_test
+++ b/tests/hlsl/function.shader_test
@@ -176,7 +176,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.1, 0.2, 0.3, 0.4)

[pixel shader]
@@ -200,7 +200,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.5, 0.6, 0.7, 0)

[pixel shader]
@@ -221,7 +221,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.6, 0.1, 0.5, 0)

% Recursion is forbidden.
@@ -275,7 +275,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 3.0, 6.0, 7.0)

@@ -293,7 +293,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 3.0, 6.0, 7.0)

% Inline modifier
@@ -312,7 +312,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 3.0, 6.0, 7.0)

% Inline modifier used on entry point
@@ -331,5 +331,5 @@ inline float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 3.0, 6.0, 7.0)
diff --git a/tests/hlsl/fwidth.shader_test b/tests/hlsl/fwidth.shader_test
index 99fb1421d..3ba116a57 100644
--- a/tests/hlsl/fwidth.shader_test
+++ b/tests/hlsl/fwidth.shader_test
@@ -18,7 +18,7 @@ float4 main(float4 pos : sv_position) : sv_target
 }

[test]
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe (10, 10) rgba (8.0, 8.0, 8.0, 8.0)
 probe (11, 10) rgba (8.0, 8.0, 8.0, 8.0)
 probe (12, 10) rgba (10.0, 10.0, 10.0, 10.0)
diff --git a/tests/hlsl/gather-offset.shader_test b/tests/hlsl/gather-offset.shader_test
index 1cd3d3f0b..e710c29a3 100644
--- a/tests/hlsl/gather-offset.shader_test
+++ b/tests/hlsl/gather-offset.shader_test
@@ -23,7 +23,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.1, 0.2, 0.2, 0.1)

@@ -37,7 +37,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.1, 0.1, 0.0)

@@ -55,7 +55,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.2, 0.2, 0.1, 0.1)

@@ -69,7 +69,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.1, 0.1, 0.0, 0.0)

@@ -83,7 +83,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.5, 0.0, 0.5, 0.0)

@@ -97,7 +97,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.4, 0.0, 0.4)

@@ -113,5 +113,5 @@ float4 main() : sv_target

[test]
 uniform 0 int4 1 0 0 0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.1, 0.2, 0.2, 0.1)
diff --git a/tests/hlsl/gather.shader_test b/tests/hlsl/gather.shader_test
index c5aaa7585..721766d6a 100644
--- a/tests/hlsl/gather.shader_test
+++ b/tests/hlsl/gather.shader_test
@@ -23,7 +23,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.1, 0.1, 0.0)

@@ -37,7 +37,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.1, 0.2, 0.2, 0.1)

@@ -55,7 +55,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.1, 0.1, 0.0, 0.0)

@@ -69,7 +69,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.2, 0.2, 0.1, 0.1)

@@ -97,7 +97,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.5, 0.0, 0.5)

@@ -111,5 +111,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.4, 0.0, 0.4, 0.0)
diff --git a/tests/hlsl/getdimensions.shader_test b/tests/hlsl/getdimensions.shader_test
index 5676f361b..a218c84c0 100644
--- a/tests/hlsl/getdimensions.shader_test
+++ b/tests/hlsl/getdimensions.shader_test
@@ -28,7 +28,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 3.0, 2.0, 3.0)

[srv 1]
@@ -53,5 +53,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 2.0, 1.0, 2.0)
diff --git a/tests/hlsl/half.shader_test b/tests/hlsl/half.shader_test
index fe7074e45..263eeb279 100644
--- a/tests/hlsl/half.shader_test
+++ b/tests/hlsl/half.shader_test
@@ -19,5 +19,5 @@ float4 main() : sv_target

[test]
 uniform 0 float 10.0
-draw quad
+todo(glsl) draw quad
 probe all 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 fa4867488..648d8e478 100644
--- a/tests/hlsl/hard-copy-prop.shader_test
+++ b/tests/hlsl/hard-copy-prop.shader_test
@@ -17,10 +17,10 @@ float4 main() : sv_target

[test]
 uniform 0 float 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (2.0, 2.0, 2.0, 2.0)
 uniform 0 float 1.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (-2.0, -2.0, -2.0, -2.0)

@@ -43,10 +43,10 @@ float4 main() : sv_target

[test]
 uniform 0 float 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (2.0, 2.0, 2.0, 2.0)
 uniform 0 float 1.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (20.0, 20.0, 20.0, 20.0)

@@ -69,8 +69,8 @@ float4 main() : sv_target

[test]
 uniform 0 float 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 4.0, 0.0, 0.0)
 uniform 0 float 1.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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 6b35c6b7e..1cd7e3a2c 100644
--- a/tests/hlsl/initializer-flatten.shader_test
+++ b/tests/hlsl/initializer-flatten.shader_test
@@ -6,7 +6,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1, 2, 3, 4)

@@ -24,7 +24,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (4, 5, 6, 7)

@@ -37,7 +37,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (40, 10, 20, 30)

@@ -56,7 +56,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

@@ -69,5 +69,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all 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 e11825996..d2ea24beb 100644
--- a/tests/hlsl/initializer-implicit-array.shader_test
+++ b/tests/hlsl/initializer-implicit-array.shader_test
@@ -7,7 +7,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (50, 60, 70, 80)

@@ -21,7 +21,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+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)

@@ -35,7 +35,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (7.0, 8.0, 9.0, 10.0)

@@ -63,7 +63,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (318.0, 320.0, 322.0, 324.0)

diff --git a/tests/hlsl/initializer-invalid-arg-count.shader_test b/tests/hlsl/initializer-invalid-arg-count.shader_test
index 4332fbe80..20564ac5e 100644
--- a/tests/hlsl/initializer-invalid-arg-count.shader_test
+++ b/tests/hlsl/initializer-invalid-arg-count.shader_test
@@ -9,7 +9,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (17, 18, 19, 20)

@@ -57,7 +57,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (22, 23, 24, 25)

diff --git a/tests/hlsl/initializer-local-array.shader_test b/tests/hlsl/initializer-local-array.shader_test
index 0862d4c90..70d31b9f9 100644
--- a/tests/hlsl/initializer-local-array.shader_test
+++ b/tests/hlsl/initializer-local-array.shader_test
@@ -10,7 +10,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (21, 22, 23, 24)

@@ -31,5 +31,5 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (71, 72, 73, 74)
diff --git a/tests/hlsl/initializer-matrix.shader_test b/tests/hlsl/initializer-matrix.shader_test
index 7e12b0a00..184f09083 100644
--- a/tests/hlsl/initializer-matrix.shader_test
+++ b/tests/hlsl/initializer-matrix.shader_test
@@ -6,7 +6,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (21, 22, 23, 0)

@@ -18,7 +18,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (21, 22, 23, 0)

@@ -30,7 +30,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (21, 22, 23, 24)

@@ -42,7 +42,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (21, 22, 31, 32)

@@ -55,7 +55,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (21, 22, 31, 32)

@@ -68,5 +68,5 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (21, 22, 31, 32)
diff --git a/tests/hlsl/initializer-multi.shader_test b/tests/hlsl/initializer-multi.shader_test
index 8f8a31e20..294b38704 100644
--- a/tests/hlsl/initializer-multi.shader_test
+++ b/tests/hlsl/initializer-multi.shader_test
@@ -7,7 +7,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2, 3, 3, 0)

@@ -32,7 +32,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (7.2, 8.0, 7.2, 8.0)

@@ -48,5 +48,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all 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 b00259c9a..d1b3e98e0 100644
--- a/tests/hlsl/initializer-nested.shader_test
+++ b/tests/hlsl/initializer-nested.shader_test
@@ -6,7 +6,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1, 2, 3, 4)

@@ -23,7 +23,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (21, 22, 23, 24)

@@ -52,5 +52,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (21, 22, 23, 24)
diff --git a/tests/hlsl/initializer-numeric.shader_test b/tests/hlsl/initializer-numeric.shader_test
index 1b41dfb5a..d2d4a12a2 100644
--- a/tests/hlsl/initializer-numeric.shader_test
+++ b/tests/hlsl/initializer-numeric.shader_test
@@ -6,7 +6,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0) 4

@@ -18,7 +18,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0) 4

@@ -31,7 +31,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0) 4

@@ -44,7 +44,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (10.1, 1.1, 1.2, 2.1) 4

@@ -56,7 +56,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (3.0, 250.0, 16.0, 4.2949673e+009) 4

@@ -69,6 +69,6 @@ float4 main() : sv_target
 }

[test]
-draw quad
+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
diff --git a/tests/hlsl/initializer-objects.shader_test b/tests/hlsl/initializer-objects.shader_test
index 4f8f565b4..5007c0cee 100644
--- a/tests/hlsl/initializer-objects.shader_test
+++ b/tests/hlsl/initializer-objects.shader_test
@@ -25,7 +25,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.2, 0.2, 0.2, 0.1)

@@ -48,7 +48,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (31.1, 41.1, 51.1, 61.1) 1

diff --git a/tests/hlsl/initializer-static-array.shader_test b/tests/hlsl/initializer-static-array.shader_test
index 577335023..b242b2714 100644
--- a/tests/hlsl/initializer-static-array.shader_test
+++ b/tests/hlsl/initializer-static-array.shader_test
@@ -11,7 +11,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (21, 22, 23, 24)

@@ -33,5 +33,5 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (61, 62, 63, 64)
diff --git a/tests/hlsl/initializer-struct.shader_test b/tests/hlsl/initializer-struct.shader_test
index f4028b5bb..6bd8714d6 100644
--- a/tests/hlsl/initializer-struct.shader_test
+++ b/tests/hlsl/initializer-struct.shader_test
@@ -22,7 +22,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (41, 42, 43, 44)

@@ -52,7 +52,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (4311, 4312, 4313, 4314)

@@ -80,5 +80,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (21, 22, 23, 24)
diff --git a/tests/hlsl/intrinsic-override.shader_test b/tests/hlsl/intrinsic-override.shader_test
index b95f80e7f..4be764217 100644
--- a/tests/hlsl/intrinsic-override.shader_test
+++ b/tests/hlsl/intrinsic-override.shader_test
@@ -11,7 +11,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.3, 0.3, 0.4, 0.6)

[pixel shader fail(sm>=6)]
@@ -27,7 +27,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.3, 0.3, 0.3, 0.4)

@@ -47,5 +47,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all 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 27a5025c2..4fad189bd 100644
--- a/tests/hlsl/inverse-trig.shader_test
+++ b/tests/hlsl/inverse-trig.shader_test
@@ -13,23 +13,23 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -1.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (3.14159274, 0.0, 0.0, 0.0) 128

uniform 0 float4 -0.5 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (2.094441441, 0.0, 0.0, 0.0) 256

uniform 0 float4 0.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.57072878, 0.0, 0.0, 0.0) 1024

uniform 0 float4 0.5 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.04715133, 0.0, 0.0, 0.0) 512

uniform 0 float4 1.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0) 128

[pixel shader]
@@ -44,7 +44,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -1.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (-31416.0, 0.0, 0.0, 0.0)

[require]
@@ -52,15 +52,15 @@ shader model < 6.0

[test]
 uniform 0 float4 -0.5 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (-10473.0, 0.0, 0.0, 0.0)

uniform 0 float4 0.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 0.0, 0.0, 0.0)

uniform 0 float4 0.5 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (10473.0, 0.0, 0.0, 0.0)

[require]
@@ -88,7 +88,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(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (31416.0, 0.0, 0.0, 0.0)

@@ -102,23 +102,23 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -1.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (-0.785409629, 0.0, 0.0, 0.0) 512

uniform 0 float4 -0.5 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (-0.4636476, 0.0, 0.0, 0.0) 256

uniform 0 float4 0.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0) 256

uniform 0 float4 0.5 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.4636476, 0.0, 0.0, 0.0) 256

uniform 0 float4 1.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.785409629, 0.0, 0.0, 0.0) 512

[pixel shader todo(sm<4)]
@@ -133,64 +133,64 @@ float4 main() : sv_target
 [test]
 % Non-degenerate cases
 uniform 0 float4 1.0 1.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.785385, 0.0, 0.0, 0.0) 512

uniform 0 float4 5.0 -5.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (2.356194, 0.0, 0.0, 0.0) 256

uniform 0 float4 -3.0 -3.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (-2.356194, 0.0, 0.0, 0.0) 256

uniform 0 float4 1.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.570796, 0.0, 0.0, 0.0) 256

uniform 0 float4 -1.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (-1.570796, 0.0, 0.0, 0.0) 256

uniform 0 float4 0.0 1.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0) 256

uniform 0 float4 0.0 -1.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (3.1415927, 0.0, 0.0, 0.0) 256

% Degenerate cases
 uniform 0 float4 0.00001 0.00002 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.463647, 0.0, 0.0, 0.0) 256

uniform 0 float4 0.00001 -0.00002 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (2.677945, 0.0, 0.0, 0.0) 256

uniform 0 float4 -0.00001 100000.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (-0.000000000099986595, 0.0, 0.0, 0.0) 2048

uniform 0 float4 10000000.0 0.00000001 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.570796, 0.0, 0.0, 0.0) 256

uniform 0 float4 1000000000.0 -0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.570796, 0.0, 0.0, 0.0) 256

uniform 0 float4 0.0 -1.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (3.1415927, 0.0, 0.0, 0.0) 256

uniform 0 float4 -0.0 -1.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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 11883c8be..ec6575259 100644
--- a/tests/hlsl/is-front-face.shader_test
+++ b/tests/hlsl/is-front-face.shader_test
@@ -22,7 +22,7 @@ float4 main(bool face : sv_isfrontface) : sv_target
 }

[test]
-draw triangle strip 4
+todo(glsl) draw triangle strip 4
 probe all rgba (0.0, 1.0, 0.0, 1.0)

[vb 0]
@@ -32,5 +32,5 @@ probe all rgba (0.0, 1.0, 0.0, 1.0)
  2.0  2.0

[test]
-draw triangle strip 4
+todo(glsl) draw triangle strip 4
 probe all rgba (1.0, 2.0, 1.0, 2.0)
diff --git a/tests/hlsl/ldexp.shader_test b/tests/hlsl/ldexp.shader_test
index 75492b66d..8e4e5ab97 100644
--- a/tests/hlsl/ldexp.shader_test
+++ b/tests/hlsl/ldexp.shader_test
@@ -10,7 +10,7 @@ float4 main() : SV_TARGET
 [test]
 uniform 0 float4 2.0 3.0 4.0 5.0
 uniform 4 float4 0.0 -10.0 10.0 100.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) 2

@@ -28,7 +28,7 @@ if(sm<4) uniform 0 float4 2 3 4 5
 if(sm<4) uniform 4 float4 0 -10 10 100
 if(sm>=4) uniform 0 int4 2 3 4 5
 if(sm>=4) uniform 4 int4 0 -10 10 100
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) 2

@@ -43,7 +43,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (64.0, 64.0, 64.0, 40.0)

diff --git a/tests/hlsl/length.shader_test b/tests/hlsl/length.shader_test
index 4080ff406..c44b3e1ae 100644
--- a/tests/hlsl/length.shader_test
+++ b/tests/hlsl/length.shader_test
@@ -8,7 +8,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 2.0 3.0 4.0 5.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (7.34846926, 7.34846926, 7.34846926, 7.34846926) 1

[pixel shader]
@@ -21,7 +21,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 2.0 3.0 4.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (5.38516474, 5.38516474, 5.38516474, 5.38516474) 1

[pixel shader]
@@ -34,7 +34,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 2.0 3.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (3.60555124, 3.60555124, 3.60555124, 3.60555124) 1

[pixel shader]
@@ -47,7 +47,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 2.0 0.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 2.0, 2.0, 2.0)

[pixel shader]
@@ -60,7 +60,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 2.0 0.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 2.0, 2.0, 2.0)

[pixel shader fail]
diff --git a/tests/hlsl/lerp.shader_test b/tests/hlsl/lerp.shader_test
index ae6ef5343..908e594bc 100644
--- a/tests/hlsl/lerp.shader_test
+++ b/tests/hlsl/lerp.shader_test
@@ -12,7 +12,7 @@ float4 main() : SV_TARGET
 uniform 0 float4 2.0 3.0 4.0 5.0
 uniform 4 float4 0.0 -10.0 10.0 100.0
 uniform 8 float4 0.0 1.0 -1.0 0.75
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, -10.0, -2.0, 76.25)

@@ -33,7 +33,7 @@ if(sm<4) uniform 8 float4 0 1 -1 1000000
 if(sm>=4) uniform 0 int4 2 3 4 0
 if(sm>=4) uniform 4 int4 0 -10 10 1000000
 if(sm>=4) uniform 8 int4 0 1 -1 1000000
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, -10.0, -2.0, 1e12) 4

@@ -49,7 +49,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (-6.0, -2.2, 4.48, 8.28) 1

diff --git a/tests/hlsl/lit.shader_test b/tests/hlsl/lit.shader_test
index 273d52678..efb249dba 100644
--- a/tests/hlsl/lit.shader_test
+++ b/tests/hlsl/lit.shader_test
@@ -8,17 +8,17 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -0.1 10.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 0.0, 0.0, 1.0)

[test]
 uniform 0 float4 1.2 -0.1 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 1.2, 0.0, 1.0)

[test]
 uniform 0 float4 1.2 2.0 3.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 1.2, 8.0, 1.0)

[pixel shader todo(sm<4)]
@@ -31,7 +31,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.2 2.0 3.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (2.0, 2.4, 16.0, 2.0)

[pixel shader fail]
diff --git a/tests/hlsl/load-level.shader_test b/tests/hlsl/load-level.shader_test
index 74cb90f1a..53e47a3a6 100644
--- a/tests/hlsl/load-level.shader_test
+++ b/tests/hlsl/load-level.shader_test
@@ -22,10 +22,10 @@ float4 main() : sv_target

[test]
 uniform 0 uint 0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 0.0, 1.0, 0.0)
 uniform 0 uint 1
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 1.0, 0.0)

[pixel shader fail]
@@ -47,5 +47,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 0.0, 1.0, 0.0)
diff --git a/tests/hlsl/log.shader_test b/tests/hlsl/log.shader_test
index b0f405d11..c7165dcc0 100644
--- a/tests/hlsl/log.shader_test
+++ b/tests/hlsl/log.shader_test
@@ -8,7 +8,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 2.0 4.0 5.0 0.4
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 2.32192802, -1.32192802) 1

[pixel shader]
@@ -21,7 +21,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 10.0 100.0 1.0 0.1
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 0.0, -1.0) 1

[pixel shader]
@@ -34,5 +34,5 @@ float4 main() : sv_target

[test]
 uniform 0 float4 3.0 10.0 1.0 0.1
-draw quad
+todo(glsl) draw quad
 probe all 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 360ca03b3..a01884b82 100644
--- a/tests/hlsl/logic-operations.shader_test
+++ b/tests/hlsl/logic-operations.shader_test
@@ -8,7 +8,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 1.0, 1.0, 1.0)

[pixel shader]
@@ -22,7 +22,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 1.0)

[pixel shader]
@@ -35,7 +35,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 1.0)

[pixel shader]
@@ -48,7 +48,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 1.0, 1.0, 1.0)

[pixel shader]
@@ -61,7 +61,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 1.0, 1.0, 1.0)

[pixel shader]
@@ -75,7 +75,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 1.0)

[pixel shader]
@@ -88,7 +88,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 1.0)

[pixel shader]
@@ -101,7 +101,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 1.0, 1.0, 1.0)

[pixel shader]
@@ -114,7 +114,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 1.0, 1.0, 1.0)

[pixel shader]
@@ -128,7 +128,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 1.0)

[pixel shader]
@@ -141,7 +141,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 1.0)

[pixel shader]
@@ -154,5 +154,5 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 1.0, 1.0, 1.0)
diff --git a/tests/hlsl/loop.shader_test b/tests/hlsl/loop.shader_test
index b913167a6..2de10d986 100644
--- a/tests/hlsl/loop.shader_test
+++ b/tests/hlsl/loop.shader_test
@@ -18,7 +18,7 @@ float4 main() : sv_target

[test]
 uniform 0 float 5.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (50.0, 50.0, 50.0, 50.0)

@@ -41,7 +41,7 @@ float4 main() : sv_target

[test]
 uniform 0 float 4.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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 4.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (409.1, 409.1, 409.1, 409.1)

[pixel shader todo(sm<4)]
@@ -100,7 +100,7 @@ float4 main() : sv_target

[test]
 uniform 0 float 4.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (410.1, 410.1, 410.1, 410.1)

% loop attribute by itself
@@ -118,7 +118,7 @@ float4 main() : sv_target
 }

[test]
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (10.0, 10.0, 10.0, 10.0)

[pixel shader todo(sm<4)]
@@ -137,7 +137,7 @@ float4 main() : sv_target
 }

[test]
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (10.0, 10.0, 10.0, 10.0)

[pixel shader todo(sm<4)]
@@ -156,7 +156,7 @@ float4 main() : sv_target
 }

[test]
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (10.0, 10.0, 10.0, 10.0)

% unroll can't be used with fastopt or loop
diff --git a/tests/hlsl/majority-pragma.shader_test b/tests/hlsl/majority-pragma.shader_test
index 4d40d8f60..993ecf05b 100644
--- a/tests/hlsl/majority-pragma.shader_test
+++ b/tests/hlsl/majority-pragma.shader_test
@@ -17,7 +17,7 @@ uniform  0 float4 0.1 0.2 0.0 0.0
 uniform  4 float4 0.3 0.4 0.0 0.0
 uniform  8 float4 0.1 0.3 0.0 0.0
 uniform 12 float4 0.2 0.4 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.17, 0.39, 0.17, 0.39) 1

@@ -40,7 +40,7 @@ float4 main() : sv_target
 [test]
 uniform  0 float4 0.1 0.2 0.0 0.0
 uniform  4 float4 0.3 0.4 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.1, 0.2, 0.3, 0.4)

@@ -61,7 +61,7 @@ uniform  0 float4 0.0 0.0 0.0 0.0
 uniform  4 float4 0.0 0.0 0.0 0.0
 uniform  8 float4 0.5 0.6 0.0 0.0
 uniform 12 float4 0.7 0.8 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.5, 0.6, 0.7, 0.8)

@@ -90,7 +90,7 @@ float4 main() : sv_target
 [test]
 uniform  0 float4 0.1 0.2 0.0 0.0
 uniform  4 float4 0.3 0.4 0.0 0.0
-draw quad
+todo(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

@@ -112,7 +112,7 @@ float4 main() : sv_target
 [test]
 uniform  0 float4 0.1 0.2 0.0 0.0
 uniform  4 float4 0.3 0.4 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.1, 0.2, 0.3, 0.4)

@@ -150,7 +150,7 @@ uniform  0 float4 0.3 0.4 0.0 0.0
 uniform  4 float4 0.0 0.0 0.0 0.0
 uniform  8 float4 0.0 0.0 0.0 0.0
 uniform 12 float4 0.5 0.6 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.3, 0.4, 0.5, 0.6)

@@ -174,7 +174,7 @@ float4 main() : sv_target
 [test]
 uniform  0 float4 0.1 0.2 0.0 0.0
 uniform  4 float4 0.3 0.4 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.1, 0.2, 0.3, 0.4)

@@ -202,7 +202,7 @@ float4 main() : sv_target
 [test]
 uniform  0 float4 0.2 0.4 0.0 0.0
 uniform  4 float4 0.3 0.5 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.2, 0.3, 0.4, 0.5)

@@ -222,7 +222,7 @@ uniform  0 float4 0.3 0.0 0.0 0.0
 uniform  4 float4 0.4 0.0 0.0 0.0
 uniform  8 float4 0.0 0.5 0.0 0.0
 uniform 12 float4 0.0 0.6 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.3, 0.4, 0.5, 0.6)

% Compiler options
@@ -246,7 +246,7 @@ uniform  0 float4 0.1 0.5 0.9 1.3
 uniform  4 float4 0.2 0.6 1.0 1.4
 uniform  8 float4 0.3 0.7 1.1 1.5
 uniform 12 float4 0.4 0.8 1.2 1.6
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.2, 0.3, 0.6, 0.7) 1

[require]
@@ -268,7 +268,7 @@ uniform  0 float4 0.1 0.5 0.9 1.3
 uniform  4 float4 0.2 0.6 1.0 1.4
 uniform  8 float4 0.3 0.7 1.1 1.5
 uniform 12 float4 0.4 0.8 1.2 1.6
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.2, 0.3, 0.6, 0.7) 1

[require]
@@ -290,7 +290,7 @@ uniform  0 float4 0.1 0.5 0.9 1.3
 uniform  4 float4 0.2 0.6 1.0 1.4
 uniform  8 float4 0.3 0.7 1.1 1.5
 uniform 12 float4 0.4 0.8 1.2 1.6
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.5, 0.9, 0.6, 1.0) 1

[require]
@@ -318,7 +318,7 @@ uniform 16 float4 1.7 2.1 2.5 2.9
 uniform 20 float4 1.8 2.2 2.6 3.0
 uniform 24 float4 1.9 2.3 2.7 3.1
 uniform 28 float4 2.0 2.4 2.8 3.2
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.3, 0.4, 2.5, 2.9) 1

[require]
@@ -346,7 +346,7 @@ uniform 16 float4 1.7 2.1 2.5 2.9
 uniform 20 float4 1.8 2.2 2.6 3.0
 uniform 24 float4 1.9 2.3 2.7 3.1
 uniform 28 float4 2.0 2.4 2.8 3.2
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.2, 1.6, 3.1, 3.2) 1

[require]
@@ -366,5 +366,5 @@ float4 main() : sv_target
 [test]
 uniform  0 float4 0.1 0.2 0.0 0.0
 uniform  4 float4 0.3 0.4 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all 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 f1f5291ff..3a0e5befe 100644
--- a/tests/hlsl/majority-syntax.shader_test
+++ b/tests/hlsl/majority-syntax.shader_test
@@ -11,7 +11,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 0.1 0.3 0.0 0.0
 uniform 4 float4 0.2 0.4 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.1, 0.3, 0.2, 0.4)

[pixel shader fail(sm<6)]
diff --git a/tests/hlsl/majority-typedef.shader_test b/tests/hlsl/majority-typedef.shader_test
index 1460e9a08..01af0006e 100644
--- a/tests/hlsl/majority-typedef.shader_test
+++ b/tests/hlsl/majority-typedef.shader_test
@@ -18,5 +18,5 @@ uniform  0 float4 0.1 0.2 0.0 0.0
 uniform  4 float4 0.3 0.4 0.0 0.0
 uniform  8 float4 0.1 0.3 0.0 0.0
 uniform 12 float4 0.2 0.4 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all 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 15f579331..b2259091d 100644
--- a/tests/hlsl/math.shader_test
+++ b/tests/hlsl/math.shader_test
@@ -14,5 +14,5 @@ float4 main() : SV_TARGET
 [test]
 uniform 0 float4 2.5 0.3 0.2 0.7
 uniform 4 float4 0.1 1.5 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all 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 6e2f01b7a..56235c633 100644
--- a/tests/hlsl/matrix-indexing.shader_test
+++ b/tests/hlsl/matrix-indexing.shader_test
@@ -11,7 +11,7 @@ uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 5.0 6.0 7.0 8.0
 uniform 8 float4 9.0 10.0 11.0 12.0
 uniform 12 float4 13.0 14.0 15.0 16.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 10.0, 15.0)

[pixel shader]
@@ -27,7 +27,7 @@ uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 5.0 6.0 7.0 8.0
 uniform 8 float4 9.0 10.0 11.0 12.0
 uniform 12 float4 13.0 14.0 15.0 16.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 10.0, 15.0)

[pixel shader]
@@ -43,7 +43,7 @@ uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 5.0 6.0 7.0 8.0
 uniform 8 float4 9.0 10.0 11.0 12.0
 uniform 12 float4 13.0 14.0 15.0 16.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 5.0, 7.0, 12.0)

[pixel shader]
@@ -58,7 +58,7 @@ float4 main() : SV_TARGET
 [test]
 uniform 0 float4 1.0 2.0 3.0 0.0
 uniform 4 float4 5.0 6.0 7.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 3.0, 6.0, 7.0)

[pixel shader]
@@ -74,7 +74,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 5.0, 7.0, 12.0)

@@ -89,7 +89,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (30.0, 40.0, 5.0, 6.0)

@@ -104,7 +104,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (3.0, 4.0, 50.0, 60.0)

@@ -120,7 +120,7 @@ float4 main() : sv_target

[test]
 uniform 0 float 2
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (8, 9, 10, 11)

@@ -136,5 +136,5 @@ float4 main() : sv_target

[test]
 uniform 0 float 3
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (12, 13, 14, 15)
diff --git a/tests/hlsl/matrix-semantics.shader_test b/tests/hlsl/matrix-semantics.shader_test
index 476b56bf1..352943ddd 100644
--- a/tests/hlsl/matrix-semantics.shader_test
+++ b/tests/hlsl/matrix-semantics.shader_test
@@ -8,7 +8,7 @@ float4x1 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

[pixel shader]
@@ -18,7 +18,7 @@ row_major float1x4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

[rtv 0]
@@ -44,7 +44,7 @@ row_major float4x1 main() : sv_target
 }

[test]
-todo(sm>=6) draw quad
+todo(sm>=6 | glsl) draw quad
 probe rtv 0 all r (1.0)
 probe rtv 1 all r (2.0)
 probe rtv 2 all r (3.0)
@@ -57,7 +57,7 @@ float1x4 main() : sv_target
 }

[test]
-todo(sm>=6) draw quad
+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)
@@ -78,7 +78,7 @@ void main(out float1x2 x : sv_target0, out float1x2 y : sv_target2)
 }

[test]
-todo(sm>=6) draw quad
+todo(sm>=6 | glsl) draw quad
 probe rtv 0 all r (1.0)
 probe rtv 1 all r (2.0)
 probe rtv 2 all r (5.0)
@@ -96,7 +96,7 @@ void main(out row_major float1x4 x : sv_target0, out float1x2 y : sv_target1)
 }

[test]
-todo(sm>=6) draw quad
+todo(sm>=6 | 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)
diff --git a/tests/hlsl/max.shader_test b/tests/hlsl/max.shader_test
index 09f4a882c..67aa69046 100644
--- a/tests/hlsl/max.shader_test
+++ b/tests/hlsl/max.shader_test
@@ -8,7 +8,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.7 -0.1 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.7, 2.1, 2.0, -1.0)

@@ -24,7 +24,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.7 -0.1 0.4 0.8
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.7, 0.8, 0.7, 0.2)

@@ -39,7 +39,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (6.0, 5.0, 4.0, 5.0)

diff --git a/tests/hlsl/minimum-precision.shader_test b/tests/hlsl/minimum-precision.shader_test
index f8d4eb252..040a04f74 100644
--- a/tests/hlsl/minimum-precision.shader_test
+++ b/tests/hlsl/minimum-precision.shader_test
@@ -17,7 +17,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (197.0, 218.0, 238.0, 257.0)

@@ -36,7 +36,7 @@ shader model < 6.0

[test]
 uniform 0 uint4 0 0 0 0
-draw quad
+todo(glsl) draw quad
 probe all rgbaui (0x7fff, 0xffff, 0, 0)

[require]
diff --git a/tests/hlsl/mul.shader_test b/tests/hlsl/mul.shader_test
index 7ddd50b64..5d6318522 100644
--- a/tests/hlsl/mul.shader_test
+++ b/tests/hlsl/mul.shader_test
@@ -11,7 +11,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (30.0, 70.0, 110.0, 150.0)

[pixel shader]
@@ -27,7 +27,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (90.0, 100.0, 110.0, 120.0)

[pixel shader]
@@ -43,7 +43,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (14.0, 38.0, 62.0, 86.0)

[pixel shader]
@@ -59,7 +59,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (38.0, 44.0, 50.0, 56.0)

[pixel shader]
@@ -74,7 +74,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (14.0, 32.0, 50.0, 0.0)

[pixel shader]
@@ -89,7 +89,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (30.0, 36.0, 42.0, 0.0)

[pixel shader]
@@ -105,7 +105,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (50.0, 60.0, 70.0, 80.0)

[pixel shader]
@@ -121,7 +121,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (50.0, 60.0, 70.0, 80.0)

[pixel shader]
@@ -137,7 +137,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (10.0, 20.0, 30.0, 40.0)

[pixel shader]
@@ -153,7 +153,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (10.0, 50.0, 90.0, 130.0)

[pixel shader]
@@ -169,7 +169,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (10.0, 20.0, 30.0, 40.0)

[pixel shader]
@@ -185,7 +185,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (10.0, 50.0, 90.0, 130.0)

[pixel shader]
@@ -201,7 +201,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (90.0, 100.0, 110.0, 120.0)

[pixel shader]
@@ -217,7 +217,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (5.0, 10.0, 15.0, 20.0)

[pixel shader]
@@ -233,7 +233,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 4.0, 6.0, 8.0)

[pixel shader]
@@ -249,7 +249,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (30.0, 70.0, 110.0, 150.0)

[pixel shader]
@@ -267,7 +267,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (83.0, 98.0, 113.0, 128.0)

[pixel shader]
@@ -285,7 +285,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (78.0, 96.0, 114.0, 0.0)

@@ -300,7 +300,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (20.0, 14.0, 56.0, 41.0)

@@ -315,5 +315,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all 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 23c661b33..8172d7f9a 100644
--- a/tests/hlsl/multiple-rt.shader_test
+++ b/tests/hlsl/multiple-rt.shader_test
@@ -14,6 +14,6 @@ void main(out float4 o0 : sv_target0, out float4 o1 : sv_target1)
 }

[test]
-draw quad
+todo(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)
diff --git a/tests/hlsl/nested-arrays.shader_test b/tests/hlsl/nested-arrays.shader_test
index c9ba186bd..cdf8308de 100644
--- a/tests/hlsl/nested-arrays.shader_test
+++ b/tests/hlsl/nested-arrays.shader_test
@@ -21,5 +21,5 @@ uniform  8 float4 0.3 0.0 0.0 0.0
 uniform 12 float4 0.4 0.0 0.0 0.0
 uniform 16 float4 0.5 0.0 0.0 0.0
 uniform 20 float4 0.6 0.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.4, 0.1, 0.6, 0.3)
diff --git a/tests/hlsl/nointerpolation.shader_test b/tests/hlsl/nointerpolation.shader_test
index d2b7d8a46..10be37d26 100644
--- a/tests/hlsl/nointerpolation.shader_test
+++ b/tests/hlsl/nointerpolation.shader_test
@@ -23,7 +23,7 @@ float4 main(nointerpolation float4 t : texcoord) : sv_target
 }

[test]
-draw triangle list 3
+todo(glsl) draw triangle list 3
 probe all rgba (0.0, 1.0, 0.0, 1.0)

[vertex shader]
@@ -50,7 +50,7 @@ float4 main(ps_input input) : sv_target
 }

[test]
-draw triangle list 3
+todo(glsl) draw triangle list 3
 probe all rgba (0.0, 1.0, 0.0, 1.0)

[vertex shader]
@@ -77,7 +77,7 @@ float4 main(nointerpolation ps_input input) : sv_target
 }

[test]
-draw triangle list 3
+todo(glsl) draw triangle list 3
 probe all rgba (0.0, 1.0, 0.0, 1.0)

[vertex shader]
@@ -104,7 +104,7 @@ float4 main(centroid ps_input input) : sv_target
 }

[test]
-draw triangle list 3
+todo(glsl) draw triangle list 3
 probe all rgba (0.0, 1.0, 0.0, 1.0)

[vertex shader]
@@ -135,7 +135,7 @@ shader model >= 4.0
 shader model < 6.0

[test]
-draw triangle list 3
+todo(glsl) draw triangle list 3
 probe all rgba (0.0, 1.0, 0.0, 1.0)

% Centroid for SM 6.
diff --git a/tests/hlsl/non-const-indexing.shader_test b/tests/hlsl/non-const-indexing.shader_test
index d11463349..021517c22 100644
--- a/tests/hlsl/non-const-indexing.shader_test
+++ b/tests/hlsl/non-const-indexing.shader_test
@@ -12,16 +12,16 @@ uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 5.0 6.0 7.0 8.0
 uniform 8 float4 9.0 10.0 11.0 12.0
 uniform 12 float4 0 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)
 uniform 12 float4 1 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (5.0, 6.0, 7.0, 8.0)
 uniform 12 float4 0 1 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (5.0, 6.0, 7.0, 8.0)
 uniform 12 float4 1 1 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (9.0, 10.0, 11.0, 12.0)

@@ -36,16 +36,16 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float 0
-draw quad
+todo(glsl) draw quad
 probe all rgba (11.0, 11.0, 11.0, 11.0)
 uniform 0 float 1
-draw quad
+todo(glsl) draw quad
 probe all rgba (12.0, 12.0, 12.0, 12.0)
 uniform 0 float 2
-draw quad
+todo(glsl) draw quad
 probe all rgba (13.0, 13.0, 13.0, 13.0)
 uniform 0 float 3
-draw quad
+todo(glsl) draw quad
 probe all rgba (14.0, 14.0, 14.0, 14.0)

@@ -61,7 +61,7 @@ float4 main() : sv_target

[test]
 uniform 0 float 2.3
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (3, 3, 3, 3)

@@ -77,16 +77,16 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (21.0, 1.0, 24.0, 0.0)
 uniform 0 float 1
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (22.0, 0.0, 23.0, 1.0)
 uniform 0 float 2
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (23.0, 1.0, 22.0, 0.0)
 uniform 0 float 3
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (24.0, 0.0, 21.0, 1.0)

@@ -102,16 +102,16 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)
 uniform 0 float4 1 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (5.0, 6.0, 7.0, 8.0)
 uniform 0 float4 0 1 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (5.0, 6.0, 7.0, 8.0)
 uniform 0 float4 1 1 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (9.0, 10.0, 11.0, 12.0)

@@ -130,7 +130,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0 0 2.4 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 120.0, 90.0, 4.0)

@@ -155,15 +155,15 @@ float4 main() : sv_target
 [test]
 uniform 0 int 0
 uniform 1 int 0
-draw quad
+todo(glsl) draw quad
 probe all rgba (100, 6, 7, 8)
 uniform 0 int 2
 uniform 1 int 2
-draw quad
+todo(glsl) draw quad
 probe all rgba (5, 6, 100, 8)
 uniform 0 int 1
 uniform 1 int 3
-draw quad
+todo(glsl) draw quad
 probe all rgba (5, 6, 7, 4)

@@ -192,7 +192,7 @@ uniform 0 float4 1 2 3 4
 uniform 4 float4 5 6 7 8
 uniform 8 int 3
 uniform 9 int 4
-draw quad
+todo(glsl) draw quad
 probe all rgba (1126, 3344, 5566, 3788)

@@ -212,7 +212,7 @@ float4 main() : sv_target
 [test]
 uniform 0 uint 1
 uniform 1 uint 0x40a00000
-draw quad
+todo(glsl) draw quad
 probe all rgba (1, 5, 3, 4)

@@ -243,7 +243,7 @@ uniform 8 float 3.0
 uniform 12 float 4.0
 uniform 16 uint4 3 1 0 2
 uniform 20 uint4 0 3 1 2
-todo(sm<4) draw quad
+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)
diff --git a/tests/hlsl/normalize.shader_test b/tests/hlsl/normalize.shader_test
index 9f350a7ee..d30e7efa7 100644
--- a/tests/hlsl/normalize.shader_test
+++ b/tests/hlsl/normalize.shader_test
@@ -8,7 +8,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 2.0 3.0 4.0 5.0
-todo(sm>=6) draw quad
+todo(sm>=6 | glsl) draw quad
 probe all rgba (0.272165537, 0.408248305, 0.544331074, 0.680413842) 2

[pixel shader]
@@ -21,7 +21,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 2.0 3.0 4.0 0.0
-todo(sm>=6) draw quad
+todo(sm>=6 | glsl) draw quad
 probe all rgba (0.371390700, 0.557086051, 0.742781401, 0.0) 1

[pixel shader]
@@ -34,7 +34,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 2.0 3.0 0.0 0.0
-todo(sm<4 | sm>=6) draw quad
+todo(sm<4 | sm>=6 | glsl) draw quad
 probe all rgba (0.554700196, 0.832050323, 0.0, 0.0) 1

[pixel shader]
@@ -47,7 +47,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 2.0 0.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)

[pixel shader]
@@ -60,7 +60,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 2.0 0.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)

[pixel shader fail]
diff --git a/tests/hlsl/numeric-constructor-truncation.shader_test b/tests/hlsl/numeric-constructor-truncation.shader_test
index f18b34d68..de1e2f841 100644
--- a/tests/hlsl/numeric-constructor-truncation.shader_test
+++ b/tests/hlsl/numeric-constructor-truncation.shader_test
@@ -6,7 +6,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (71.0, 72.0, 73.0, 75.0)

@@ -29,5 +29,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 5.0)
diff --git a/tests/hlsl/numeric-types.shader_test b/tests/hlsl/numeric-types.shader_test
index dfdd7a538..dc4fd413e 100644
--- a/tests/hlsl/numeric-types.shader_test
+++ b/tests/hlsl/numeric-types.shader_test
@@ -6,7 +6,7 @@ vector main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

[pixel shader]
@@ -17,7 +17,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

[pixel shader]
@@ -28,7 +28,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 0.0)

[pixel shader fail]
@@ -56,7 +56,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (5.0, 6.0, 7.0, 8.0)

[pixel shader]
@@ -68,7 +68,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (5.0, 6.0, 7.0, 0.0)

[pixel shader fail(sm<6)]
diff --git a/tests/hlsl/numthreads.shader_test b/tests/hlsl/numthreads.shader_test
index e8f7900bf..6793caa95 100644
--- a/tests/hlsl/numthreads.shader_test
+++ b/tests/hlsl/numthreads.shader_test
@@ -185,7 +185,7 @@ void main(uint2 id : sv_dispatchthreadid)
 }

[test]
-todo(sm>=6) dispatch 1 1 1
+todo(sm>=6 | glsl) dispatch 1 1 1
 probe uav 0 (0, 0) r (2.0)
 probe uav 0 (0, 1) r (1.0)
 probe uav 0 (1, 0) r (2.0)
diff --git a/tests/hlsl/object-field-offsets.shader_test b/tests/hlsl/object-field-offsets.shader_test
index 8afd9af7d..2eb1ff774 100644
--- a/tests/hlsl/object-field-offsets.shader_test
+++ b/tests/hlsl/object-field-offsets.shader_test
@@ -19,7 +19,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 5.0 6.0 7.0 8.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 0.0)

@@ -45,7 +45,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 5.0 6.0 7.0 8.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 5.0, 0.0)

@@ -66,5 +66,5 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 5.0 6.0 7.0 8.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 5.0, 0.0)
diff --git a/tests/hlsl/object-references.shader_test b/tests/hlsl/object-references.shader_test
index ab5c1017b..797b75349 100644
--- a/tests/hlsl/object-references.shader_test
+++ b/tests/hlsl/object-references.shader_test
@@ -46,7 +46,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (77.77, 77.77, 77.77, 77.77)

@@ -73,7 +73,7 @@ float4 main(float4 pos : sv_position) : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4)
 probe (1, 0) rgba (0.5, 0.7, 0.6, 0.8)
 probe (0, 1) rgba (0.6, 0.5, 0.2, 0.1)
@@ -111,7 +111,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (312, 312, 312, 111)

@@ -134,7 +134,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2132, 2132, 2132, 1111)

@@ -202,7 +202,7 @@ float4 main() : sv_target

[test]
 uniform 0 float 10.0
-draw quad
+todo(glsl) draw quad
 probe (0, 0) rgba (11.0, 12.0, 13.0, 11.0)

diff --git a/tests/hlsl/pow.shader_test b/tests/hlsl/pow.shader_test
index 1c9394f06..89ebbf7a0 100644
--- a/tests/hlsl/pow.shader_test
+++ b/tests/hlsl/pow.shader_test
@@ -8,7 +8,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.4 0.8 2.5 2.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.512, 0.101192884, 0.64, 0.25) 4

@@ -23,7 +23,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 32.0, 256.0, 125.0) 2

diff --git a/tests/hlsl/precise-modifier.shader_test b/tests/hlsl/precise-modifier.shader_test
index 7ad8f39e2..bbc709d40 100644
--- a/tests/hlsl/precise-modifier.shader_test
+++ b/tests/hlsl/precise-modifier.shader_test
@@ -9,7 +9,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.1 0.2 0.3 0.4
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.1, 0.2, 0.3, 0.4)

[pixel shader fail(sm>=6)]
@@ -23,7 +23,7 @@ precise main() : sv_target

[test]
 uniform 0 float4 0.1 0.2 0.3 0.4
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.1, 0.2, 0.3, 0.4)

[pixel shader]
@@ -37,5 +37,5 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.1 0.2 0.3 0.4
-draw quad
+todo(glsl) draw quad
 probe all 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 3b8f32ab5..82fad0006 100644
--- a/tests/hlsl/rasteriser-ordered-views.shader_test
+++ b/tests/hlsl/rasteriser-ordered-views.shader_test
@@ -32,7 +32,7 @@ uint4 main(float4 pos : sv_position) : sv_target

% Initialise the UAV and RTV.
 [test]
-draw triangle list 3
+todo(glsl) draw triangle list 3
 probe all rui(0xaaaaaaaa)
 probe uav 1 all rui(0x55555555)

diff --git a/tests/hlsl/reflect.shader_test b/tests/hlsl/reflect.shader_test
index 03772dfa9..601f26bb4 100644
--- a/tests/hlsl/reflect.shader_test
+++ b/tests/hlsl/reflect.shader_test
@@ -10,7 +10,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 0.5 -0.1 0.2 0.3
 uniform 4 float4 0.6 0.4 -0.3 1.0
-todo(sm>=6) draw quad
+todo(sm>=6 | glsl) draw quad
 probe all rgba (-0.1, -0.5, 0.5, -0.7) 4

[pixel shader]
@@ -27,7 +27,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 0.5 0.0 0.0 0.0
 uniform 4 float4 0.6 0.4 -0.3 1.0
-todo(sm>=6) draw quad
+todo(sm>=6 | glsl) draw quad
 probe all rgba (-0.52, -0.18, 1.01, -1.2) 4

[pixel shader]
@@ -44,7 +44,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 0.5 -0.1 0.2 0.3
 uniform 4 float4 0.6 0.0 0.0 0.0
-todo(sm>=6) draw quad
+todo(sm>=6 | glsl) draw quad
 probe all rgba (-0.148, -0.748, -0.448, -0.348) 4

[pixel shader]
@@ -62,7 +62,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 0.5 0.0 0.0 0.0
 uniform 4 float4 0.6 0.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.14, 0.14, 0.14, 0.14) 4

[pixel shader]
@@ -79,7 +79,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 0.5 -0.1 0.0 0.0
 uniform 4 float4 0.6 0.4 -0.3 1.0
-todo(sm<4 | sm>=6) draw quad
+todo(sm<4 | sm>=6 | glsl) draw quad
 probe all rgba (0.188, -0.308, 0.0, 0.0) 4

[pixel shader]
@@ -97,5 +97,5 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 0.5 -0.1 0.2 0.0
 uniform 4 float4 0.6 0.4 0.0 0.0
-todo(sm<4 | sm>=6) draw quad
+todo(sm<4 | sm>=6 | glsl) draw quad
 probe all rgba (0.188, -0.308, 0.0, 0.0) 4
diff --git a/tests/hlsl/register-reservations-numeric.shader_test b/tests/hlsl/register-reservations-numeric.shader_test
index 5067d54f9..21d0f727a 100644
--- a/tests/hlsl/register-reservations-numeric.shader_test
+++ b/tests/hlsl/register-reservations-numeric.shader_test
@@ -23,7 +23,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 0.1 0.2 0.3 0.4
 uniform 4 float4 1.1 1.2 1.3 1.4
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.1, 1.4, 0.2, 0.3)

@@ -42,7 +42,7 @@ uniform 4 float4 1.1 1.2 1.3 1.4
 uniform 8 float4 2.1 2.2 2.3 2.4
 uniform 12 float4 3.1 3.2 3.3 3.4
 uniform 16 float4 4.1 4.2 4.3 4.4
-draw quad
+todo(glsl) draw quad
 probe all rgba (4.1, 4.2, 1.3, 1.4)

@@ -84,7 +84,7 @@ uniform 0 float4 0.1 0.2 0.3 0.4
 uniform 4 float4 1.1 1.2 1.3 1.4
 uniform 8 float4 2.1 2.2 2.3 2.4
 uniform 12 float4 3.1 3.2 3.3 3.4
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.1, 2.2, 0.0, 0.0)

@@ -155,7 +155,7 @@ uniform 0 float4 0.1 0.2 0.3 0.4
 uniform 4 float4 1.1 1.2 1.3 1.4
 uniform 8 float4 2.1 2.2 2.3 2.4
 uniform 12 float4 3.1 3.2 3.3 3.4
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.1, 2.2, 2.3, 0.0)

@@ -174,7 +174,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float 100
 uniform 4 float 101
-draw quad
+todo(glsl) draw quad
 probe all rgba (100, 100, 100, 100)

@@ -188,7 +188,7 @@ float4 main(uniform float a : register(c1)) : sv_target
 [test]
 uniform 0 float 100
 uniform 4 float 101
-draw quad
+todo(glsl) draw quad
 probe all rgba (100, 100, 100, 100)

[pixel shader todo]
diff --git a/tests/hlsl/register-reservations-resources.shader_test b/tests/hlsl/register-reservations-resources.shader_test
index 5b53a625a..d6b577bd4 100644
--- a/tests/hlsl/register-reservations-resources.shader_test
+++ b/tests/hlsl/register-reservations-resources.shader_test
@@ -34,7 +34,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (41.0, 41.0, 41.0, 1089.0)

@@ -50,7 +50,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 99.0)

@@ -65,7 +65,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 99.0)

@@ -84,7 +84,7 @@ shader model >= 4.0
 shader model < 6.0

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 99.0)

[require]
@@ -110,7 +110,7 @@ float4 main() : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 99.0)

[pixel shader]
@@ -123,7 +123,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (4.0, 4.0, 4.0, 99.0)

@@ -139,7 +139,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 99.0)

@@ -154,7 +154,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 2.0, 2.0, 99.0)

@@ -168,7 +168,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 2.0, 2.0, 99.0)

@@ -241,5 +241,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 todo(sm<6) probe all rgba (1.0, 1.0, 1.0, 99.0)
diff --git a/tests/hlsl/return-implicit-conversion.shader_test b/tests/hlsl/return-implicit-conversion.shader_test
index 7070b28ae..513be7df5 100644
--- a/tests/hlsl/return-implicit-conversion.shader_test
+++ b/tests/hlsl/return-implicit-conversion.shader_test
@@ -5,7 +5,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.4, 0.3, 0.2, 0.1)

[pixel shader]
@@ -15,7 +15,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.4, 0.3, 0.2, 0.1)

[pixel shader]
@@ -25,7 +25,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.4, 0.3, 0.2, 0.1)

[pixel shader]
@@ -35,7 +35,7 @@ float4x1 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.4, 0.3, 0.2, 0.1)

[pixel shader]
@@ -50,7 +50,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.4, 0.3, 0.2, 0.0)

[pixel shader]
@@ -65,7 +65,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.4, 0.3, 0.2, 0.0)

[pixel shader]
@@ -80,7 +80,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.4, 0.3, 0.2, 0.0)

[pixel shader]
@@ -95,7 +95,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.4, 0.3, 0.2, 0.0)

[pixel shader fail]
@@ -132,7 +132,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.4, 0.3, 0.2, 0.0)

[pixel shader]
@@ -147,7 +147,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.4, 0.3, 0.2, 0.0)

[pixel shader]
@@ -162,7 +162,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.4, 0.3, 0.2, 0.0)

[pixel shader fail(sm<6) todo]
@@ -188,7 +188,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.4, 0.3, 0.2, 0.0)

[pixel shader fail]
@@ -214,7 +214,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.4, 0.3, 0.2, 0.0)

[pixel shader fail]
@@ -240,5 +240,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.4, 0.3, 0.2, 0.0)
diff --git a/tests/hlsl/return.shader_test b/tests/hlsl/return.shader_test
index fa0c454c8..2195f749a 100644
--- a/tests/hlsl/return.shader_test
+++ b/tests/hlsl/return.shader_test
@@ -9,7 +9,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.1, 0.2, 0.3, 0.4)

[pixel shader]
@@ -22,7 +22,7 @@ void main(out float4 ret : sv_target)
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.1, 0.2, 0.3, 0.4)

[pixel shader todo(sm<4)]
@@ -37,10 +37,10 @@ float4 main() : sv_target

[test]
 uniform 0 float 0.2
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.1, 0.2, 0.3, 0.4)
 uniform 0 float 0.8
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.5, 0.6, 0.7, 0.8)

[pixel shader todo(sm<4)]
@@ -63,10 +63,10 @@ void main(out float4 ret : sv_target)

[test]
 uniform 0 float 0.2
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.3, 0.4, 0.5, 0.6)
 uniform 0 float 0.8
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.1, 0.2, 0.3, 0.4)

[pixel shader todo(sm<4)]
@@ -89,13 +89,13 @@ void main(out float4 ret : sv_target)

[test]
 uniform 0 float 0.1
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.1, 0.2, 0.3, 0.4) 1
 uniform 0 float 0.5
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.2, 0.3, 0.4, 0.5) 1
 uniform 0 float 0.9
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.5, 0.6, 0.7, 0.8) 1

[pixel shader todo(sm<4)]
@@ -115,13 +115,13 @@ void main(out float4 ret : sv_target)

[test]
 uniform 0 float 0.1
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.1, 0.2, 0.3, 0.4) 1
 uniform 0 float 0.5
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.5, 0.6, 0.7, 0.8) 1
 uniform 0 float 0.9
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.4, 0.5, 0.6, 0.7) 1

[pixel shader todo(sm<4)]
@@ -138,7 +138,7 @@ void main(out float4 ret : sv_target)
 }

[test]
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.2, 0.4, 0.6, 0.8)

[pixel shader todo(sm<4)]
@@ -160,23 +160,23 @@ void main(out float4 ret : sv_target)

[test]
 uniform 0 float 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.1, 0.1, 0.1, 0.1) 1

uniform 0 float 0.1
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.2, 0.2, 0.2, 0.2) 1

uniform 0 float 0.3
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.4, 0.4, 0.4, 0.4) 1

uniform 0 float 0.7
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.8, 0.8, 0.8, 0.8) 1

uniform 0 float 0.9
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.9, 0.9, 0.9, 0.9) 1

[pixel shader todo(sm<4)]
@@ -204,10 +204,10 @@ void main(out float4 ret : sv_target)

[test]
 uniform 0 float 0.2
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.2, 0.2, 0.2, 0.2)
 uniform 0 float 0.8
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.5, 0.5, 0.5, 0.5)

[pixel shader todo(sm<4)]
@@ -236,21 +236,21 @@ void main(out float4 ret : sv_target)
 uniform 0 float4 0.3 0.0 0.0 0.0
 uniform 4 float4 0.0 0.0 0.0 0.0
 uniform 8 float4 0.1 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.1, 0.1, 0.1, 0.1) 1

uniform 4 float4 0.35 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.2, 0.2, 0.2, 0.2) 1

uniform 8 float4 0.5 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.4, 0.4, 0.4, 0.4) 1

uniform 0 float4 1.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.4, 0.4, 0.4, 0.4) 1

uniform 4 float4 2.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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 b9234b010..a77e1b55b 100644
--- a/tests/hlsl/round.shader_test
+++ b/tests/hlsl/round.shader_test
@@ -8,7 +8,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -0.4 -6.6 7.6 3.4
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, -7.0, 8.0, 3.0) 4

@@ -26,7 +26,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -0.4 -6.6 7.6 3.4
-draw quad
+todo(glsl) draw quad
 probe all rgba (-7.0, 8.0, 0.0, 3.0) 4

@@ -42,5 +42,5 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -1 0 2 10
-draw quad
+todo(glsl) draw quad
 probe all rgba (-1.0, 0.0, 2.0, 10.0) 4
diff --git a/tests/hlsl/sample-bias.shader_test b/tests/hlsl/sample-bias.shader_test
index b63be727f..16761452c 100644
--- a/tests/hlsl/sample-bias.shader_test
+++ b/tests/hlsl/sample-bias.shader_test
@@ -32,13 +32,13 @@ float4 main(float2 coord : texcoord) : sv_target

[test]
 uniform 0 float4 6.5 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (10.0, 0.0, 10.0, 0.0)

uniform 0 float4 7.5 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (4.0, 0.0, 10.0, 0.0)

uniform 0 float4 8.5 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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 6fe76487f..c25faf23a 100644
--- a/tests/hlsl/sample-cmp.shader_test
+++ b/tests/hlsl/sample-cmp.shader_test
@@ -27,7 +27,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 1.0)

[sampler 0]
@@ -36,7 +36,7 @@ address clamp clamp clamp
 comparison less

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 0.0, 0.0, 1.0)

[sampler 0]
@@ -45,7 +45,7 @@ address clamp clamp clamp
 comparison equal

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 1.0, 0.0, 1.0)

[sampler 0]
@@ -54,7 +54,7 @@ address clamp clamp clamp
 comparison less equal

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 0.0, 1.0)

[sampler 0]
@@ -63,7 +63,7 @@ address clamp clamp clamp
 comparison greater

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 1.0, 1.0)

[sampler 0]
@@ -72,7 +72,7 @@ address clamp clamp clamp
 comparison not equal

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 0.0, 1.0, 1.0)

[sampler 0]
@@ -81,7 +81,7 @@ address clamp clamp clamp
 comparison greater equal

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 1.0, 1.0, 1.0)

[sampler 0]
@@ -90,7 +90,7 @@ address clamp clamp clamp
 comparison always

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)

@@ -118,7 +118,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float 0.5
 uniform 1 float 0.00000007
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 1.0, 1.0)

@@ -140,5 +140,5 @@ float4 main() : sv_target

[test]
 uniform 0 float 0.5
-draw quad
+todo(glsl) draw quad
 probe all 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 eab8fdbf8..a1aa88181 100644
--- a/tests/hlsl/sample-grad.shader_test
+++ b/tests/hlsl/sample-grad.shader_test
@@ -26,11 +26,11 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.0 0.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 0.0, 1.0, 0.0)
 uniform 0 float4 1.0 1.0 1.0 1.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 1.0, 0.0)
 uniform 0 float4 2.0 2.0 2.0 2.0
-draw quad
+todo(glsl) draw quad
 probe all 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 66a519863..177f4afab 100644
--- a/tests/hlsl/sample-level.shader_test
+++ b/tests/hlsl/sample-level.shader_test
@@ -26,13 +26,13 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 0.0, 1.0, 0.0)
 uniform 0 float4 0.5 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.5, 0.0, 1.0, 0.0)
 uniform 0 float4 1.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.0, 0.0, 1.0, 0.0)

[require]
@@ -50,11 +50,11 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 0.0, 1.0, 0.0)
 uniform 0 float4 0.5 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.5, 0.0, 1.0, 0.0)
 uniform 0 float4 1.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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 a906b3aa7..267e893a6 100644
--- a/tests/hlsl/sampler-offset.shader_test
+++ b/tests/hlsl/sampler-offset.shader_test
@@ -22,7 +22,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.1, 0.2, 0.5, 0.0)

@@ -36,7 +36,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.2, 0.2, 0.0, 0.4)

@@ -50,5 +50,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.2, 0.0, 0.4)
diff --git a/tests/hlsl/sampler.shader_test b/tests/hlsl/sampler.shader_test
index 51f477c9f..c5fe9cb70 100644
--- a/tests/hlsl/sampler.shader_test
+++ b/tests/hlsl/sampler.shader_test
@@ -17,7 +17,7 @@ float4 main() : sv_target
 }

[test]
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.25, 0, 0.25, 0)

[pixel shader todo(sm<4)]
@@ -30,7 +30,7 @@ float4 main() : sv_target
 }

[test]
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.25, 0, 0.25, 0)

[pixel shader fail]
diff --git a/tests/hlsl/saturate.shader_test b/tests/hlsl/saturate.shader_test
index e3ccce768..c74c93741 100644
--- a/tests/hlsl/saturate.shader_test
+++ b/tests/hlsl/saturate.shader_test
@@ -8,7 +8,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.7 -0.1 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.7, 0.0, 1.0, 0.0)

[pixel shader]
@@ -22,5 +22,5 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -2 0 2 -1
-draw quad
+todo(glsl) draw quad
 probe all 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 ea0cbb979..8a2afb5f4 100644
--- a/tests/hlsl/shader-interstage-interface.shader_test
+++ b/tests/hlsl/shader-interstage-interface.shader_test
@@ -52,5 +52,5 @@ void main(float4 position : SV_Position, float2 t0 : TEXCOORD0,
 }

[test]
-draw triangle strip 4
+todo(glsl) draw triangle strip 4
 probe all rgba (10.0, 8.0, 7.0, 3.0)
diff --git a/tests/hlsl/shape.shader_test b/tests/hlsl/shape.shader_test
index b96f0fd22..2885e0537 100644
--- a/tests/hlsl/shape.shader_test
+++ b/tests/hlsl/shape.shader_test
@@ -7,7 +7,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (3.0, 0.0, 0.0, 0.0)

[pixel shader]
@@ -19,7 +19,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 3.0, 0.0, 0.0)

[pixel shader]
@@ -31,7 +31,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 3.0, 4.0, 5.0)

[pixel shader]
@@ -43,7 +43,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 4.0, 0.0, 0.0)

[pixel shader]
@@ -55,7 +55,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 2.0, 0.0, 0.0)

[pixel shader]
@@ -67,7 +67,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 3.0, 4.0, 5.0)

[pixel shader]
@@ -79,7 +79,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 3.0, 4.0, 5.0)

[pixel shader]
@@ -93,7 +93,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 4.0, 7.0, 9.0)

[pixel shader]
@@ -107,7 +107,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 4.0, 7.0, 9.0)

[pixel shader]
@@ -122,7 +122,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 4.0, 6.0, 8.0)

[pixel shader]
@@ -137,7 +137,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 4.0, 6.0, 8.0)

[pixel shader]
@@ -152,7 +152,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 7.0, 12.0, 17.0)

[pixel shader]
@@ -167,7 +167,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 7.0, 12.0, 17.0)

[pixel shader]
@@ -183,7 +183,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 4.0, 6.0, 0.0)

[pixel shader]
@@ -199,7 +199,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (9.0, 11.0, 13.0, 0.0)

[pixel shader]
@@ -211,7 +211,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 4.0, 6.0, 8.0)

[pixel shader]
@@ -223,7 +223,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 4.0, 6.0, 8.0)

[pixel shader]
@@ -235,7 +235,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 4.0, 6.0, 8.0)

[pixel shader]
@@ -247,7 +247,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 4.0, 6.0, 8.0)

[pixel shader]
@@ -260,7 +260,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 4.0, 6.0, 8.0)

[pixel shader]
@@ -273,7 +273,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 4.0, 6.0, 8.0)

[pixel shader]
@@ -285,7 +285,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 3.0, 4.0, 5.0)

[pixel shader]
@@ -297,7 +297,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 3.0, 4.0, 5.0)

[pixel shader]
@@ -309,7 +309,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 4.0, 0.0, 0.0)

[pixel shader]
@@ -321,7 +321,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 4.0, 0.0, 0.0)

[pixel shader]
@@ -336,7 +336,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 3.0, 4.0, 5.0)

[pixel shader]
@@ -351,5 +351,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all 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 f41e98510..9ac4424e0 100644
--- a/tests/hlsl/side-effects.shader_test
+++ b/tests/hlsl/side-effects.shader_test
@@ -7,7 +7,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)

@@ -23,7 +23,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (11.0, 11.0, 11.0, 11.0)

@@ -48,5 +48,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.2, 2.2, 2.2, 2.2)
diff --git a/tests/hlsl/sign.shader_test b/tests/hlsl/sign.shader_test
index 5d1c18486..27c2160e8 100644
--- a/tests/hlsl/sign.shader_test
+++ b/tests/hlsl/sign.shader_test
@@ -8,13 +8,13 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)
 uniform 0 float4 -1.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (-1.0, -1.0, -1.0, -1.0)
 uniform 0 float4 0.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0)

@@ -28,7 +28,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)

@@ -43,7 +43,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 1.0 2.0 0.0 0.0
 uniform 4 float4 3.0 4.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)

@@ -58,15 +58,15 @@ float4 main() : sv_target
 [test]
 if(sm<4) uniform 0 float4 1 0 0 0
 if(sm>=4) uniform 0 int4 1 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1, 1, 1, 1)
 if(sm<4) uniform 0 float4 -1 0 0 0
 if(sm>=4) uniform 0 int4 -1 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (-1, -1, -1, -1)
 if(sm<4) uniform 0 float4 0 0 0 0
 if(sm>=4) uniform 0 int4 0 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0, 0, 0, 0)

@@ -81,7 +81,7 @@ float4 main() : sv_target
 [test]
 if(sm<4) uniform 0 float4 1 2 3 4
 if(sm>=4) uniform 0 int4 1 2 3 4
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1, 1, 1, 1)

@@ -98,5 +98,5 @@ if(sm<4) uniform 0 float4 1 2 0 0
 if(sm<4) uniform 4 float4 3 4 0 0
 if(sm>=4) uniform 0 int4 1 2 0 0
 if(sm>=4) uniform 4 int4 3 4 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1, 1, 1, 1)
diff --git a/tests/hlsl/single-numeric-initializer.shader_test b/tests/hlsl/single-numeric-initializer.shader_test
index 3b348d6fc..9c223972c 100644
--- a/tests/hlsl/single-numeric-initializer.shader_test
+++ b/tests/hlsl/single-numeric-initializer.shader_test
@@ -6,7 +6,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (7.0, 7.0, 7.0, 7.0)

@@ -22,5 +22,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (7.0, 7.0, 7.0, 8.0)
diff --git a/tests/hlsl/sm1-const-folding.shader_test b/tests/hlsl/sm1-const-folding.shader_test
index 1766de386..1b010eacf 100644
--- a/tests/hlsl/sm1-const-folding.shader_test
+++ b/tests/hlsl/sm1-const-folding.shader_test
@@ -9,7 +9,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (3.0e+009, 0.0, 0.0, 0.0)

% The uint value is never casted to int on SM1-3, just casted to float and treated as such
@@ -21,7 +21,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(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)

@@ -35,7 +35,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 if(sm>=4) probe all rgba (3.0e+009, 0.0, 0.0, 0.0)

[pixel shader]
@@ -46,7 +46,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (-1.29496730e+009, 0.0, 0.0, 0.0)

[pixel shader]
@@ -56,7 +56,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (3.0e+009, 0.0, 0.0, 0.0)

% Unsuffixed literals can instead be considered unsigned on SM6
@@ -67,7 +67,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(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)

@@ -81,7 +81,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.70503270e+009, 0.0, 0.0, 0.0)

% SM1-3 complains that uint values must be positive, but it's not clear why this is a problem here:
@@ -96,7 +96,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 todo probe all rgba (2.14748365e+009, 0.0, 0.0, 0.0)

% Again, no idea of what's happening here
@@ -108,7 +108,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 todo probe all rgba (-2.14748365e+009, 0.0, 0.0, 0.0)

% This makes sense
@@ -119,7 +119,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.70503270e+009, 0.0, 0.0, 0.0)

% This does not again
@@ -130,7 +130,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 todo probe all rgba (-2.14748365e+009, 0.0, 0.0, 0.0)

% Explicit float literals use float semantics, at least
@@ -142,5 +142,5 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (6.0e+009, 0.0, 0.0, 0.0)
diff --git a/tests/hlsl/smoothstep.shader_test b/tests/hlsl/smoothstep.shader_test
index e5ef0f194..7538baeed 100644
--- a/tests/hlsl/smoothstep.shader_test
+++ b/tests/hlsl/smoothstep.shader_test
@@ -9,7 +9,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0, 0.784, 1.0, 0.559872) 1

@@ -24,7 +24,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0, 0.104, 0.896, 1.000000) 6

@@ -39,7 +39,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 0.352, 0, 0) 1

@@ -55,7 +55,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.352, 0.352, 0, 0) 1

@@ -71,7 +71,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.352, 0.352, 0, 0) 1

@@ -87,7 +87,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 0, 0) 1

@@ -103,7 +103,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.028, 0.104, 0.216, 0.352) 6

@@ -132,7 +132,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.5, 0.5, 0.5, 0.0)

@@ -148,7 +148,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.5, 0.5, 0.5, 0.5)

diff --git a/tests/hlsl/sqrt.shader_test b/tests/hlsl/sqrt.shader_test
index 78d89d38f..eb09389c3 100644
--- a/tests/hlsl/sqrt.shader_test
+++ b/tests/hlsl/sqrt.shader_test
@@ -8,7 +8,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.0 9.0 32.3 46.5
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 3.0, 5.683309, 6.819091) 1

[pixel shader]
@@ -21,5 +21,5 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.0 9.0 4.0 16.0
-draw quad
+todo(glsl) draw quad
 probe all 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 de4ac90f9..fea850995 100644
--- a/tests/hlsl/srv-buffers.shader_test
+++ b/tests/hlsl/srv-buffers.shader_test
@@ -23,7 +23,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 100 200 300 400
 uniform 4 float4 1000 2000 3000 4000
-draw quad
+todo(glsl) draw quad
 probe all rgba (200, 3000, 4, 7)

@@ -40,7 +40,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 100 200 300 400
 uniform 4 float4 1000 2000 3000 4000
-draw quad
+todo(glsl) draw quad
 probe all rgba (4000.0, 8.0, 9.0, 10.0)

@@ -67,7 +67,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (3.0, 4.0, -1.0, -1.0)

@@ -88,7 +88,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (4.0, 5.0, 6.0, 7.0)

@@ -101,7 +101,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (8.0, 9.0, 10.0, 11.0)

@@ -138,10 +138,10 @@ float4 main() : sv_target

[test]
 uniform 0 int 2
-draw quad
+todo(glsl) draw quad
 probe all rgba (8.0, 9.0, 10.0, 11.0)
 uniform 0 int 0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 1.0, 2.0, 3.0)

diff --git a/tests/hlsl/state-block-syntax.shader_test b/tests/hlsl/state-block-syntax.shader_test
index 7df3ae7c9..1534fffd8 100644
--- a/tests/hlsl/state-block-syntax.shader_test
+++ b/tests/hlsl/state-block-syntax.shader_test
@@ -169,5 +169,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0, 1, 0, 1)
diff --git a/tests/hlsl/static-initializer.shader_test b/tests/hlsl/static-initializer.shader_test
index ee2103bb1..370070c31 100644
--- a/tests/hlsl/static-initializer.shader_test
+++ b/tests/hlsl/static-initializer.shader_test
@@ -12,7 +12,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.8, 0.0, 0.0, 0.0)

@@ -52,7 +52,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

@@ -147,7 +147,7 @@ float4 main() : sv_target
 }

[test]
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1, 2, 3, 4)

@@ -163,7 +163,7 @@ float4 main() : sv_target
 }

[test]
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1, 2, 3, 4)

diff --git a/tests/hlsl/step.shader_test b/tests/hlsl/step.shader_test
index e201e15f9..6a76859d6 100644
--- a/tests/hlsl/step.shader_test
+++ b/tests/hlsl/step.shader_test
@@ -9,7 +9,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 5.0 -2.6 3.0 2.0
 uniform 4 float4 1.0 -4.3 3.0 4.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 1.0, 1.0)

@@ -23,7 +23,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 0.0)

@@ -51,5 +51,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all 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 86cea4713..ae4775690 100644
--- a/tests/hlsl/storage-qualifiers.shader_test
+++ b/tests/hlsl/storage-qualifiers.shader_test
@@ -17,7 +17,7 @@ void main(in uniform float4 a, uniform float4 b, out float4 o : sv_target)
 [test]
 uniform 0 float4 0.1 0.0 0.0 0.0
 uniform 4 float4 0.2 0.0 0.0 0.0
-todo(sm>=6) draw quad
+todo(sm>=6 | glsl) draw quad
 probe all rgba (0.1, 0.2, 0.3, 0.4)

[pixel shader]
@@ -42,5 +42,5 @@ void main(out float4 o : sv_target)
 [test]
 uniform 0 float4 0.1 0.0 0.0 0.0
 uniform 4 float4 0.2 0.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all 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 aff0a677a..a061927b9 100644
--- a/tests/hlsl/struct-array.shader_test
+++ b/tests/hlsl/struct-array.shader_test
@@ -18,5 +18,5 @@ float4 main() : sv_target
 uniform 0 float4 0.1 0.2 0.0 0.0
 uniform 4 float4 0.3 0.4 0.0 0.0
 uniform 8 float4 0.5 0.6 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all 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 ea55b9ad2..9a66d0325 100644
--- a/tests/hlsl/struct-assignment.shader_test
+++ b/tests/hlsl/struct-assignment.shader_test
@@ -19,5 +19,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all 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 a23f490db..13850be49 100644
--- a/tests/hlsl/struct-semantics.shader_test
+++ b/tests/hlsl/struct-semantics.shader_test
@@ -59,5 +59,5 @@ struct output main(struct input i)
 }

[test]
-draw triangle strip 4
+todo(glsl) draw triangle strip 4
 probe all rgba (0.0, 1.0, 0.0, 1.0)
diff --git a/tests/hlsl/switch.shader_test b/tests/hlsl/switch.shader_test
index ddfeca31e..a3e4dd32e 100644
--- a/tests/hlsl/switch.shader_test
+++ b/tests/hlsl/switch.shader_test
@@ -17,15 +17,15 @@ float4 main() : sv_target
 [test]
 if(sm<4)  uniform 0 float4 3 0 0 0
 if(sm>=4) uniform 0 uint4 3 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (5.0, 5.0, 5.0, 5.0)
 if(sm<4)  uniform 0 float4 1 0 0 0
 if(sm>=4) uniform 0 uint4 1 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (4.0, 4.0, 4.0, 4.0)
 if(sm<4)  uniform 0 float4 0 0 0 0
 if(sm>=4) uniform 0 uint4 0 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (3.0, 3.0, 3.0, 3.0)

@@ -45,15 +45,15 @@ float4 main() : sv_target
 [test]
 if(sm<4)  uniform 0 float4 3 0 0 0
 if(sm>=4) uniform 0 uint4 3 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (5.0, 5.0, 5.0, 5.0)
 if(sm<4)  uniform 0 float4 1 0 0 0
 if(sm>=4) uniform 0 uint4 1 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (5.0, 5.0, 5.0, 5.0)
 if(sm<4)  uniform 0 float4 0 0 0 0
 if(sm>=4) uniform 0 uint4 0 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (5.0, 5.0, 5.0, 5.0)

@@ -91,15 +91,15 @@ float4 main() : sv_target
 [test]
 if(sm<4)  uniform 0 float4 2 0 0 0
 if(sm>=4) uniform 0 uint4 2 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)
 if(sm<4)  uniform 0 float4 1 0 0 0
 if(sm>=4) uniform 0 uint4 1 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.1, 2.0, 3.0, 4.0)
 if(sm<4)  uniform 0 float4 0 0 0 0
 if(sm>=4) uniform 0 uint4 0 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.1, 2.0, 3.0, 4.0)

@@ -127,11 +127,11 @@ float4 main() : sv_target
 [test]
 if(sm<4)  uniform 0 float4 2 0 0 0
 if(sm>=4) uniform 0 uint4 2 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.1, 2.1, 3.1, 4.1)
 if(sm<4)  uniform 0 float4 1 0 0 0
 if(sm>=4) uniform 0 uint4 1 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

@@ -159,11 +159,11 @@ float4 main() : sv_target
 [test]
 if(sm<4)  uniform 0 float4 2 0 0 0
 if(sm>=4) uniform 0 uint4 2 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.1, 2.1, 3.1, 4.1)
 if(sm<4)  uniform 0 float4 1 0 0 0
 if(sm>=4) uniform 0 uint4 1 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

[pixel shader fail(sm<4 | sm>=6) todo(sm<4)]
@@ -188,10 +188,10 @@ float4 main() : sv_target

[test]
 uniform 0 float4 2.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.1, 2.1, 3.1, 4.1)
 uniform 0 float4 1.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

[pixel shader fail]
@@ -390,15 +390,15 @@ float4 main() : sv_target
 [test]
 if(sm<4)  uniform 0 float4 2 0 0 0
 if(sm>=4) uniform 0 uint4 2 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.1, 2.1, 3.1, 4.1)
 if(sm<4)  uniform 0 float4 1 0 0 0
 if(sm>=4) uniform 0 uint4 1 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.2, 2.2, 3.2, 4.2)
 if(sm<4)  uniform 0 float4 0 0 0 0
 if(sm>=4) uniform 0 uint4 0 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

% switch breaks within a loop
@@ -431,7 +431,7 @@ float4 main() : sv_target
 [test]
 if(sm<4)  uniform 0 float4 2 0 0 0
 if(sm>=4) uniform 0 uint4 2 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (5.0, 6.0, 7.0, 8.0)

@@ -464,15 +464,15 @@ float4 main() : sv_target
 [test]
 if(sm<4)  uniform 0 float4 0 0 0 0
 if(sm>=4) uniform 0 uint4 0 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (4.0, 5.0, 6.0, 7.0)
 if(sm<4)  uniform 0 float4 2 0 0 0
 if(sm>=4) uniform 0 uint4 2 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (2.0, 3.0, 4.0, 5.0)
 if(sm<4)  uniform 0 float4 3 0 0 0
 if(sm>=4) uniform 0 uint4 3 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (4.0, 5.0, 6.0, 7.0)

@@ -505,15 +505,15 @@ float4 main() : sv_target
 [test]
 if(sm<4)  uniform 0 float4 3 0 0 0
 if(sm>=4) uniform 0 uint4 3 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)
 if(sm<4)  uniform 0 float4 0 0 0 0
 if(sm>=4) uniform 0 uint4 0 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (4.0, 5.0, 6.0, 7.0)
 if(sm<4)  uniform 0 float4 5 0 0 0
 if(sm>=4) uniform 0 uint4 5 0 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

% 'continue' is not supported in switches
@@ -574,11 +574,11 @@ float4 main() : sv_target
 [test]
 if(sm<4)  uniform 0 float4 1 0 3 1
 if(sm>=4) uniform 0 uint4 1 0 3 1
-draw quad
+todo(glsl) draw quad
 probe all rgba (10.0, 11.0, 12.0, 13.0)
 if(sm<4)  uniform 0 float4 0 0 3 1
 if(sm>=4) uniform 0 uint4 0 0 3 1
-draw quad
+todo(glsl) draw quad
 probe all rgba (7.0, 8.0, 9.0, 10.0)

% return from a switch nested in a loop
@@ -610,11 +610,11 @@ float4 main() : sv_target
 [test]
 if(sm<4)  uniform 0 float4 0 0 3 1
 if(sm>=4) uniform 0 uint4 0 0 3 1
-draw quad
+todo(glsl) draw quad
 probe all rgba (304.0, 305.0, 306.0, 307.0)
 if(sm<4)  uniform 0 float4 1 0 3 1
 if(sm>=4) uniform 0 uint4 1 0 3 1
-draw quad
+todo(glsl) draw quad
 probe all rgba (3.0, 4.0, 5.0, 6.0)

[require]
diff --git a/tests/hlsl/swizzle-constant-prop.shader_test b/tests/hlsl/swizzle-constant-prop.shader_test
index 769122bc7..c837e954d 100644
--- a/tests/hlsl/swizzle-constant-prop.shader_test
+++ b/tests/hlsl/swizzle-constant-prop.shader_test
@@ -25,7 +25,7 @@ float4 main() : sv_target

[test]
 uniform 0 int 4
-draw quad
+todo(glsl) draw quad
 probe all rgba (110, 210, 410, 410)

@@ -43,7 +43,7 @@ float4 main() : sv_target

[test]
 uniform 0 int 3
-draw quad
+todo(glsl) draw quad
 probe all rgba (105, 5, 305, 305)

@@ -59,5 +59,5 @@ float4 main() : sv_target

[test]
 uniform 0 int 1
-draw quad
+todo(glsl) draw quad
 probe all 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 740d4d904..32b3ef85a 100644
--- a/tests/hlsl/swizzle-matrix.shader_test
+++ b/tests/hlsl/swizzle-matrix.shader_test
@@ -9,7 +9,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 11 21 31 -1
 uniform 4 float4 12 22 32 -1
-draw quad
+todo(glsl) draw quad
 probe all rgba (21.0, 31.0, 11.0, 12.0)

@@ -24,7 +24,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 11 21 31 -1
 uniform 4 float4 12 22 32 -1
-draw quad
+todo(glsl) draw quad
 probe all rgba (11.0, 31.0, 12.0, 32.0)

@@ -40,7 +40,7 @@ float4 main() : sv_target
 uniform 0 float4 11 12 -1 -1
 uniform 4 float4 21 22 -1 -1
 uniform 8 float4 31 32 -1 -1
-draw quad
+todo(glsl) draw quad
 probe all rgba (11.0, 31.0, 12.0, 32.0)

@@ -54,7 +54,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 6.0, 1.0, 6.0)

@@ -151,7 +151,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (40.0, 40.0, 40.0, 40.0)

diff --git a/tests/hlsl/swizzles.shader_test b/tests/hlsl/swizzles.shader_test
index c3d3343f3..0bee344b8 100644
--- a/tests/hlsl/swizzles.shader_test
+++ b/tests/hlsl/swizzles.shader_test
@@ -11,7 +11,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.0303 0.08 0.07 0.0202
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0101, 0.0303, 0.0202, 0.0404)

@@ -24,7 +24,7 @@ float4 main() : SV_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.1, 0.6, 0.3, 0.5)

@@ -37,7 +37,7 @@ float4 main() : SV_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.4, 0.3, 0.1, 0.2)

@@ -53,7 +53,7 @@ float4 main() : SV_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.3, 0.2, 0.4, 0.1)

@@ -68,7 +68,7 @@ float4 main() : SV_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.1, 0.2, 0.4, 0.3)

@@ -80,7 +80,7 @@ float4 main() : SV_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.1, 0.4, 0.4, 0.1)

@@ -94,7 +94,7 @@ float4 main() : SV_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.3, 0.1, 0.4, 0.2)

@@ -107,7 +107,7 @@ float4 main() : SV_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.1, 0.2, 0.3, 0.4)

@@ -120,7 +120,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (20.0, 20.0, 20.0, 20.0)

@@ -133,7 +133,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 3.0)

@@ -149,7 +149,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

@@ -166,5 +166,5 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 4.0, 2.0, 3.0)
diff --git a/tests/hlsl/ternary.shader_test b/tests/hlsl/ternary.shader_test
index b61a10a6c..5890b25d5 100644
--- a/tests/hlsl/ternary.shader_test
+++ b/tests/hlsl/ternary.shader_test
@@ -13,10 +13,10 @@ float4 main() : sv_target

[test]
 uniform 0 float4 2.0 3.0 4.0 5.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (2.0, 3.0, 4.0, 5.0)
 uniform 0 float4 0.0 10.0 11.0 12.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (-1.0, 9.0, 10.0, 11.0)

@@ -35,7 +35,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.1 3.0 4.0 5.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.1, 2.0, 0.0, 0.0)

@@ -51,7 +51,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 1.0 0.0 0.0 0.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.5, 0.6, 0.7, 0.0)

@@ -67,7 +67,7 @@ float4 main() : sv_target
 uniform 0 float4 0.0 1.0 0.0 -3.0
 uniform 4 float4 1.0 2.0 3.0 4.0
 uniform 8 float4 5.0 6.0 7.0 8.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (5.0, 2.0, 7.0, 4.0)

@@ -97,7 +97,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 1.0, 3.0, 4.0)

@@ -112,7 +112,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (5.0, 6.0, 7.0, 1.0)

@@ -157,7 +157,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 6.0, 7.0, 4.0)

@@ -199,7 +199,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 6.0, 7.0, 4.0)

@@ -242,7 +242,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (3.0, 3.0, 3.0, 3.0)

@@ -260,7 +260,7 @@ float4 main() : sv_target
 uniform 0 float4 1.0 0.0 0.0 0.0
 uniform 4 float4 1.0 2.0 3.0 4.0
 uniform 8 float4 5.0 6.0 7.0 8.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

@@ -277,7 +277,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (5.0, 6.0, 7.0, 8.0)

@@ -295,7 +295,7 @@ float4 main() : sv_target
 uniform 0 float4 1.0 0.0 1.0 0.0
 uniform 4 float4 1.0 2.0 3.0 4.0
 uniform 8 float4 5.0 6.0 7.0 8.0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 5.0, 1.0, 5.0)

@@ -312,7 +312,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 3.0, 3.0, 2.0)

diff --git a/tests/hlsl/texture-load-offset.shader_test b/tests/hlsl/texture-load-offset.shader_test
index 7705671da..d1542608a 100644
--- a/tests/hlsl/texture-load-offset.shader_test
+++ b/tests/hlsl/texture-load-offset.shader_test
@@ -18,7 +18,7 @@ float4 main(float4 pos : sv_position) : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe (0, 0) rgba (0, 1, 0, 1)
 probe (1, 0) rgba (1, 1, 0, 1)
 probe (0, 1) rgba (0, 2, 0, 1)
@@ -35,7 +35,7 @@ float4 main(float4 pos : sv_position) : sv_target

[test]
-draw quad
+todo(glsl) draw quad
 probe (3, 0) rgba (1, 0, 0, 1)
 probe (4, 0) rgba (2, 0, 0, 1)
 probe (3, 1) rgba (1, 1, 0, 1)
diff --git a/tests/hlsl/texture-load-typed.shader_test b/tests/hlsl/texture-load-typed.shader_test
index 3b7f88232..bbded28ea 100644
--- a/tests/hlsl/texture-load-typed.shader_test
+++ b/tests/hlsl/texture-load-typed.shader_test
@@ -48,7 +48,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.8, -3.0, 4294967295.0, 123.0)

% lowercase 'texture2D'
@@ -65,5 +65,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.8, -3.0, 4294967295.0, 123.0)
diff --git a/tests/hlsl/texture-load.shader_test b/tests/hlsl/texture-load.shader_test
index 118b59273..495fa88ea 100644
--- a/tests/hlsl/texture-load.shader_test
+++ b/tests/hlsl/texture-load.shader_test
@@ -15,7 +15,7 @@ float4 main(float4 pos : sv_position) : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4)
 probe (1, 0) rgba (0.5, 0.7, 0.6, 0.8)
 probe (0, 1) rgba (0.6, 0.5, 0.2, 0.1)
@@ -30,7 +30,7 @@ float4 main(float4 pos : sv_position) : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4)
 probe (1, 0) rgba (0.6, 0.5, 0.2, 0.1)
 probe (0, 1) rgba (0.5, 0.7, 0.6, 0.8)
@@ -46,7 +46,7 @@ float4 main(float4 pos : sv_position) : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4)
 probe (1, 0) rgba (0.6, 0.5, 0.2, 0.1)
 probe (0, 1) rgba (0.5, 0.7, 0.6, 0.8)
@@ -70,7 +70,7 @@ float4 main(float4 pos : sv_position) : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4)
 probe (1, 0) rgba (0.6, 0.5, 0.2, 0.1)
 probe (0, 1) rgba (0.5, 0.7, 0.6, 0.8)
diff --git a/tests/hlsl/texture-ordering.shader_test b/tests/hlsl/texture-ordering.shader_test
index 25819e658..dce1498b7 100644
--- a/tests/hlsl/texture-ordering.shader_test
+++ b/tests/hlsl/texture-ordering.shader_test
@@ -136,7 +136,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (450, 139, 876, 333)

@@ -189,7 +189,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (450, 138, 796, 333)

@@ -242,7 +242,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (478, 913, 256, 333)

@@ -275,7 +275,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (215, 215, 215, 111)

@@ -305,5 +305,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (5, 4, 2, 0)
diff --git a/tests/hlsl/transpose.shader_test b/tests/hlsl/transpose.shader_test
index 83852fa1a..2026367a6 100644
--- a/tests/hlsl/transpose.shader_test
+++ b/tests/hlsl/transpose.shader_test
@@ -5,7 +5,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (5.0, 5.0, 5.0, 5.0)

@@ -18,7 +18,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (5.0, 5.0, 5.0, 5.0)

@@ -39,7 +39,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

@@ -55,7 +55,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 5.0, 8.0, 11.0)

@@ -71,5 +71,5 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 5.0, 8.0, 11.0)
diff --git a/tests/hlsl/trigonometry.shader_test b/tests/hlsl/trigonometry.shader_test
index 034f861b3..3f7f11685 100644
--- a/tests/hlsl/trigonometry.shader_test
+++ b/tests/hlsl/trigonometry.shader_test
@@ -13,7 +13,7 @@ float4 main(float tex : texcoord) : sv_target
 }

[test]
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe ( 0, 0) rgba ( 0.00000000,  1.00000000,  0.00000000, 0.0)
 probe ( 1, 0) rgba ( 0.84147098,  0.54030231,  1.55740772, 0.0) 1024
 probe ( 2, 0) rgba ( 0.90929743, -0.41614684, -2.18503986, 0.0) 1024
@@ -42,7 +42,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.0 0.52359877 2.61799387 3.14159265
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.0, 500.0, 500.0, 0.0)

@@ -56,7 +56,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 0.0 0.78539816 1.57079632 2.35619449
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1000.0, 707.0, -0.0, -707.0)

@@ -72,7 +72,7 @@ float4 main() : sv_target
 % tan(pi/2) is an asymtote and therefore undefined
 % so check 0, pi/4, 3pi/4, pi
 uniform 0 float4 0.0 0.78539816 2.35619449 3.14159265
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0, 1000, -1000.0, 0)

diff --git a/tests/hlsl/trunc.shader_test b/tests/hlsl/trunc.shader_test
index d57438641..db998ff38 100644
--- a/tests/hlsl/trunc.shader_test
+++ b/tests/hlsl/trunc.shader_test
@@ -8,10 +8,10 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -0.5 6.5 7.5 3.4
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (0.0, 6.0, 7.0, 3.0)
 uniform 0 float4 -1.5 6.5 7.5 3.4
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (-1.0, 6.0, 7.0, 3.0)

[pixel shader todo(sm<4)]
@@ -27,7 +27,7 @@ float4 main() : sv_target

[test]
 uniform 0 float4 -0.5 6.5 7.5 3.4
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (6.0, 7.0, 0.0, 3.0)

@@ -45,5 +45,5 @@ float4 main() : sv_target
 [test]
 if(sm<4) uniform 0 float4 -1 6 7 3
 if(sm>=4) uniform 0 int4 -1 6 7 3
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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 6e88fd285..2f9d7fefc 100644
--- a/tests/hlsl/type-names.shader_test
+++ b/tests/hlsl/type-names.shader_test
@@ -37,7 +37,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 3.0, 4.0, 5.0)

% The "dword" alias is pre-defined as lowercase
diff --git a/tests/hlsl/uav-load.shader_test b/tests/hlsl/uav-load.shader_test
index 5ccab48f9..d49a9b722 100644
--- a/tests/hlsl/uav-load.shader_test
+++ b/tests/hlsl/uav-load.shader_test
@@ -23,7 +23,7 @@ void main()
 }

[test]
-dispatch 1 1 1
+todo(glsl) dispatch 1 1 1
 probe uav 0 (0, 0) r (0.6)
 probe uav 0 (1, 0) r (0.6)
 probe uav 0 (2, 0) r (0.6)
diff --git a/tests/hlsl/uav-out-param.shader_test b/tests/hlsl/uav-out-param.shader_test
index 1460d0288..38e6bec96 100644
--- a/tests/hlsl/uav-out-param.shader_test
+++ b/tests/hlsl/uav-out-param.shader_test
@@ -26,7 +26,7 @@ void main()
 }

[test]
-dispatch 1 1 1
+todo(glsl) dispatch 1 1 1
 probe uav 0 (0, 0) rgba (0.4, 0.1, 0.2, 0.3)

[uav 0]
@@ -51,5 +51,5 @@ void main()
 }

[test]
-dispatch 1 1 1
+todo(glsl) dispatch 1 1 1
 probe uav 0 (0, 0) r (0.2)
diff --git a/tests/hlsl/uav-rwbuffer.shader_test b/tests/hlsl/uav-rwbuffer.shader_test
index bcd5c695a..42657ef71 100644
--- a/tests/hlsl/uav-rwbuffer.shader_test
+++ b/tests/hlsl/uav-rwbuffer.shader_test
@@ -180,7 +180,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe uav 1 (0) rgbai (11, -12, 13, -14)
 probe uav 1 (1) rgbai (-15, 16, -17, 18)

@@ -198,5 +198,5 @@ float4 main() : sv_target1
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe uav 2 (0) rgba (11.1, 12.2, 13.3, 14.4)
diff --git a/tests/hlsl/uav-rwtexture.shader_test b/tests/hlsl/uav-rwtexture.shader_test
index b63a8324f..64061244d 100644
--- a/tests/hlsl/uav-rwtexture.shader_test
+++ b/tests/hlsl/uav-rwtexture.shader_test
@@ -50,7 +50,7 @@ float4 main() : sv_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe uav 1 (0, 0) r (0.5)
 probe uav 1 (0, 1) r (0.6)
 probe uav 1 (1, 0) r (0.2)
@@ -100,7 +100,7 @@ float4 main() : sv_target1
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe uav 2 (0, 0) rgba (0.9, 0.8, 0.7, 0.6)

@@ -119,7 +119,7 @@ float4 main() : sv_target1
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe uav 3 (0, 0) rgba (0.9, 0.8, 0.7, 0.6)

% Uppercase register set name
@@ -133,7 +133,7 @@ float4 main() : sv_target1
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe uav 3 (0, 0) rgba (0.9, 0.8, 0.7, 0.6)

% Test that we can declare and use an array of UAVs.
@@ -159,7 +159,7 @@ float4 main() : sv_target1
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe uav 2 (0, 0) rgba (1.1, 1.2, 1.3, 1.4)
 probe uav 3 (0, 0) rgba (2.1, 2.2, 2.3, 2.4)

diff --git a/tests/hlsl/uniform-parameters.shader_test b/tests/hlsl/uniform-parameters.shader_test
index 1951987f0..2b11289d7 100644
--- a/tests/hlsl/uniform-parameters.shader_test
+++ b/tests/hlsl/uniform-parameters.shader_test
@@ -18,7 +18,7 @@ float4 main(uniform float f, uniform int i, uniform uint u, uniform half h) : sv

[test]
 uniform 0 float4 123.0 -2.0 456 0.01
-draw quad
+todo(glsl) draw quad
 probe (320,240) rgba (123.0, -2.0, 456.0, 0.01)

[pixel shader]
@@ -31,5 +31,5 @@ float4 main(uniform float2x2 m, uniform float4 v) : sv_target
 uniform 0 float4 11 12 0 0
 uniform 4 float4 13 14 0 0
 uniform 8 float4 20 21 22 23
-draw quad
+todo(glsl) draw quad
 probe (320,240) rgba (13.0, 21.0, 0.0, 0.0)
diff --git a/tests/hlsl/uniform-semantics.shader_test b/tests/hlsl/uniform-semantics.shader_test
index 1125117fe..f7300266a 100644
--- a/tests/hlsl/uniform-semantics.shader_test
+++ b/tests/hlsl/uniform-semantics.shader_test
@@ -10,7 +10,7 @@ float4 main() : sv_target

[test]
 uniform 0 float 3.5
-draw quad
+todo(glsl) draw quad
 probe all rgba (3.5, 3.5, 3.5, 3.5)

@@ -24,5 +24,5 @@ float4 main() : sv_target

[test]
 uniform 0 float4 4.0 5.0 6.0 7.0
-draw quad
+todo(glsl) draw quad
 probe all 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 e5ffbdd02..bfe261cfc 100644
--- a/tests/hlsl/vector-indexing-uniform.shader_test
+++ b/tests/hlsl/vector-indexing-uniform.shader_test
@@ -12,5 +12,5 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float 2
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.5, 0.3, 0.8, 0.2)
diff --git a/tests/hlsl/vector-indexing.shader_test b/tests/hlsl/vector-indexing.shader_test
index 446b2d0ea..f2634f894 100644
--- a/tests/hlsl/vector-indexing.shader_test
+++ b/tests/hlsl/vector-indexing.shader_test
@@ -10,7 +10,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.02, 0.245, 0.351, 1.0)

[pixel shader]
@@ -23,7 +23,7 @@ float4 main() : SV_TARGET

[test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 2.0, 2.0, 3.0)

@@ -47,7 +47,7 @@ float4 main() : SV_TARGET
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (2.0, 2.0, 2.0, 2.0)

diff --git a/tests/hlsl/vertex-shader-ops.shader_test b/tests/hlsl/vertex-shader-ops.shader_test
index 38f3db658..89e62a76e 100644
--- a/tests/hlsl/vertex-shader-ops.shader_test
+++ b/tests/hlsl/vertex-shader-ops.shader_test
@@ -28,7 +28,7 @@ void main(out float4 res : COLOR1, in float4 pos : position, out float4 out_pos
 [test]
 if(sm<4)  uniform 0 float 0.0
 if(sm>=4) uniform 0 float4 0.0 0.0 0.0 0.0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 0.0, 0.0, 0.0)

@@ -49,12 +49,12 @@ void main(out float4 res : COLOR1, in float4 pos : position, out float4 out_pos
 if(sm<4)  uniform 0 float 3
 if(sm<4)  uniform 4 float 4
 if(sm>=4) uniform 0 int4 3 4 0 0
-draw quad
+todo(glsl) draw quad
 probe all rgba (0.0, 1.0, 0.0, 1.0)
 if(sm<4)  uniform 0 float -2
 if(sm<4)  uniform 4 float -2
 if(sm>=4) uniform 0 int4 -2 -2 0 0
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.0, 0.0, 0.0, 1.0)

@@ -75,12 +75,12 @@ void main(out float4 res : COLOR1, in float4 pos : position, out float4 out_pos
 if(sm<4)  uniform 0 float 0
 if(sm<4)  uniform 4 float 2
 if(sm>=4) uniform 0 int4 0 2 0 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)

@@ -103,11 +103,11 @@ if(sm<4)  uniform 0 float 0
 if(sm<4)  uniform 4 float 100
 if(sm<4)  uniform 8 float 200
 if(sm>=4) uniform 0 int4 0 100 200 0
-todo(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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(sm<4) draw quad
+todo(sm<4 | glsl) draw quad
 probe all 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 374a38bb4..d0ffa7e56 100644
--- a/tests/hlsl/writemask-assignop-0.shader_test
+++ b/tests/hlsl/writemask-assignop-0.shader_test
@@ -11,5 +11,5 @@ float4 main() : SV_target

[test]
 uniform 0 float4 0.0303 0.08 0.07 0.0202
-draw quad
+todo(glsl) draw quad
 probe all 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 61993257c..0e5a01f30 100644
--- a/tests/hlsl/writemask-assignop-1.shader_test
+++ b/tests/hlsl/writemask-assignop-1.shader_test
@@ -12,5 +12,5 @@ float4 main() : SV_target

[test]
 uniform 0 float4 0.0303 0.08 0.07 0.0202
-draw quad
+todo(glsl) draw quad
 probe all 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 4e905e677..feb6ba908 100644
--- a/tests/hlsl/writemask-assignop-2.shader_test
+++ b/tests/hlsl/writemask-assignop-2.shader_test
@@ -9,5 +9,5 @@ float4 main() : SV_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all 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 90957cb00..895afca1a 100644
--- a/tests/hlsl/writemask-assignop-3.shader_test
+++ b/tests/hlsl/writemask-assignop-3.shader_test
@@ -7,5 +7,5 @@ float4 main() : SV_target
 }

[test]
-draw quad
+todo(glsl) draw quad
 probe all rgba (1.9, 1.8, 1.7, 1.6)
diff --git a/tests/shader_runner.c b/tests/shader_runner.c
index 2f99eed99..5eafbcbe4 100644
--- a/tests/shader_runner.c
+++ b/tests/shader_runner.c
@@ -110,8 +110,18 @@ enum parse_state
     STATE_TEST,
 };

-static bool check_qualifier_args_conjunction(const char *line,
-        const char **const rest, enum shader_model sm)
+static bool match_tag(struct shader_runner *runner, const char *tag)
+{
+    for (size_t i = 0; i < runner->caps->tag_count; ++i)
+    {
+        if (!strcmp(tag, runner->caps->tags[i]))
+            return true;
+    }
+
+    return false;
+}
+
+static bool check_qualifier_args_conjunction(struct shader_runner *runner, const char *line, const char **const rest)
 {
     bool holds = true;
     unsigned int i;
@@ -120,6 +130,7 @@ static bool check_qualifier_args_conjunction(const char *line,
     {
         const char *text;
         enum shader_model sm_min, sm_max;
+        bool tag;
     }
     valid_args[] =
     {
@@ -127,6 +138,7 @@ static bool check_qualifier_args_conjunction(const char *line,
         {"sm>=6", SHADER_MODEL_6_0, SHADER_MODEL_6_0},
         {"sm<4",  SHADER_MODEL_2_0, SHADER_MODEL_4_0 - 1},
         {"sm<6",  SHADER_MODEL_2_0, SHADER_MODEL_6_0 - 1},
+        {"glsl", 0, 0, true},
     };

while (*line != ')' && *line != '|')
@@ -139,18 +151,20 @@ static bool check_qualifier_args_conjunction(const char *line,
         for (i = 0; i < ARRAY_SIZE(valid_args); ++i)
         {
             const char *option_text = valid_args[i].text;
+            size_t option_len = strlen(option_text);

-            if (!strncmp(line, option_text, strlen(option_text)))
-            {
-                line += strlen(option_text);
-                if (sm < valid_args[i].sm_min)
-                    holds = false;
-                if (sm > valid_args[i].sm_max)
-                    holds = false;
+            if (strncmp(line, option_text, option_len))
+                continue;

-                match = true;
-                break;
-            }
+            match = true;
+            line += option_len;
+            if (valid_args[i].tag)
+                holds = match_tag(runner, option_text);
+            else if (runner->minimum_shader_model < valid_args[i].sm_min
+                    || runner->minimum_shader_model > valid_args[i].sm_max)
+                holds = false;
+
+            break;
         }

while (isspace(*line))
@@ -173,7 +187,7 @@ static bool check_qualifier_args_conjunction(const char *line,
     return holds;
 }

-static bool check_qualifier_args(const char *line, const char **const rest, enum shader_model sm)
+static bool check_qualifier_args(struct shader_runner *runner, const char *line, const char **const rest)
 {
     bool first = true;
     bool holds = false;
@@ -187,7 +201,7 @@ static bool check_qualifier_args(const char *line, const char **const rest, enum
             ++line;
         first = false;

-        holds = check_qualifier_args_conjunction(line, &line, sm) || holds;
+        holds = check_qualifier_args_conjunction(runner, line, &line) || holds;
     }

assert(*line == ')');
@@ -197,8 +211,8 @@ static bool check_qualifier_args(const char *line, const char **const rest, enum
     return holds;
 }

-static bool match_string_generic(const char *line, const char *token, const char **const rest,
-    bool exclude_bracket, bool allow_qualifier_args, enum shader_model sm)
+static bool match_string_generic(struct shader_runner *runner, const char *line, const char *token,
+        const char **const rest, bool exclude_bracket, bool allow_qualifier_args)
 {
     size_t len = strlen(token);
     bool holds = true;
@@ -212,7 +226,7 @@ static bool match_string_generic(const char *line, const char *token, const char
     line += len;

if (allow_qualifier_args && *line == '(')
-        holds = check_qualifier_args(line, &line, sm);
+        holds = check_qualifier_args(runner, line, &line);

if (rest)
     {
@@ -223,26 +237,26 @@ static bool match_string_generic(const char *line, const char *token, const char
     return holds;
 }

-static bool match_string_with_args(const char *line, const char *token, const char **const rest,
-    enum shader_model sm)
+static bool match_string_with_args(struct shader_runner *runner,
+        const char *line, const char *token, const char **const rest)
 {
-    return match_string_generic(line, token, rest, false, true, sm);
+    return match_string_generic(runner, line, token, rest, false, true);
 }

static bool match_string(const char *line, const char *token, const char **const rest)
 {
-    return match_string_generic(line, token, rest, false, false, 0);
+    return match_string_generic(NULL, line, token, rest, false, false);
 }

-static bool match_directive_substring_with_args(const char *line, const char *token,
-        const char **const rest, enum shader_model sm)
+static bool match_directive_substring_with_args(struct shader_runner *runner,
+        const char *line, const char *token, const char **const rest)
 {
-    return match_string_generic(line, token, rest, true, true, sm);
+    return match_string_generic(runner, line, token, rest, true, true);
 }

static bool match_directive_substring(const char *line, const char *token, const char **const rest)
 {
-    return match_string_generic(line, token, rest, true, false, 0);
+    return match_string_generic(NULL, line, token, rest, true, false);
 }

static const char *close_parentheses(const char *line)
@@ -743,14 +757,14 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
     {
         match = false;

-        if (match_string_with_args(line, "todo", &line, runner->minimum_shader_model))
+        if (match_string_with_args(runner, line, "todo", &line))
         {
             runner->is_todo = true;
             match = true;
         }

line_ini = line;
-        if (match_string_with_args(line, "if", &line, runner->minimum_shader_model))
+        if (match_string_with_args(runner, line, "if", &line))
         {
             match = true;
         }
@@ -1389,18 +1403,18 @@ static enum parse_state read_shader_directive(struct shader_runner *runner, enum
     {
         const char *src_start = src;

-        if (match_directive_substring_with_args(src, "todo", &src, runner->minimum_shader_model))
+        if (match_directive_substring_with_args(runner, src, "todo", &src))
         {
             /* 'todo' is not meaningful when dxcompiler is in use. */
             if (runner->minimum_shader_model >= SHADER_MODEL_6_0)
                 continue;
             state = get_parse_state_todo(state);
         }
-        else if (match_directive_substring_with_args(src, "fail", &src, runner->minimum_shader_model))
+        else if (match_directive_substring_with_args(runner, src, "fail", &src))
         {
             *expect_hr = E_FAIL;
         }
-        else if (match_directive_substring_with_args(src, "notimpl", &src, runner->minimum_shader_model))
+        else if (match_directive_substring_with_args(runner, src, "notimpl", &src))
         {
             *expect_hr = E_NOTIMPL;
         }
@@ -1431,6 +1445,37 @@ static bool check_requirements(const struct shader_runner *runner, const struct
     return true;
 }

+static void trace_tags(const struct shader_runner_caps *caps)
+{
+    char tags[80], *p;
+    size_t rem;
+    int rc;
+
+    p = tags;
+    rem = ARRAY_SIZE(tags);
+    rc = snprintf(p, rem, "      tags:");
+    p += rc;
+    rem -= rc;
+
+    for (size_t i = 0; i < caps->tag_count; ++i)
+    {
+        rc = snprintf(p, rem, " "%s"%s", caps->tags[i], i == caps->tag_count - 1 ? "" : ",");
+        if (!(rc >= 0 && (size_t)rc < rem))
+        {
+            *p = 0;
+            trace("%s\n", tags);
+
+            p = tags;
+            rem = ARRAY_SIZE(tags);
+            rc = snprintf(p, rem, "           ");
+            --i;
+        }
+        p += rc;
+        rem -= rc;
+    }
+    trace("%s.\n", tags);
+}
+
 void run_shader_tests(struct shader_runner *runner, const struct shader_runner_caps *caps,
         const struct shader_runner_ops *ops, void *dxc_compiler)
 {
@@ -1449,6 +1494,8 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c
     trace("Compiling SM%s-SM%s shaders with %s and executing with %s.\n",
             model_strings[caps->minimum_shader_model], model_strings[caps->maximum_shader_model],
             dxc_compiler ? "dxcompiler" : HLSL_COMPILER, caps->runner);
+    if (caps->tag_count)
+        trace_tags(caps);
     trace("   float64: %u.\n", caps->float64);
     trace("     int64: %u.\n", caps->int64);
     trace("       rov: %u.\n", caps->rov);
@@ -1461,6 +1508,7 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c

memset(runner, 0, sizeof(*runner));
     runner->ops = ops;
+    runner->caps = caps;
     runner->minimum_shader_model = caps->minimum_shader_model;
     runner->maximum_shader_model = caps->maximum_shader_model;

diff --git a/tests/shader_runner.h b/tests/shader_runner.h
index 7cba0a525..2f7e8fb25 100644
--- a/tests/shader_runner.h
+++ b/tests/shader_runner.h
@@ -125,6 +125,8 @@ struct input_element
 struct shader_runner_caps
 {
     const char *runner;
+    const char *const *tags;
+    size_t tag_count;
     enum shader_model minimum_shader_model;
     enum shader_model maximum_shader_model;
     bool float64;
@@ -147,6 +149,7 @@ static inline unsigned int shader_runner_caps_get_feature_flags(const struct sha
 struct shader_runner
 {
     const struct shader_runner_ops *ops;
+    const struct shader_runner_caps *caps;

bool is_todo;

diff --git a/tests/shader_runner_gl.c b/tests/shader_runner_gl.c
index de7e49b02..3c2a41965 100644
--- a/tests/shader_runner_gl.c
+++ b/tests/shader_runner_gl.c
@@ -31,6 +31,12 @@

static PFNGLSPECIALIZESHADERPROC p_glSpecializeShader;

+enum shading_language
+{
+    GLSL,
+    SPIR_V,
+};
+
 struct format_info
 {
     enum DXGI_FORMAT f;
@@ -68,6 +74,7 @@ struct gl_runner

struct vkd3d_shader_combined_resource_sampler *combined_samplers;
     unsigned int combined_sampler_count;
+    enum shading_language language;
 };

static struct gl_runner *gl_runner(struct shader_runner *r)
@@ -102,13 +109,16 @@ static bool check_gl_extensions(struct gl_runner *runner)
     {
         "GL_ARB_clip_control",
         "GL_ARB_compute_shader",
-        "GL_ARB_gl_spirv",
         "GL_ARB_sampler_objects",
         "GL_ARB_shader_image_load_store",
         "GL_ARB_texture_storage",
     };

glGetIntegerv(GL_NUM_EXTENSIONS, &count);
+
+    if (runner->language == SPIR_V && !check_gl_extension("GL_ARB_gl_spirv", count))
+        return false;
+
     for (unsigned int i = 0; i < ARRAY_SIZE(required_extensions); ++i)
     {
         if (!check_gl_extension(required_extensions[i], count))
@@ -145,9 +155,10 @@ static bool check_egl_client_extension(const char *extension)
     return false;
 }

-static bool gl_runner_init(struct gl_runner *runner)
+static bool gl_runner_init(struct gl_runner *runner, enum shading_language language)
 {
     PFNEGLQUERYDEVICESEXTPROC eglQueryDevicesEXT;
+    const char *glsl_version = NULL;
     EGLDeviceEXT *devices;
     EGLContext context;
     EGLDisplay display;
@@ -155,6 +166,11 @@ static bool gl_runner_init(struct gl_runner *runner)
     EGLint count;
     GLuint vao;

+    static const char *const tags[] =
+    {
+        "glsl",
+    };
+
     static const EGLint attributes[] =
     {
         EGL_CONTEXT_OPENGL_PROFILE_MASK, EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT,
@@ -165,6 +181,7 @@ static bool gl_runner_init(struct gl_runner *runner)
     };

memset(runner, 0, sizeof(*runner));
+    runner->language = language;

if (!check_egl_client_extension("EGL_EXT_device_enumeration")
             || !(eglQueryDevicesEXT = (void *)eglGetProcAddress("eglQueryDevicesEXT")))
@@ -216,6 +233,18 @@ static bool gl_runner_init(struct gl_runner *runner)
             continue;
         }

+        glsl_version = (const char *)glGetString(GL_SHADING_LANGUAGE_VERSION);
+        if (language == GLSL)
+        {
+            unsigned int major, minor;
+            sscanf(glsl_version, "%u.%u", &major, &minor);
+            if (major < 4 || (major == 4 && minor < 40))
+            {
+                trace("Device %u does not support GLSL 4.40.\n", i);
+                continue;
+            }
+        }
+
         memset(&runner->caps, 0, sizeof(runner->caps));
         if (!check_gl_extensions(runner))
         {
@@ -225,7 +254,9 @@ static bool gl_runner_init(struct gl_runner *runner)
             eglTerminate(display);
             continue;
         }
-        runner->caps.runner = "OpenGL";
+        runner->caps.runner = language == SPIR_V ? "OpenGL/SPIR-V" : "OpenGL/GLSL";
+        runner->caps.tags = tags;
+        runner->caps.tag_count = runner->language == GLSL;
         runner->caps.minimum_shader_model = SHADER_MODEL_4_0;
         runner->caps.maximum_shader_model = SHADER_MODEL_5_1;

@@ -243,9 +274,10 @@ static bool gl_runner_init(struct gl_runner *runner)
         return false;
     }

-    trace("  GL_VENDOR: %s\n", glGetString(GL_VENDOR));
-    trace("GL_RENDERER: %s\n", glGetString(GL_RENDERER));
-    trace(" GL_VERSION: %s\n", glGetString(GL_VERSION));
+    trace("                  GL_VENDOR: %s\n", glGetString(GL_VENDOR));
+    trace("                GL_RENDERER: %s\n", glGetString(GL_RENDERER));
+    trace("                 GL_VERSION: %s\n", glGetString(GL_VERSION));
+    trace("GL_SHADING_LANGUAGE_VERSION: %s\n", glsl_version);

p_glSpecializeShader = (void *)eglGetProcAddress("glSpecializeShader");

@@ -455,7 +487,7 @@ static bool compile_shader(struct gl_runner *runner, ID3DBlob *blob, struct vkd3
     info.source.code = ID3D10Blob_GetBufferPointer(blob);
     info.source.size = ID3D10Blob_GetBufferSize(blob);
     info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF;
-    info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY;
+    info.target_type = runner->language == SPIR_V ? VKD3D_SHADER_TARGET_SPIRV_BINARY : VKD3D_SHADER_TARGET_GLSL;
     info.options = options;
     info.option_count = ARRAY_SIZE(options);
     info.log_level = VKD3D_SHADER_LOG_WARNING;
@@ -494,9 +526,16 @@ static bool compile_shader(struct gl_runner *runner, ID3DBlob *blob, struct vkd3
     }
     vkd3d_shader_free_scan_combined_resource_sampler_info(&combined_sampler_info);

-    info.next = &spirv_info;
-    spirv_info.next = &interface_info;
-    spirv_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_OPENGL_4_5;
+    if (runner->language == SPIR_V)
+    {
+        info.next = &spirv_info;
+        spirv_info.next = &interface_info;
+        spirv_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_OPENGL_4_5;
+    }
+    else
+    {
+        info.next = &interface_info;
+    }

if (runner->r.uniform_count)
     {
@@ -592,8 +631,9 @@ static GLuint compile_compute_shader_program(struct gl_runner *runner)
 {
     struct vkd3d_shader_code cs_code;
     GLuint program_id, cs_id;
+    const GLchar *source;
     ID3D10Blob *cs_blob;
-    GLint status;
+    GLint status, size;
     bool ret;

reset_combined_samplers(runner);
@@ -605,9 +645,20 @@ static GLuint compile_compute_shader_program(struct gl_runner *runner)
         return false;

cs_id = glCreateShader(GL_COMPUTE_SHADER);
-    glShaderBinary(1, &cs_id, GL_SHADER_BINARY_FORMAT_SPIR_V, cs_code.code, cs_code.size);
+    if (runner->language == SPIR_V)
+    {
+        glShaderBinary(1, &cs_id, GL_SHADER_BINARY_FORMAT_SPIR_V, cs_code.code, cs_code.size);
+    }
+    else
+    {
+        source = cs_code.code;
+        size = cs_code.size;
+        glShaderSource(cs_id, 1, &source, &size);
+        glCompileShader(cs_id);
+    }
     vkd3d_shader_free_shader_code(&cs_code);
-    p_glSpecializeShader(cs_id, "main", 0, NULL, NULL);
+    if (runner->language == SPIR_V)
+        p_glSpecializeShader(cs_id, "main", 0, NULL, NULL);
     glGetShaderiv(cs_id, GL_COMPILE_STATUS, &status);
     ok(status, "Failed to compile compute shader.\n");
     trace_info_log(cs_id, false);
@@ -752,8 +803,9 @@ static GLuint compile_graphics_shader_program(struct gl_runner *runner, ID3D10Bl
 {
     struct vkd3d_shader_code vs_code, fs_code;
     GLuint program_id, vs_id, fs_id;
+    const GLchar *source;
     ID3D10Blob *fs_blob;
-    GLint status;
+    GLint status, size;

reset_combined_samplers(runner);

@@ -783,17 +835,39 @@ static GLuint compile_graphics_shader_program(struct gl_runner *runner, ID3D10Bl
     ID3D10Blob_Release(fs_blob);

vs_id = glCreateShader(GL_VERTEX_SHADER);
-    glShaderBinary(1, &vs_id, GL_SHADER_BINARY_FORMAT_SPIR_V, vs_code.code, vs_code.size);
+    if (runner->language == SPIR_V)
+    {
+        glShaderBinary(1, &vs_id, GL_SHADER_BINARY_FORMAT_SPIR_V, vs_code.code, vs_code.size);
+    }
+    else
+    {
+        source = vs_code.code;
+        size = vs_code.size;
+        glShaderSource(vs_id, 1, &source, &size);
+        glCompileShader(vs_id);
+    }
     vkd3d_shader_free_shader_code(&vs_code);
-    p_glSpecializeShader(vs_id, "main", 0, NULL, NULL);
+    if (runner->language == SPIR_V)
+        p_glSpecializeShader(vs_id, "main", 0, NULL, NULL);
     glGetShaderiv(vs_id, GL_COMPILE_STATUS, &status);
     ok(status, "Failed to compile vertex shader.\n");
     trace_info_log(vs_id, false);

fs_id = glCreateShader(GL_FRAGMENT_SHADER);
-    glShaderBinary(1, &fs_id, GL_SHADER_BINARY_FORMAT_SPIR_V, fs_code.code, fs_code.size);
+    if (runner->language == SPIR_V)
+    {
+        glShaderBinary(1, &fs_id, GL_SHADER_BINARY_FORMAT_SPIR_V, fs_code.code, fs_code.size);
+    }
+    else
+    {
+        source = fs_code.code;
+        size = fs_code.size;
+        glShaderSource(fs_id, 1, &source, &size);
+        glCompileShader(fs_id);
+    }
     vkd3d_shader_free_shader_code(&fs_code);
-    p_glSpecializeShader(fs_id, "main", 0, NULL, NULL);
+    if (runner->language == SPIR_V)
+        p_glSpecializeShader(fs_id, "main", 0, NULL, NULL);
     glGetShaderiv(fs_id, GL_COMPILE_STATUS, &status);
     ok(status, "Failed to compile fragment shader.\n");
     trace_info_log(fs_id, false);
@@ -1056,19 +1130,24 @@ static const struct shader_runner_ops gl_runner_ops =
     .release_readback = gl_runner_release_readback,
 };

-void run_shader_tests_gl(void)
+static void run_tests(enum shading_language language)
 {
     struct gl_runner runner;
+
+    if (!gl_runner_init(&runner, language))
+        return;
+    run_shader_tests(&runner.r, &runner.caps, &gl_runner_ops, NULL);
+    gl_runner_cleanup(&runner);
+}
+
+void run_shader_tests_gl(void)
+{
     const char *test_name;

test_name = vkd3d_test_name;
     vkd3d_test_name = "shader_runner_gl";
-    if (!gl_runner_init(&runner))
-        goto done;
-
-    run_shader_tests(&runner.r, &runner.caps, &gl_runner_ops, NULL);
-    gl_runner_cleanup(&runner);
-done:
+    run_tests(SPIR_V);
+    run_tests(GLSL);
     vkd3d_test_name = test_name;
 }

[PATCH 0/1] MR730: tests/shader_runner: Add GLSL support to the GL runner. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.

[PATCH 0/1] MR730: tests/shader_runner: Add GLSL support to the GL runner. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.