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

Require that 'uniform' and 'varying' variables be declared at global scope 

This causes the following tests to pass:

    glslparsertest/shaders/uniform.frag
    glslparsertest/shaders/varying.frag
This commit is contained in:
Ian Romanick 2010-03-31 12:31:18 -07:00
parent e1c1a3f3bd
commit b168e53452
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ast_to_hir.cpp
View File

@ -1208,13 +1208,22 @@ ast_declarator_list::hir(exec_list *instructions,
instructions->push_tail(var);
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).
const char *mode = NULL;
/* FINISHME: Variables that are in or out must be declared either at
* FINISHME: global scope or FINISHME: in a parameter list.
*/
if (this->type->qualifier.attribute) {
mode = "attribute";
} else if (this->type->qualifier.uniform) {
mode = "uniform";
} else if (this->type->qualifier.varying) {
mode = "varying";
}
if (mode) {
_mesa_glsl_error(& loc, state,
"attribute variable `%s' must be declared at "
"%s variable `%s' must be declared at "
"global scope",
var->name);
}