[Piglit] [PATCH 05/11] shaders: port "GLSL link mismatched global const initializer" to shader_runner

[Dylan Baker]

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 tests/all.py                                                 |  5 -----
 tests/shaders/glsl-link-initializer-02a.vert                 |  6 ------
 .../linker/global-const-intializer-mismatch.shader_test}     | 12 ++++++++++++
 3 files changed, 12 insertions(+), 11 deletions(-)
 delete mode 100644 tests/shaders/glsl-link-initializer-02a.vert
 rename tests/{shaders/glsl-link-initializer-02b.vert => spec/glsl-1.10/linker/global-const-intializer-mismatch.shader_test} (59%)

diff --git a/tests/all.py b/tests/all.py
index 0e0e68d..9c65366 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -593,11 +593,6 @@ with profile.group_manager(PiglitGLTest, 'shaders') as g:
     g(['point-vertex-id', 'gl_InstanceID', 'divisor'])
     g(['point-vertex-id', 'gl_VertexID', 'gl_InstanceID', 'divisor'])
     g(['glsl-vs-int-attrib'])
-    g(['glsl-link-test',
-       os.path.join('shaders', 'glsl-link-initializer-02a.vert'),
-       os.path.join('shaders', 'glsl-link-initializer-02b.vert'),
-       'fail'],
-      'GLSL link mismatched global const initializer')
     g(['glsl-link-initializer-03'],
       'GLSL link two programs, global initializer')
     g(['glsl-link-test',
diff --git a/tests/shaders/glsl-link-initializer-02a.vert b/tests/shaders/glsl-link-initializer-02a.vert
deleted file mode 100644
index ede3c33..0000000
--- a/tests/shaders/glsl-link-initializer-02a.vert
+++ /dev/null
@@ -1,6 +0,0 @@
-const float global_constant = 1.0;
-
-void main()
-{
-  gl_Position = gl_Vertex;
-}
diff --git a/tests/shaders/glsl-link-initializer-02b.vert b/tests/spec/glsl-1.10/linker/global-const-intializer-mismatch.shader_test
similarity index 59%
rename from tests/shaders/glsl-link-initializer-02b.vert
rename to tests/spec/glsl-1.10/linker/global-const-intializer-mismatch.shader_test
index 77e3841..2267712 100644
--- a/tests/shaders/glsl-link-initializer-02b.vert
+++ b/tests/spec/glsl-1.10/linker/global-const-intializer-mismatch.shader_test
@@ -1,3 +1,15 @@
+[require]
+GLSL >= 1.10
+
+[vertex shader]
+const float global_constant = 1.0;
+
+void main()
+{
+  gl_Position = gl_Vertex;
+}
+
+[vertex shader]
 const float global_constant = 2.0;
 
 /* This works around a bug in Apple's GLSL compiler.  Their compiler won't allow
-- 
2.8.2