diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2011-01-07 16:05:59 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2011-01-10 17:39:16 -0800 |
| commit | 469ea695bbbc984ebec26b2413ab70d450a283ca (patch) | |
| tree | 71c817b3307e2a20a9c2c93a9e1e42681fcbd7ae | |
| parent | a0c2ec8e2dcf90709dd2e147b06a0a173611b0a1 (diff) | |
glsl: Disallow 'in' and 'out' on globals in GLSL 1.20
Fixes piglit tests glsl-1.20/compiler/qualifiers/in-01.vert and
glsl-1.20/compiler/qualifiers/out-01.vert and bugzilla #32910.
NOTE: This is a candidate for the 7.9 and 7.10 branches. This patch
also depends on the previous two commits.
| -rw-r--r-- | src/glsl/ast_to_hir.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index a8dcae6e810..c4bd7e64e27 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl/ast_to_hir.cpp @@ -2076,18 +2076,18 @@ ast_declarator_list::hir(exec_list *instructions, * * This is relaxed in GLSL 1.30. */ - if (state->language_version < 120) { + if (state->language_version < 130) { if (this->type->qualifier.flags.q.out) { _mesa_glsl_error(& loc, state, "`out' qualifier in declaration of `%s' " - "only valid for function parameters in GLSL 1.10.", - decl->identifier); + "only valid for function parameters in %s.", + decl->identifier, state->version_string); } if (this->type->qualifier.flags.q.in) { _mesa_glsl_error(& loc, state, "`in' qualifier in declaration of `%s' " - "only valid for function parameters in GLSL 1.10.", - decl->identifier); + "only valid for function parameters in %s.", + decl->identifier, state->version_string); } /* FINISHME: Test for other invalid qualifiers. */ } |