summaryrefslogtreecommitdiff
path: root/src/glsl
diff options
context:
space:
mode:
authorJordan Justen <jordan.l.justen@intel.com>2013-03-21 11:10:04 -0700
committerJordan Justen <jordan.l.justen@intel.com>2013-05-23 09:37:12 -0700
commitc00387497d4a8438f3b71b8a2ad35bafcd1b069c (patch)
treeec77c97e769d8cfc3730327299e27c9d119f9fd0 /src/glsl
parent3919c19468e71fd9590b53e6160db79afb55bfc8 (diff)
glsl ast_to_hir: move uniform block symbols to interface blocks namespace
Uniform/interface blocks are a separate namespace from types. Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/ast_to_hir.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index b55d25e2511..0e2e6527761 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -4164,7 +4164,7 @@ ast_interface_block::hir(exec_list *instructions,
packing,
this->block_name);
- if (!state->symbols->add_type(block_type->name, block_type)) {
+ if (!state->symbols->add_interface(block_type->name, block_type, ir_var_uniform)) {
YYLTYPE loc = this->get_location();
_mesa_glsl_error(&loc, state, "Uniform block name `%s' already taken in "
"the current scope.\n", this->block_name);