From 3f151509327629ce7d7cbfec42cae987ebf6639f Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 2 Apr 2010 01:53:57 -1000 Subject: [PATCH] Test that invalid quailfiers aren't used on variables in GLSL 1.10. --- ast_to_hir.cpp | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/ast_to_hir.cpp b/ast_to_hir.cpp index 8ed56d5800b..5e0dcaae227 100644 --- a/ast_to_hir.cpp +++ b/ast_to_hir.cpp @@ -1332,6 +1332,32 @@ ast_declarator_list::hir(exec_list *instructions, var = new ir_variable(var_type, decl->identifier); + /* From page 22 (page 28 of the PDF) of the GLSL 1.10 specification; + * + * "Global variables can only use the qualifiers const, + * attribute, uni form, or varying. Only one may be + * specified. + * + * Local variables can only use the qualifier const." + * + * This is relaxed in GLSL 1.30. + */ + if (state->language_version < 120) { + if (this->type->qualifier.out) { + _mesa_glsl_error(& loc, state, + "`out' qualifier in declaration of `%s' " + "only valid for function parameters in GLSL 1.10.", + decl->identifier); + } + if (this->type->qualifier.in) { + _mesa_glsl_error(& loc, state, + "`in' qualifier in declaration of `%s' " + "only valid for function parameters in GLSL 1.10.", + decl->identifier); + } + /* FINISHME: Test for other invalid qualifiers. */ + } + apply_type_qualifier_to_variable(& this->type->qualifier, var, state, & loc); -- 2.30.2