Module: Mesa Branch: asm-shader-rework-1 Commit: be32fb779beecf4bbd61c42c7eb0f8ca988a9831 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=be32fb779beecf4bbd61c42c7eb0f8ca988a9831
Author: Ian Romanick <[email protected]> Date: Mon Jul 27 12:48:44 2009 -0700 ARB prog: Update generated files missed on previous two commits The changes are, as it turns out, purely cosmetic. --- src/mesa/shader/lex.yy.c | 4 ---- src/mesa/shader/program_parse.tab.c | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/mesa/shader/lex.yy.c b/src/mesa/shader/lex.yy.c index 120e18e..e2b0da9 100644 --- a/src/mesa/shader/lex.yy.c +++ b/src/mesa/shader/lex.yy.c @@ -3521,10 +3521,6 @@ _mesa_program_lexer_ctor(void **scanner, struct asm_parser_state *state, void _mesa_program_lexer_dtor(void *scanner) { - /* FINISHME: It's not clear to me whether or not the buffer state returned - * FINISHME: by yy_scan_bytes in _mesa_program_lexer_ctor needs to be - * FINISHME: explicitly destroyed here or not. - */ yylex_destroy(scanner); } diff --git a/src/mesa/shader/program_parse.tab.c b/src/mesa/shader/program_parse.tab.c index a49cfeb..6ea10f8 100644 --- a/src/mesa/shader/program_parse.tab.c +++ b/src/mesa/shader/program_parse.tab.c @@ -4966,7 +4966,7 @@ _mesa_parse_arb_program(GLcontext *ctx, GLenum target, const GLubyte *str, if (ctx->Program.ErrorPos != -1) { - goto error; + goto error; } if (! _mesa_layout_parameters(state)) { @@ -5028,7 +5028,7 @@ error: for (sym = state->sym; sym != NULL; sym = temp) { temp = sym->next; - _mesa_free(sym->name); + _mesa_free((void *) sym->name); _mesa_free(sym); } state->sym = NULL; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
