diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2010-08-21 20:23:18 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-08-26 09:19:48 -0700 |
| commit | e9c7ceed27f6811ad1cae46c93ce9bc3fb3668d8 (patch) | |
| tree | e66302bca944353decf9b78291effb9cee7a4982 /src/glsl/glsl_types.h | |
| parent | 86ddb356e8278423ef41125be627e57e073471d1 (diff) | |
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.
Diffstat (limited to 'src/glsl/glsl_types.h')
| -rw-r--r-- | src/glsl/glsl_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h index 80cec635d9..3e86d2c011 100644 --- a/src/glsl/glsl_types.h +++ b/src/glsl/glsl_types.h @@ -208,9 +208,9 @@ struct glsl_type { unsigned num_fields, const char *name); /** - * Generate the constructor for this type and add it to the symbol table + * Generate the constructor for this type and return it */ - class ir_function *generate_constructor(glsl_symbol_table *) const; + class ir_function *generate_constructor() const; /** * Query the total number of scalars that make up a scalar, vector or matrix |