aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2010-09-01 14:16:53 -0700
committerKenneth Graunke <[email protected]>2010-09-01 20:39:09 -0700
commite466b182bbf21f62fe6542091f4af3275555db80 (patch)
tree453dc4208b6aa3ef878173c58871285b63cd1742
parent4d6221f90df9d04e5edcdddb3b6f76c0cb175421 (diff)
glsl2: Remove unnecessary glsl_symbol_table::get_function parameter return_constructors
Now that constructors are not generated as functions or stored in the symbol table, there is no need to flag whether or not constructors should be returned.
-rw-r--r--src/glsl/ast_to_hir.cpp2
-rw-r--r--src/glsl/glsl_symbol_table.cpp9
-rw-r--r--src/glsl/glsl_symbol_table.h2
3 files changed, 4 insertions, 9 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 970ac0818e8..5bdf3da3676 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -2257,7 +2257,7 @@ ast_function::hir(exec_list *instructions,
* seen signature for a function with the same name, or, if a match is found,
* that the previously seen signature does not have an associated definition.
*/
- f = state->symbols->get_function(name, false);
+ f = state->symbols->get_function(name);
if (f != NULL && !f->is_builtin) {
sig = f->exact_matching_signature(&hir_parameters);
if (sig != NULL) {
diff --git a/src/glsl/glsl_symbol_table.cpp b/src/glsl/glsl_symbol_table.cpp
index b56b087530d..e9bf89b951d 100644
--- a/src/glsl/glsl_symbol_table.cpp
+++ b/src/glsl/glsl_symbol_table.cpp
@@ -147,15 +147,10 @@ const glsl_type *glsl_symbol_table::get_type(const char *name)
return entry != NULL ? entry->t : NULL;
}
-ir_function *glsl_symbol_table::get_function(const char *name,
- bool return_constructors)
+ir_function *glsl_symbol_table::get_function(const char *name)
{
symbol_table_entry *entry = get_entry(name);
- // If there's a type, the function is a constructor; caller may not want it.
- if (entry != NULL && (return_constructors || entry->t == NULL))
- return entry->f;
-
- return NULL;
+ return entry != NULL ? entry->f : NULL;
}
symbol_table_entry *glsl_symbol_table::get_entry(const char *name)
diff --git a/src/glsl/glsl_symbol_table.h b/src/glsl/glsl_symbol_table.h
index f1369b52c83..f26de524325 100644
--- a/src/glsl/glsl_symbol_table.h
+++ b/src/glsl/glsl_symbol_table.h
@@ -108,7 +108,7 @@ public:
/*@{*/
ir_variable *get_variable(const char *name);
const glsl_type *get_type(const char *name);
- ir_function *get_function(const char *name, bool return_constructors = true);
+ ir_function *get_function(const char *name);
/*@}*/
private: