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

glsl: Remove name_declared_this_scope check when adding functions. 

Instead, rely on the symbol table's rules.

Fixes redeclaration-02.vert.
This commit is contained in:
Kenneth Graunke 2010-08-25 16:37:46 -07:00 committed by Ian Romanick
parent e9c7ceed27
commit e09591317b
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/glsl/ast_to_hir.cpp
View File

@ -2197,17 +2197,16 @@ ast_function::hir(exec_list *instructions,
_mesa_glsl_error(& loc, state, "function `%s' redefined", name);
}
}
} else if (state->symbols->name_declared_this_scope(name)) {
/* This function name shadows a non-function use of the same name.
*/
YYLTYPE loc = this->get_location();
_mesa_glsl_error(& loc, state, "function name `%s' conflicts with "
"non-function", name);
return NULL;
} else {
f = new(ctx) ir_function(name);
state->symbols->add_function(f->name, f);
if (!state->symbols->add_function(f->name, f)) {
/* This function name shadows a non-function use of the same name. */
YYLTYPE loc = this->get_location();
_mesa_glsl_error(&loc, state, "function name `%s' conflicts with "
"non-function", name);
return NULL;
}
/* Emit the new function header */
instructions->push_tail(f);