From 62a512c4f8c4070f0f4f3ed8e70b6f0bc885da30 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Thu, 2 May 2024 17:11:57 +0200
Subject: [PATCH] tests/shader_runner: Get rid of some redundant "| glsl"
 conditions.

We don't run shader model 6 GLSL tests.
---
 tests/hlsl/calculate-lod.shader_test      |  8 ++++----
 tests/hlsl/depth-out.shader_test          | 10 +++++-----
 tests/hlsl/get-sample-pos.shader_test     |  2 +-
 tests/hlsl/refract.shader_test            |  2 +-
 tests/hlsl/rt-get-sample-info.shader_test |  6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/hlsl/calculate-lod.shader_test b/tests/hlsl/calculate-lod.shader_test
index 74533cfe..69587a18 100644
--- a/tests/hlsl/calculate-lod.shader_test
+++ b/tests/hlsl/calculate-lod.shader_test
@@ -33,7 +33,7 @@ float4 main(float4 pos : sv_position) : sv_target
 }
 
 [test]
-todo(sm<6 | glsl) draw quad
+todo(sm<6) draw quad
 probe all rgba (2.0, 1.0, 0.0, 14.0)
 
 
@@ -50,7 +50,7 @@ float4 main(float4 pos : sv_position) : sv_target
 }
 
 [test]
-todo(sm<6 | glsl) draw quad
+todo(sm<6) draw quad
 probe all rgba (2.0, 2.0, 0.0, 0.0)
 
 
@@ -67,7 +67,7 @@ float4 main(float4 pos : sv_position) : sv_target
 }
 
 [test]
-todo(sm<6 | glsl) draw quad
+todo(sm<6) draw quad
 probe all rgba (2.0, 1.0, 0.0, 14.0)
 
 
@@ -84,5 +84,5 @@ float4 main(float4 pos : sv_position) : sv_target
 }
 
 [test]
-todo(sm<6 | glsl) draw quad
+todo(sm<6) draw quad
 probe all rgba (45.0, 50.0, -14.0, -47.0)
diff --git a/tests/hlsl/depth-out.shader_test b/tests/hlsl/depth-out.shader_test
index 3a99a0f0..282ec5a8 100644
--- a/tests/hlsl/depth-out.shader_test
+++ b/tests/hlsl/depth-out.shader_test
@@ -65,14 +65,14 @@ uniform 0 float4 0.75 0.75 0.0 0.0
 clear rtv 0 1.0 1.0 1.0 1.0
 clear dsv 0.5
 depth greater equal
-todo(sm<6 | glsl) draw quad
+todo(sm<6) draw quad
 probe all rgba (0.0, 1.0, 0.0, 1.0)
 probe dsv all r (0.75)
 
 uniform 0 float4 0.75 0.375 0.0 0.0
 clear rtv 0 1.0 1.0 1.0 1.0
 clear dsv 0.5
-todo(sm<6 | glsl) draw quad
+todo(sm<6) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)
 probe dsv all r (0.5)
 
@@ -91,20 +91,20 @@ uniform 0 float4 0.75 0.75 0.0 0.0
 clear rtv 0 1.0 1.0 1.0 1.0
 clear dsv 0.5
 depth greater equal
-todo(sm<6 | glsl) draw quad
+todo(sm<6) draw quad
 probe all rgba (0.0, 1.0, 0.0, 1.0)
 probe dsv all r (0.75)
 
 uniform 0 float4 0.375 0.625 0.0 0.0
 clear rtv 0 1.0 1.0 1.0 1.0
 clear dsv 0.5
-todo(sm<6 | glsl) draw quad
+todo(sm<6) draw quad
 probe all rgba (0.0, 1.0, 0.0, 1.0)
 probe dsv all r (0.625)
 
 uniform 0 float4 0.375 0.375 0.0 0.0
 clear rtv 0 1.0 1.0 1.0 1.0
 clear dsv 0.5
-todo(sm<6 | glsl) draw quad
+todo(sm<6) draw quad
 probe all rgba (1.0, 1.0, 1.0, 1.0)
 probe dsv all r (0.5)
diff --git a/tests/hlsl/get-sample-pos.shader_test b/tests/hlsl/get-sample-pos.shader_test
index 69b9101b..3fcf6b97 100644
--- a/tests/hlsl/get-sample-pos.shader_test
+++ b/tests/hlsl/get-sample-pos.shader_test
@@ -15,5 +15,5 @@ float4 main() : sv_target
 }
 
 [test]
-todo(sm<6 | glsl) draw quad
+todo(sm<6) draw quad
 probe all rgba (-0.125, -0.375, 0.375, -0.125)
diff --git a/tests/hlsl/refract.shader_test b/tests/hlsl/refract.shader_test
index 53af811f..f123cd44 100644
--- a/tests/hlsl/refract.shader_test
+++ b/tests/hlsl/refract.shader_test
@@ -228,6 +228,6 @@ float4 main() : sv_target
 }
 
 [test]
-todo(sm<6 | glsl) draw quad
+todo(sm<6) draw quad
 if(sm<6) probe all rgba (2.0, 1.0, 1.0, 1.0)
 if(sm>=6) probe all rgba (1.0, 1.0, 1.0, 1.0)
diff --git a/tests/hlsl/rt-get-sample-info.shader_test b/tests/hlsl/rt-get-sample-info.shader_test
index eea4f1a4..9c4ea2fb 100644
--- a/tests/hlsl/rt-get-sample-info.shader_test
+++ b/tests/hlsl/rt-get-sample-info.shader_test
@@ -13,7 +13,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(sm<6 | glsl) draw quad
+todo(sm<6) draw quad
 probe all rgba (4.0, 0.0, 0.0, 0.0)
 
 
@@ -27,8 +27,8 @@ float4 main() : sv_target
 
 [test]
 uniform 0 uint 0
-todo(sm<6 | glsl) draw quad
+todo(sm<6) draw quad
 probe all rgba (-0.125, -0.375, 0.375, -0.125)
 uniform 0 uint 2
-todo(sm<6 | glsl) draw quad
+todo(sm<6) draw quad
 probe all rgba (-0.375, 0.125, 0.125, 0.375)