KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Slightly refector checks for declarations that must be at global scope

This commit is contained in:
Ian Romanick 2010-03-31 12:26:03 -07:00
parent b82c0c31ae
commit e1c1a3f3bd
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ast_to_hir.cpp
View File

@ -1176,11 +1176,6 @@ ast_declarator_list::hir(exec_list *instructions,
var = new ir_variable(var_type, decl->identifier);
/* FINISHME: Variables that are attribute, uniform, varying, in, or
* FINISHME: out varibles must be declared either at global scope or
* FINISHME: in a parameter list (in and out only).
*/
apply_type_qualifier_to_variable(& this->type->qualifier, var, state,
& loc);
@ -1212,15 +1207,18 @@ ast_declarator_list::hir(exec_list *instructions,
instructions->push_tail(var);
if (this->type->qualifier.attribute
&& (state->current_function != NULL)) {
_mesa_glsl_error(& loc, state,
"attribute variable `%s' must be declared at global "
"scope",
var->name);
}
if ((var->mode == ir_var_in) && (state->current_function == NULL)) {
if (state->current_function != NULL) {
/* FINISHME: Variables that are uniform, varying, in, or
* FINISHME: out varibles must be declared either at global scope or
* FINISHME: in a parameter list (in and out only).
*/
if (this->type->qualifier.attribute) {
_mesa_glsl_error(& loc, state,
"attribute variable `%s' must be declared at "
"global scope",
var->name);
}
} else if (var->mode == ir_var_in) {
if (state->target == vertex_shader) {
bool error_emitted = false;