glsl: Don't add overloads to existing structure constructors.

Instead, make a new ir_function and try to add it to the symbol table.

Fixes piglit test redeclaration-08.vert.

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 8caf950c2d2b49a971e71acb951312d72462b6d7..c666da300b7703d21d4b56c1db824c2bb01d8853 100644 (file)
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -2172,7 +2172,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);
+   f = state->symbols->get_function(name, false);
    if (f != NULL) {
       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 76c440c3420a955c0a3f1128e64f1cdb3416b4d7..11e16713351e50378aae8ab78f148d4b62623074 100644 (file)
--- a/src/glsl/glsl_symbol_table.cpp
+++ b/src/glsl/glsl_symbol_table.cpp
@@ -147,10 +147,15 @@ 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)
+ir_function *glsl_symbol_table::get_function(const char *name,
+                                            bool return_constructors)
 {
    symbol_table_entry *entry = get_entry(name);
-   return entry != NULL ? entry->f : NULL;
+   // 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;
 }
 
 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 d71be5578be1ee9ff83db36c6f267970f1e511d5..c90fdc3c1d944b9b73eface26ccb1e874d5882b0 100644 (file)
--- a/src/glsl/glsl_symbol_table.h
+++ b/src/glsl/glsl_symbol_table.h
@@ -109,7 +109,7 @@ public:
    /*@{*/
    ir_variable *get_variable(const char *name);
    const glsl_type *get_type(const char *name);
-   ir_function *get_function(const char *name);
+   ir_function *get_function(const char *name, bool return_constructors = true);
    /*@}*/
 
 private: