diff options
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/apps/compile.c | 4 | ||||
| -rw-r--r-- | src/glsl/apps/process.c | 4 | ||||
| -rw-r--r-- | src/glsl/pp/sl_pp_context.h | 3 | ||||
| -rw-r--r-- | src/glsl/pp/sl_pp_extension.c | 10 | ||||
| -rw-r--r-- | src/glsl/pp/sl_pp_public.h | 3 |
5 files changed, 8 insertions, 16 deletions
diff --git a/src/glsl/apps/compile.c b/src/glsl/apps/compile.c index c9a830b9f3c..3b3c083c2e1 100644 --- 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 569890210f2..2d2ab911ac4 100644 --- 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 3eada380cd1..7b9f494f130 100644 --- 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 8af5731e840..630a7975c75 100644 --- 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 12528d6f8d1..ca6f722543d 100644 --- 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, |