Mesa (master): glsl ast_to_hir: move uniform block symbols to interface blocks namespace
Jordan Justen
jljusten at kemper.freedesktop.org
Thu May 23 18:23:43 UTC 2013
Module: Mesa
Branch: master
Commit: c00387497d4a8438f3b71b8a2ad35bafcd1b069c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c00387497d4a8438f3b71b8a2ad35bafcd1b069c
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Thu Mar 21 11:10:04 2013 -0700
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 at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/glsl/ast_to_hir.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index b55d25e..0e2e652 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);
More information about the mesa-commit
mailing list