Simplify GLSL extension mechanism.

Since extension name and extension name string are the same, collapse
them into one name.

diff --git a/src/glsl/apps/compile.c b/src/glsl/apps/compile.c
index c9a830b9f3ce6f2b8b0d6c7c1b527d58c5fb0b64..3b3c083c2e131e651c6fae91e570b055f591fc79 100644 (file)
--- a/src/glsl/apps/compile.c
+++ b/src/glsl/apps/compile.c
@@ -134,8 +134,8 @@ main(int argc,
       return 0;
    }
 
-   if (sl_pp_context_add_extension(context, "ARB_draw_buffers", "GL_ARB_draw_buffers") ||
-       sl_pp_context_add_extension(context, "ARB_texture_rectangle", "GL_ARB_texture_rectangle")) {
+   if (sl_pp_context_add_extension(context, "GL_ARB_draw_buffers") ||
+       sl_pp_context_add_extension(context, "GL_ARB_texture_rectangle")) {
       fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
 
       printf("Error: %s\n", sl_pp_context_error_message(context));

diff --git a/src/glsl/apps/process.c b/src/glsl/apps/process.c
index 569890210f2172271b015b1d5ae8c56f78df5d47..2d2ab911ac4da16ac1d967bdd595aa1cf298483d 100644 (file)
--- a/src/glsl/apps/process.c
+++ b/src/glsl/apps/process.c
@@ -106,8 +106,8 @@ main(int argc,
       return -1;
    }
 
-   if (sl_pp_context_add_extension(context, "ARB_draw_buffers", "GL_ARB_draw_buffers") ||
-       sl_pp_context_add_extension(context, "ARB_texture_rectangle", "GL_ARB_texture_rectangle")) {
+   if (sl_pp_context_add_extension(context, "GL_ARB_draw_buffers") ||
+       sl_pp_context_add_extension(context, "GL_ARB_texture_rectangle")) {
       fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
 
       printf("Error: %s\n", sl_pp_context_error_message(context));

diff --git a/src/glsl/pp/sl_pp_context.h b/src/glsl/pp/sl_pp_context.h
index 3eada380cd1f5d14fbd2107b4ff0c3cb961da4ac..7b9f494f130a2a0665db86246f88035f25838030 100644 (file)
--- a/src/glsl/pp/sl_pp_context.h
+++ b/src/glsl/pp/sl_pp_context.h
@@ -44,8 +44,7 @@
 #define SL_PP_MAX_PREDEFINED  16
 
 struct sl_pp_extension {
-   int name;         /*< VENDOR_extension_name */
-   int name_string;  /*< GL_VENDOR_extension_name */
+   int name;   /*< GL_VENDOR_extension_name */
 };
 
 struct sl_pp_predefined {

diff --git a/src/glsl/pp/sl_pp_extension.c b/src/glsl/pp/sl_pp_extension.c
index 8af5731e84076f5fb51aec0fe0fbf2976610968f..630a7975c75ddde494ba18b6a6bb91cd6881b359 100644 (file)
--- a/src/glsl/pp/sl_pp_extension.c
+++ b/src/glsl/pp/sl_pp_extension.c
@@ -34,8 +34,7 @@
 
 int
 sl_pp_context_add_extension(struct sl_pp_context *context,
-                            const char *name,
-                            const char *name_string)
+                            const char *name)
 {
    struct sl_pp_extension ext;
 
@@ -48,11 +47,6 @@ sl_pp_context_add_extension(struct sl_pp_context *context,
       return -1;
    }
 
-   ext.name_string = sl_pp_context_add_unique_str(context, name_string);
-   if (ext.name_string == -1) {
-      return -1;
-   }
-
    context->extensions[context->num_extensions++] = ext;
    return 0;
 }
@@ -86,7 +80,7 @@ sl_pp_process_extension(struct sl_pp_context *context,
 
       out.data.extension = -1;
       for (i = 0; i < context->num_extensions; i++) {
-         if (extension_name == context->extensions[i].name_string) {
+         if (extension_name == context->extensions[i].name) {
             out.data.extension = extension_name;
             break;
          }

diff --git a/src/glsl/pp/sl_pp_public.h b/src/glsl/pp/sl_pp_public.h
index 12528d6f8d13ada05caa885e6e87d399bd9b3983..ca6f722543dbfa1ea50b5d1a1b2806883bce4977 100644 (file)
--- a/src/glsl/pp/sl_pp_public.h
+++ b/src/glsl/pp/sl_pp_public.h
@@ -53,8 +53,7 @@ sl_pp_context_error_position(const struct sl_pp_context *context,
 
 int
 sl_pp_context_add_extension(struct sl_pp_context *context,
-                            const char *name,
-                            const char *name_string);
+                            const char *name);
 
 int
 sl_pp_context_add_predefined(struct sl_pp_context *context,

diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index 49fe2fa897a477509a9b863bd96c24e275c4527c..852274119cfcec550646c07a7f75034a8a92f04d 100644 (file)
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -2608,8 +2608,8 @@ compile_with_grammar(const char *source,
       return GL_FALSE;
    }
 
-   if (sl_pp_context_add_extension(context, "GL_ARB_draw_buffers", "GL_ARB_draw_buffers") ||
-       sl_pp_context_add_extension(context, "GL_ARB_texture_rectangle", "GL_ARB_texture_rectangle")) {
+   if (sl_pp_context_add_extension(context, "GL_ARB_draw_buffers") ||
+       sl_pp_context_add_extension(context, "GL_ARB_texture_rectangle")) {
       slang_info_log_error(infolog, "%s", sl_pp_context_error_message(context));
       sl_pp_context_destroy(context);
       return GL_FALSE;