glsl: Implement `extension' preprocessor directive.

No extensions supported.

diff --git a/src/glsl/pp/SConscript b/src/glsl/pp/SConscript
index 0c1b4ac2e9947d1217a7508ddacc959064d39008..dae8830eeb61763fd8fbecca606ccba43074aee4 100644 (file)
--- a/src/glsl/pp/SConscript
+++ b/src/glsl/pp/SConscript
@@ -12,6 +12,7 @@ glsl = env.StaticLibrary(
         'sl_pp_define.c',
         'sl_pp_error.c',
         'sl_pp_expression.c',
+        'sl_pp_extension.c',
         'sl_pp_if.c',
         'sl_pp_macro.c',
         'sl_pp_pragma.c',

diff --git a/src/glsl/pp/sl_pp_extension.c b/src/glsl/pp/sl_pp_extension.c
new file mode 100644 (file)
index 0000000..3d223a1
--- /dev/null
+++ b/src/glsl/pp/sl_pp_extension.c
@@ -0,0 +1,129 @@
+/**************************************************************************
+ * 
+ * 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_extension(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 all_extensions = -1;
+   const char *extension_name = NULL;
+   const char *behavior = NULL;
+   struct sl_pp_token_info out;
+
+   all_extensions = sl_pp_context_add_unique_str(context, "all");
+   if (all_extensions == -1) {
+      return -1;
+   }
+
+   if (first < last && input[first].token == SL_PP_IDENTIFIER) {
+      extension_name = sl_pp_context_cstr(context, input[first].data.identifier);
+      first++;
+   }
+   if (!extension_name) {
+      strcpy(context->error_msg, "expected identifier after `#extension'");
+      return -1;
+   }
+
+   if (!strcmp(extension_name, "all")) {
+      out.data.extension = all_extensions;
+   } else {
+      out.data.extension = -1;
+   }
+
+   while (first < last && input[first].token == SL_PP_WHITESPACE) {
+      first++;
+   }
+
+   if (first < last && input[first].token == SL_PP_COLON) {
+      first++;
+   } else {
+      strcpy(context->error_msg, "expected `:' after extension name");
+      return -1;
+   }
+
+   while (first < last && input[first].token == SL_PP_WHITESPACE) {
+      first++;
+   }
+
+   if (first < last && input[first].token == SL_PP_IDENTIFIER) {
+      behavior = sl_pp_context_cstr(context, input[first].data.identifier);
+      first++;
+   }
+   if (!behavior) {
+      strcpy(context->error_msg, "expected identifier after `:'");
+      return -1;
+   }
+
+   if (!strcmp(behavior, "require")) {
+      strcpy(context->error_msg, "unable to enable required extension");
+      return -1;
+   } else if (!strcmp(behavior, "enable")) {
+      if (out.data.extension == all_extensions) {
+         strcpy(context->error_msg, "unable to enable all extensions");
+         return -1;
+      } else {
+         return 0;
+      }
+   } else if (!strcmp(behavior, "warn")) {
+      if (out.data.extension == all_extensions) {
+         out.token = SL_PP_EXTENSION_WARN;
+      } else {
+         return 0;
+      }
+   } else if (!strcmp(behavior, "disable")) {
+      if (out.data.extension == all_extensions) {
+         out.token = SL_PP_EXTENSION_DISABLE;
+      } else {
+         return 0;
+      }
+   } else {
+      strcpy(context->error_msg, "unrecognised behavior name");
+      return -1;
+   }
+
+   while (first < last && input[first].token == SL_PP_WHITESPACE) {
+      first++;
+   }
+
+   if (first < last) {
+      strcpy(context->error_msg, "expected end of line after behavior name");
+      return -1;
+   }
+
+   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 62b73426c5fa2c2a53107585589206dcc2a1198d..be01f9139c152a8188ba1bcba882d8ed365ef844 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, "extension")) {
+                     if (sl_pp_process_extension(context, input, first, last, &state)) {
+                        return -1;
+                     }
                   } else if (!strcmp(name, "pragma")) {
                      if (sl_pp_process_pragma(context, input, first, last, &state)) {
                         return -1;

diff --git a/src/glsl/pp/sl_pp_process.h b/src/glsl/pp/sl_pp_process.h
index 9a29c03a70149441b855b74e5e2c0837ad553bfd..5891866543471c6a9b78172457d003ed47327b5e 100644 (file)
--- a/src/glsl/pp/sl_pp_process.h
+++ b/src/glsl/pp/sl_pp_process.h
@@ -105,6 +105,13 @@ sl_pp_process_pragma(struct sl_pp_context *context,
                      unsigned int last,
                      struct sl_pp_process_state *state);
 
+int
+sl_pp_process_extension(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 566274ea90e15984b9ea5e1ce1a0ef65a0b77ba8..7b60183a0416a3d7b1f251445e6bb2c43b311f07 100644 (file)
--- a/src/glsl/pp/sl_pp_token.h
+++ b/src/glsl/pp/sl_pp_token.h
@@ -91,6 +91,11 @@ enum sl_pp_token {
    SL_PP_PRAGMA_OPTIMIZE,
    SL_PP_PRAGMA_DEBUG,
 
+   SL_PP_EXTENSION_REQUIRE,
+   SL_PP_EXTENSION_ENABLE,
+   SL_PP_EXTENSION_WARN,
+   SL_PP_EXTENSION_DISABLE,
+
    SL_PP_EOF
 };
 
@@ -99,6 +104,7 @@ union sl_pp_token_data {
    int number;
    char other;
    int pragma;
+   int extension;
 };
 
 struct sl_pp_token_info {