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:
parent
e9c7ceed27
commit
e09591317b
|
@ -2197,17 +2197,16 @@ ast_function::hir(exec_list *instructions,
|
||||||
_mesa_glsl_error(& loc, state, "function `%s' redefined", name);
|
_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 {
|
} else {
|
||||||
f = new(ctx) ir_function(name);
|
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 */
|
/* Emit the new function header */
|
||||||
instructions->push_tail(f);
|
instructions->push_tail(f);
|
||||||
|
|
Loading…
Reference in New Issue