KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glsl: remove UBO fields from _mesa_glsl_parse_state 

They are not needed since 514f8c7ec7.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Chia-I Wu 2014-03-20 15:50:36 +08:00
parent 010171b562
commit 5d76e44643
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/glsl/glsl_parser_extras.cpp
View File

@ -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);

4
src/glsl/glsl_parser_extras.h
View File

@ -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;

3
src/mesa/main/mtypes.h
View File

@ -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;