AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify GLSL extension mechanism.

Browse Source 
Since extension name and extension name string are the same, collapse
them into one name.
This commit is contained in:
Michal Krol
2010-02-10 18:04:07 +01:00
parent c1395a71ac
commit 8b1c332a77
6 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/glsl/apps/compile.c
+2 -2
View File
@@ -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));
src/glsl/apps/process.c
+2 -2
View File
@@ -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));
src/glsl/pp/sl_pp_context.h
+1 -2
View File
@@ -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 {
src/glsl/pp/sl_pp_extension.c
+2 -8
View File
@@ -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;
}
src/glsl/pp/sl_pp_public.h
+1 -2
View File
@@ -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,
src/mesa/shader/slang/slang_compile.c
+2 -2
View File
@@ -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;