glsl: Implement `pragma' preprocessor directive.

Handle `optimize(on|off)' and `debug(on|off)' pragmas.

diff --git a/src/glsl/pp/SConscript b/src/glsl/pp/SConscript
index 13fc230b96ea7c0b6d09badc945ac3c87937bc34..0c1b4ac2e9947d1217a7508ddacc959064d39008 100644 (file)
--- a/src/glsl/pp/SConscript
+++ b/src/glsl/pp/SConscript
@@ -14,6 +14,7 @@ glsl = env.StaticLibrary(
         'sl_pp_expression.c',
         'sl_pp_if.c',
         'sl_pp_macro.c',
+        'sl_pp_pragma.c',
         'sl_pp_process.c',
         'sl_pp_purify.c',
         'sl_pp_token.c',

diff --git a/src/glsl/pp/sl_pp_pragma.c b/src/glsl/pp/sl_pp_pragma.c
new file mode 100644 (file)
index 0000000..059bc6f
--- /dev/null
+++ b/src/glsl/pp/sl_pp_pragma.c
@@ -0,0 +1,106 @@
+/**************************************************************************
+ * 
+ * Copyright 2009 VMware, Inc.
+ * All Rights Reserved.
+ * 
+ * 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, sub license, 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 NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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 <stdlib.h>
+#include "sl_pp_process.h"
+
+
+int
+sl_pp_process_pragma(struct sl_pp_context *context,
+                     const struct sl_pp_token_info *input,
+                     unsigned int first,
+                     unsigned int last,
+                     struct sl_pp_process_state *state)
+{
+   const char *pragma_name = NULL;
+   struct sl_pp_token_info out;
+   const char *arg_name = NULL;
+
+   if (first < last && input[first].token == SL_PP_IDENTIFIER) {
+      pragma_name = sl_pp_context_cstr(context, input[first].data.identifier);
+      first++;
+   }
+   if (!pragma_name) {
+      return 0;
+   }
+
+   if (!strcmp(pragma_name, "optimize")) {
+      out.token = SL_PP_PRAGMA_OPTIMIZE;
+   } else if (!strcmp(pragma_name, "debug")) {
+      out.token = SL_PP_PRAGMA_DEBUG;
+   } else {
+      return 0;
+   }
+
+   while (first < last && input[first].token == SL_PP_WHITESPACE) {
+      first++;
+   }
+
+   if (first < last && input[first].token == SL_PP_LPAREN) {
+      first++;
+   } else {
+      return 0;
+   }
+
+   while (first < last && input[first].token == SL_PP_WHITESPACE) {
+      first++;
+   }
+
+   if (first < last && input[first].token == SL_PP_IDENTIFIER) {
+      arg_name = sl_pp_context_cstr(context, input[first].data.identifier);
+      first++;
+   }
+   if (!arg_name) {
+      return 0;
+   }
+
+   if (!strcmp(arg_name, "off")) {
+      out.data.pragma = 0;
+   } else if (!strcmp(arg_name, "on")) {
+      out.data.pragma = 1;
+   } else {
+      return 0;
+   }
+
+   while (first < last && input[first].token == SL_PP_WHITESPACE) {
+      first++;
+   }
+
+   if (first < last && input[first].token == SL_PP_RPAREN) {
+      first++;
+   } else {
+      return 0;
+   }
+
+   /* Ignore the tokens that follow. */
+
+   if (sl_pp_process_out(state, &out)) {
+      return -1;
+   }
+
+   return 0;
+}

diff --git a/src/glsl/pp/sl_pp_process.c b/src/glsl/pp/sl_pp_process.c
index 117aa01688da9f6815be55d0b1785f9eadd729f9..62b73426c5fa2c2a53107585589206dcc2a1198d 100644 (file)
--- a/src/glsl/pp/sl_pp_process.c
+++ b/src/glsl/pp/sl_pp_process.c
@@ -154,6 +154,10 @@ sl_pp_process(struct sl_pp_context *context,
                   } else if (!strcmp(name, "error")) {
                      sl_pp_process_error(context, input, first, last);
                      return -1;
+                  } else if (!strcmp(name, "pragma")) {
+                     if (sl_pp_process_pragma(context, input, first, last, &state)) {
+                        return -1;
+                     }
                   } else if (!strcmp(name, "undef")) {
                      if (sl_pp_process_undef(context, input, first, last)) {
                         return -1;

diff --git a/src/glsl/pp/sl_pp_process.h b/src/glsl/pp/sl_pp_process.h
index 11a94921d8228c882880a8be1b2c8db970929b3b..9a29c03a70149441b855b74e5e2c0837ad553bfd 100644 (file)
--- a/src/glsl/pp/sl_pp_process.h
+++ b/src/glsl/pp/sl_pp_process.h
@@ -98,6 +98,13 @@ sl_pp_process_error(struct sl_pp_context *context,
                     unsigned int first,
                     unsigned int last);
 
+int
+sl_pp_process_pragma(struct sl_pp_context *context,
+                     const struct sl_pp_token_info *input,
+                     unsigned int first,
+                     unsigned int last,
+                     struct sl_pp_process_state *state);
+
 int
 sl_pp_process_out(struct sl_pp_process_state *state,
                   const struct sl_pp_token_info *token);

diff --git a/src/glsl/pp/sl_pp_token.h b/src/glsl/pp/sl_pp_token.h
index a53720be802c4a4132727732b24aec6f8f1a3783..566274ea90e15984b9ea5e1ce1a0ef65a0b77ba8 100644 (file)
--- a/src/glsl/pp/sl_pp_token.h
+++ b/src/glsl/pp/sl_pp_token.h
@@ -88,6 +88,9 @@ enum sl_pp_token {
 
    SL_PP_OTHER,
 
+   SL_PP_PRAGMA_OPTIMIZE,
+   SL_PP_PRAGMA_DEBUG,
+
    SL_PP_EOF
 };
 
@@ -95,6 +98,7 @@ union sl_pp_token_data {
    int identifier;
    int number;
    char other;
+   int pragma;
 };
 
 struct sl_pp_token_info {