Make the main compiler call the preprocessor.

By using a single function, the main compiler doesn't need to include
glcpp.h, which currently has a lot of details about the preprocessor
internals.  In particular, this prevents the two yacc grammars from
seeing each other, which would be rather messy to sort out.

diff --git a/glcpp/Makefile.am b/glcpp/Makefile.am
index 26b769ca609bfcd6ef0361abf7b2dc3f49b4b8e3..a49fd615cda3b6ecf60a811990e8379e8c20fdb4 100644 (file)
--- a/glcpp/Makefile.am
+++ b/glcpp/Makefile.am
@@ -26,6 +26,7 @@ libglcpp_la_SOURCES = \
        glcpp-parse.y \
        glcpp.h \
        hash_table.c \
+       pp.c \
        xtalloc.c
 
 BUILT_SOURCES = glcpp-parse.h glcpp-parse.c glcpp-lex.c

diff --git a/glcpp/pp.c b/glcpp/pp.c
new file mode 100644 (file)
index 0000000..7211bdb
--- /dev/null
+++ b/glcpp/pp.c
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2010 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include "glcpp.h"
+
+extern int
+preprocess(void *talloc_ctx, const char **shader, size_t *shader_len)
+{
+       int errors;
+       glcpp_parser_t *parser = glcpp_parser_create ();
+       glcpp_lex_set_source_string (parser, *shader);
+
+       glcpp_parser_parse (parser);
+
+       errors = parser->errors[0] != '\0';
+       fprintf(stderr, "%s", parser->errors);
+
+       talloc_steal(talloc_ctx, parser->output);
+       *shader = parser->output;
+       *shader_len = strlen(parser->output);
+
+       glcpp_parser_destroy (parser);
+       return errors;
+}

diff --git a/glsl_parser_extras.h b/glsl_parser_extras.h
index e1585d2872ad7ab290ee3039017ea215eef5efda..cad3424f6bddec3a453b1f7004de185fe26d995d 100644 (file)
--- a/glsl_parser_extras.h
+++ b/glsl_parser_extras.h
@@ -101,6 +101,10 @@ extern void _mesa_glsl_warning(const YYLTYPE *locp,
                               _mesa_glsl_parse_state *state,
                               const char *fmt, ...);
 
+extern "C" {
+extern int preprocess(void *ctx, const char **shader, size_t *shader_len);
+}
+
 extern void _mesa_glsl_lexer_ctor(struct _mesa_glsl_parse_state *state,
                                  const char *string, size_t len);
 

diff --git a/main.cpp b/main.cpp
index b8b99bf0bb060761b04aae6b294ca49e8ae89f1e..58657fe20125b0365578e286179fa2d86506a1b6 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -124,9 +124,17 @@ compile_shader(struct glsl_shader *shader)
    state.loop_or_switch_nesting = NULL;
    state.ARB_texture_rectangle_enable = true;
 
-   _mesa_glsl_lexer_ctor(& state, shader->Source, shader->SourceLen);
-   _mesa_glsl_parse(& state);
-   _mesa_glsl_lexer_dtor(& state);
+   /* Create a new context for the preprocessor output.  Ultimately, this
+    * should probably be the parser context, but there isn't one yet.
+   */
+   const char *source = shader->Source;
+   state.error = preprocess(shader, &source, &shader->SourceLen);
+
+   if (!state.error) {
+      _mesa_glsl_lexer_ctor(& state, source, shader->SourceLen);
+      _mesa_glsl_parse(& state);
+      _mesa_glsl_lexer_dtor(& state);
+   }
 
    if (dump_ast) {
       foreach_list_const(n, &state.translation_unit) {