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

glsl: Make the symbol table's add_function just use the function's name.

Browse Source
This commit is contained in:
Eric Anholt
2010-11-05 06:08:45 -07:00
parent 2927b6c212
commit e8f5ebf313
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/glsl/glsl_symbol_table.cpp
+4 -4
View File
@@ -121,18 +121,18 @@ bool glsl_symbol_table::add_type(const char *name, const glsl_type *t)
return _mesa_symbol_table_add_symbol(table, -1, name, entry) == 0;
}
bool glsl_symbol_table::add_function(const char *name, ir_function *f)
bool glsl_symbol_table::add_function(ir_function *f)
{
if (this->language_version == 110 && name_declared_this_scope(name)) {
if (this->language_version == 110 && name_declared_this_scope(f->name)) {
/* In 1.10, functions and variables have separate namespaces. */
symbol_table_entry *existing = get_entry(name);
symbol_table_entry *existing = get_entry(f->name);
if ((existing->f == NULL) && (existing->t == NULL)) {
existing->f = f;
return true;
}
}
symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(f);
return _mesa_symbol_table_add_symbol(table, -1, name, entry) == 0;
return _mesa_symbol_table_add_symbol(table, -1, f->name, entry) == 0;
}
ir_variable *glsl_symbol_table::get_variable(const char *name)