diff options
author | Kenneth Graunke <kenneth@whitecape.org> | 2010-06-04 13:20:29 -0700 |
---|---|---|
committer | Kenneth Graunke <kenneth@whitecape.org> | 2010-06-04 13:20:29 -0700 |
commit | 5752c9a33a66e91544a6af2e926833183318357b (patch) | |
tree | 9e92d10ae4a55a70b8977e8f425d919373cea96a | |
parent | 4b627a1a0bb53b317c1901434407eee13d8d8d35 (diff) |
Change CorrectVersion1.V110.frag to FAIL.
GLSL 1.20 pg. 14 states:
"The #version directive must occur in a shader before anything else,
except for comments and white space.
Thus, a #version line preceded by an earlier #version is illegal.
-rw-r--r-- | tests/all.tests | 2 | ||||
-rw-r--r-- | tests/glslparsertest/shaders/CorrectVersion1.V110.frag | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/all.tests b/tests/all.tests index 23b5d4a14..d4529a384 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -399,7 +399,7 @@ add_glslparsertest('CorrectSwizzle2.vert', 'pass') add_glslparsertest('CorrectSwizzle3.frag', 'pass') add_glslparsertest('CorrectUnsizedArray.frag', 'pass') add_glslparsertest('CorrectVersion.V110.frag', 'pass') -add_glslparsertest('CorrectVersion1.V110.frag', 'pass') +add_glslparsertest('CorrectVersion1.V110.frag', 'fail') add_glslparsertest('CorrectReservedWords.frag', 'pass') add_glslparsertest('CorrectScalarVectorExpressions.frag', 'pass') add_glslparsertest('CGDataTypes.frag', 'fail') diff --git a/tests/glslparsertest/shaders/CorrectVersion1.V110.frag b/tests/glslparsertest/shaders/CorrectVersion1.V110.frag index 831653ddd..1dda65af1 100644 --- a/tests/glslparsertest/shaders/CorrectVersion1.V110.frag +++ b/tests/glslparsertest/shaders/CorrectVersion1.V110.frag @@ -1,9 +1,7 @@ -/* Two version statements are allowed today, in future we may want to raise a - warning or error */ +/* Only one version statement is allowed; two should raise an error. */ #version 110 #version 110 - void main() { gl_FragColor = vec4(1); |