From e3c4aa34268f99562e66b43a7d9efcd16ca072e6 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 17 Sep 2012 16:10:59 +0200 Subject: mesa xserver pixman git update 17 sep 2012 --- mesalib/src/glsl/glcpp/Makefile.am | 2 +- mesalib/src/glsl/glcpp/glcpp-parse.y | 8 -------- mesalib/src/glsl/glcpp/glcpp.c | 2 +- mesalib/src/glsl/glcpp/glcpp.h | 2 +- mesalib/src/glsl/glcpp/pp.c | 2 +- 5 files changed, 4 insertions(+), 12 deletions(-) (limited to 'mesalib/src/glsl/glcpp') diff --git a/mesalib/src/glsl/glcpp/Makefile.am b/mesalib/src/glsl/glcpp/Makefile.am index 7a95b6848..87affce1c 100644 --- a/mesalib/src/glsl/glcpp/Makefile.am +++ b/mesalib/src/glsl/glcpp/Makefile.am @@ -31,7 +31,7 @@ AM_CFLAGS = \ $(LIBRARY_DEFINES) \ $(API_DEFINES) -AM_YFLAGS = -v -d +AM_YFLAGS = -v -d -p "glcpp_parser_" AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c noinst_LTLIBRARIES = libglcpp.la diff --git a/mesalib/src/glsl/glcpp/glcpp-parse.y b/mesalib/src/glsl/glcpp/glcpp-parse.y index bf6f3ad01..fb9bc588e 100644 --- a/mesalib/src/glsl/glcpp/glcpp-parse.y +++ b/mesalib/src/glsl/glcpp/glcpp-parse.y @@ -133,8 +133,6 @@ _glcpp_parser_skip_stack_change_if (glcpp_parser_t *parser, YYLTYPE *loc, static void _glcpp_parser_skip_stack_pop (glcpp_parser_t *parser, YYLTYPE *loc); -#define yylex glcpp_parser_lex - static int glcpp_parser_lex (YYSTYPE *yylval, YYLTYPE *yylloc, glcpp_parser_t *parser); @@ -1197,12 +1195,6 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api) return parser; } -int -glcpp_parser_parse (glcpp_parser_t *parser) -{ - return yyparse (parser); -} - void glcpp_parser_destroy (glcpp_parser_t *parser) { diff --git a/mesalib/src/glsl/glcpp/glcpp.c b/mesalib/src/glsl/glcpp/glcpp.c index e461a6502..35db47087 100644 --- a/mesalib/src/glsl/glcpp/glcpp.c +++ b/mesalib/src/glsl/glcpp/glcpp.c @@ -111,7 +111,7 @@ main (int argc, char *argv[]) if (shader == NULL) return 1; - ret = preprocess(ctx, &shader, &info_log, NULL, API_OPENGL); + ret = glcpp_preprocess(ctx, &shader, &info_log, NULL, API_OPENGL); printf("%s", shader); fprintf(stderr, "%s", info_log); diff --git a/mesalib/src/glsl/glcpp/glcpp.h b/mesalib/src/glsl/glcpp/glcpp.h index a13ade69e..a459289b2 100644 --- a/mesalib/src/glsl/glcpp/glcpp.h +++ b/mesalib/src/glsl/glcpp/glcpp.h @@ -196,7 +196,7 @@ void glcpp_parser_destroy (glcpp_parser_t *parser); int -preprocess(void *ralloc_ctx, const char **shader, char **info_log, +glcpp_preprocess(void *ralloc_ctx, const char **shader, char **info_log, const struct gl_extensions *extensions, int api); /* Functions for writing to the info log */ diff --git a/mesalib/src/glsl/glcpp/pp.c b/mesalib/src/glsl/glcpp/pp.c index 9170d14a3..11b29417b 100644 --- a/mesalib/src/glsl/glcpp/pp.c +++ b/mesalib/src/glsl/glcpp/pp.c @@ -150,7 +150,7 @@ remove_line_continuations(glcpp_parser_t *ctx, const char *shader) } int -preprocess(void *ralloc_ctx, const char **shader, char **info_log, +glcpp_preprocess(void *ralloc_ctx, const char **shader, char **info_log, const struct gl_extensions *extensions, int api) { int errors; -- cgit v1.2.3