summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2010-06-17 19:47:12 -0700
committerIan Romanick <ian.d.romanick@intel.com>2010-06-17 19:49:07 -0700
commitc3a0f25cf35aaada7bf0c7868d93f11b64c009ff (patch)
tree031d7dd85ab6c29c8e93eb8d574ec19ad45de8e9
parentcb339b52629c237f6f20cf0e5d6427eaceaa38c5 (diff)
glslparsertest: Add several tests for uniforms with initializers
-rw-r--r--tests/all.tests2
-rw-r--r--tests/glslparsertest/glsl2/uniform-01.vert3
-rw-r--r--tests/glslparsertest/glsl2/uniform-02.vert2
3 files changed, 7 insertions, 0 deletions
diff --git a/tests/all.tests b/tests/all.tests
index d03f3050d..6bc4da7e9 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -676,6 +676,8 @@ add_otherglslparsertest('glsl2/swiz-01.vert', 'pass')
add_otherglslparsertest('glsl2/swiz-02.vert', 'fail')
add_otherglslparsertest('glsl2/tex_rect-01.frag', 'pass')
add_otherglslparsertest('glsl2/tex_rect-02.frag', 'fail')
+add_otherglslparsertest('glsl2/uniform-01.vert', 'pass')
+add_otherglslparsertest('glsl2/uniform-02.vert', 'fail')
add_otherglslparsertest('glsl2/void-01.vert', 'fail')
# All the GST shaders should pass.
diff --git a/tests/glslparsertest/glsl2/uniform-01.vert b/tests/glslparsertest/glsl2/uniform-01.vert
new file mode 100644
index 000000000..2b0499c38
--- /dev/null
+++ b/tests/glslparsertest/glsl2/uniform-01.vert
@@ -0,0 +1,3 @@
+/* PASS */
+#version 120
+uniform vec2 a = vec2(1.0, 2.0);
diff --git a/tests/glslparsertest/glsl2/uniform-02.vert b/tests/glslparsertest/glsl2/uniform-02.vert
new file mode 100644
index 000000000..2c2edd551
--- /dev/null
+++ b/tests/glslparsertest/glsl2/uniform-02.vert
@@ -0,0 +1,2 @@
+/* FAIL - uniform initializers not allowed in GLSL 1.10 */
+uniform vec2 a = vec2(1.0, 2.0);