Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com>
---
tests/all.py | 5 -----
...global-initializer-matched-2-shaders.shader_test | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 5 deletions(-)
create mode 100644
tests/spec/glsl-1.10/linker/global-initializer-matched-2-shaders.shader_test
diff --git a/tests/all.py b/tests/all.py
index 33b6321..3ba0432 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -594,11 +594,6 @@ with profile.group_manager(PiglitGLTest, 'shaders') as g:
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-01c.vert'),
- os.path.join('shaders', 'glsl-link-initializer-01d.vert'),
- 'pass'],
- 'GLSL link matched global initializer, 2 shaders')
- g(['glsl-link-test',
os.path.join('shaders', 'glsl-link-initializer-01b.vert'),
os.path.join('shaders', 'glsl-link-initializer-01d.vert'),
'fail'],
diff --git
a/tests/spec/glsl-1.10/linker/global-initializer-matched-2-shaders.shader_test
b/tests/spec/glsl-1.10/linker/global-initializer-matched-2-shaders.shader_test
new file mode 100644
index 0000000..dcee649
--- /dev/null
+++
b/tests/spec/glsl-1.10/linker/global-initializer-matched-2-shaders.shader_test
@@ -0,0 +1,21 @@
+[require]
+GLSL >= 1.10
+
+[vertex shader]
+float global_variable = 2.0;
+
+/* This works around a bug in Apple's GLSL compiler. Their compiler won't
allow
+ * a shader doesn't have any executable code.
+ */
+void apple_work_around2() {}
+
+[vertex shader]
+float global_variable = 2.0;
+
+void main()
+{
+ gl_Position = gl_Vertex;
+}
+
+[test]
+link success
--
2.8.2
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
