Module: Mesa
Branch: master
Commit: 5d76e4464323fd72af8bd5e455638004a6379e21
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d76e4464323fd72af8bd5e455638004a6379e21
Author: Chia-I Wu <olva...@gmail.com>
Date: Thu Mar 20 15:50:36 2014 +0800
glsl: remove UBO fields from _mesa_glsl_parse_state
They are not needed since 514f8c7ec7cc1ab18be93cebb5b9bf970b1955a9.
Signed-off-by: Chia-I Wu <olva...@gmail.com>
Reviewed-by: Matt Turner <matts...@gmail.com>
---
src/glsl/glsl_parser_extras.cpp | 10 ----------
src/glsl/glsl_parser_extras.h | 4 ----
src/mesa/main/mtypes.h | 3 +--
3 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
index 61ae621..8422ba6 100644
--- a/src/glsl/glsl_parser_extras.cpp
+++ b/src/glsl/glsl_parser_extras.cpp
@@ -66,10 +66,6 @@ _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct
gl_context *_ctx,
this->translation_unit.make_empty();
this->symbols = new(mem_ctx) glsl_symbol_table;
- this->num_uniform_blocks = 0;
- this->uniform_block_array_size = 0;
- this->uniform_blocks = NULL;
-
this->info_log = ralloc_strdup(mem_ctx, "");
this->error = false;
this->loop_nesting_ast = NULL;
@@ -1464,12 +1460,6 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct
gl_shader *shader,
shader->IsES = state->es_shader;
shader->uses_builtin_functions = state->uses_builtin_functions;
- if (shader->UniformBlocks)
- ralloc_free(shader->UniformBlocks);
- shader->NumUniformBlocks = state->num_uniform_blocks;
- shader->UniformBlocks = state->uniform_blocks;
- ralloc_steal(shader, shader->UniformBlocks);
-
if (!state->error)
set_shader_inout_layout(shader, state);
diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
index 300d900..3ad205c 100644
--- a/src/glsl/glsl_parser_extras.h
+++ b/src/glsl/glsl_parser_extras.h
@@ -175,10 +175,6 @@ struct _mesa_glsl_parse_state {
exec_list translation_unit;
glsl_symbol_table *symbols;
- unsigned num_uniform_blocks;
- unsigned uniform_block_array_size;
- struct gl_uniform_block *uniform_blocks;
-
unsigned num_supported_versions;
struct {
unsigned ver;
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 33cb888..15c0a59 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2421,8 +2421,7 @@ struct gl_shader
/**
* This shader's uniform block information.
*
- * The offsets of the variables are assigned only for shaders in a program's
- * _LinkedShaders[].
+ * These fields are only set post-linking.
*/
struct gl_uniform_block *UniformBlocks;
unsigned NumUniformBlocks;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
