From c00387497d4a8438f3b71b8a2ad35bafcd1b069c Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Thu, 21 Mar 2013 11:10:04 -0700 Subject: [PATCH] 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 Reviewed-by: Kenneth Graunke --- src/glsl/ast_to_hir.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- 2.30.2