From 39cbef9e018ee760ffd175fdd6729e470529fb77 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Fri, 22 Nov 2024 17:19:01 +0100 Subject: [PATCH] tests: Get rid of some redundant "glsl" todo's. These are redundant either because we already have a broader tag like "sm<6", or because the tests are never executed with the GLSL runner in the first place. --- tests/hlsl/for.shader_test | 2 +- tests/hlsl/function.shader_test | 4 ++-- tests/hlsl/trigonometry.shader_test | 2 +- tests/hlsl/unroll.shader_test | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/hlsl/for.shader_test b/tests/hlsl/for.shader_test index 23acaa46..894ed0c9 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<6 | glsl) draw quad +todo(sm<6) 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) diff --git a/tests/hlsl/function.shader_test b/tests/hlsl/function.shader_test index 49dbb02f..b2bc6769 100644 --- a/tests/hlsl/function.shader_test +++ b/tests/hlsl/function.shader_test @@ -454,7 +454,7 @@ float4 main() : sv_target } [test] -todo(sm>=6 | glsl) draw quad +todo draw quad probe (0, 0) rgba (4.0, 4.0, 0.0, 0.0) [pixel shader fail(sm<6)] @@ -472,7 +472,7 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +draw quad probe (0, 0) rgba (6.0, 6.0, 0.0, 0.0) % Parameters before outputs can't have default values. diff --git a/tests/hlsl/trigonometry.shader_test b/tests/hlsl/trigonometry.shader_test index 7b17c9e6..abcdbc37 100644 --- a/tests/hlsl/trigonometry.shader_test +++ b/tests/hlsl/trigonometry.shader_test @@ -171,5 +171,5 @@ float4 main() : sv_target } [test] -todo(sm<6 | glsl) draw quad +todo(sm<6) draw quad probe (0, 0) rgba (0, 0, 0, 0); diff --git a/tests/hlsl/unroll.shader_test b/tests/hlsl/unroll.shader_test index b50cda50..bc7cbe48 100644 --- a/tests/hlsl/unroll.shader_test +++ b/tests/hlsl/unroll.shader_test @@ -47,7 +47,7 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +draw quad probe (0,0) rgba(1024.0, 0, 0, 0) [pixel shader]