glsl: Use a single shared namespace in the symbol table.

As of 1.20, variable names, function names, and structure type names all
share a single namespace, and should conflict with one another in the
same scope, or hide each other in nested scopes.

However, in 1.10, variables and functions can share the same name in the
same scope.  Structure types, however, conflict with/hide both.

Fixes piglit tests redeclaration-06.vert, redeclaration-11.vert,
redeclaration-19.vert, and struct-05.vert.

1 files changed, 2 insertions, 9 deletions

diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
index 2e5c2ecf04..a7d02e18df 100644
--- a/src/glsl/glsl_types.cpp
+++ b/src/glsl/glsl_types.cpp
@@ -233,18 +233,11 @@ _mesa_glsl_release_types(void)
 
 
 ir_function *
-glsl_type::generate_constructor(glsl_symbol_table *symtab) const
+glsl_type::generate_constructor() const
 {
-   void *ctx = symtab;
+   void *ctx = (void *) this;
 
-   /* Generate the function name and add it to the symbol table.
-    */
    ir_function *const f = new(ctx) ir_function(name);
-
-   bool added = symtab->add_function(name, f);
-   assert(added);
-   (void) added;
-
    ir_function_signature *const sig = new(ctx) ir_function_signature(this);
    f->add_signature(sig);