diff options
author | marha <marha@users.sourceforge.net> | 2013-10-02 11:08:18 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-10-02 11:08:18 +0200 |
commit | 8092f320c341a6b3a1b428fdd4473859d5db8b79 (patch) | |
tree | 88b2bd0c519042f9b8d98dc36f63ff167338d635 /mesalib/src/glsl/glsl_parser_extras.cpp | |
parent | 6dd755aa923291db2501cc5c22e409c41a70e3c1 (diff) | |
download | vcxsrv-8092f320c341a6b3a1b428fdd4473859d5db8b79.tar.gz vcxsrv-8092f320c341a6b3a1b428fdd4473859d5db8b79.tar.bz2 vcxsrv-8092f320c341a6b3a1b428fdd4473859d5db8b79.zip |
fontconfig mesa pixman xkeyboard-config git update 2 Okt 2013
xkeyboard-config commit e5a53229a9914235921911f05b31d6092e844ea1
pixman commit 7d05a7f4dc825f9c778e534fdabb749199c2e439
fontconfig commit 0203055520206028eecee5d261887cdc91500e15
mesa commit 848c0e72f36d0e1e460193a2d30b2f631529156f
Diffstat (limited to 'mesalib/src/glsl/glsl_parser_extras.cpp')
-rw-r--r-- | mesalib/src/glsl/glsl_parser_extras.cpp | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp index e9922fc14..4f2f2893a 100644 --- a/mesalib/src/glsl/glsl_parser_extras.cpp +++ b/mesalib/src/glsl/glsl_parser_extras.cpp @@ -55,7 +55,7 @@ static unsigned known_desktop_glsl_versions[] = _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *_ctx, GLenum target, void *mem_ctx) - : ctx(_ctx) + : ctx(_ctx), switch_state() { switch (target) { case GL_VERTEX_SHADER: this->target = vertex_shader; break; @@ -66,10 +66,14 @@ _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *_ctx, this->scanner = NULL; 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; - this->switch_state.switch_nesting_ast = NULL; this->struct_specifier_depth = 0; this->num_builtins_to_link = 0; @@ -105,6 +109,13 @@ _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *_ctx, this->Const.MaxDrawBuffers = ctx->Const.MaxDrawBuffers; + this->current_function = NULL; + this->toplevel_ir = NULL; + this->found_return = false; + this->all_invariant = false; + this->user_structures = NULL; + this->num_user_structures = 0; + /* Populate the list of supported GLSL versions */ /* FINISHME: Once the OpenGL 3.0 'forward compatible' context or * the OpenGL 3.2 Core context is supported, this logic will need @@ -163,6 +174,7 @@ _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *_ctx, this->gs_input_prim_type_specified = false; this->gs_input_prim_type = GL_POINTS; + this->gs_input_size = 0; this->out_qualifier = new(this) ast_type_qualifier(); } @@ -1038,7 +1050,8 @@ ast_expression::print(void) const ast_expression::ast_expression(int oper, ast_expression *ex0, ast_expression *ex1, - ast_expression *ex2) + ast_expression *ex2) : + primary_expression() { this->oper = ast_operators(oper); this->subexpressions[0] = ex0; |