From 310e4485cba33716899d56ac910054d906701a9c Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 6 Nov 2017 16:14:51 +0000 Subject: [PATCH] mesa: rework the way we manage extra_extensions Store pointers to the tokenized strings in the gl_extensions struct. This way we can reuse them in glGetStringi() while we construct the really long string only in _mesa_make_extension_string. Only 16 pointers/strings are stored for now. v2: Warn only once when we provide more than 16 unk. extensions, rebase Signed-off-by: Emil Velikov Reviewed-by: Brian Paul (v1) --- src/mesa/main/extensions.c | 76 ++++++++++++++++++++-------------------------- src/mesa/main/mtypes.h | 6 ++++ 2 files changed, 39 insertions(+), 43 deletions(-) diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index fbfa044..376ea8d 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -39,7 +39,7 @@ struct gl_extensions _mesa_extension_override_enables; struct gl_extensions _mesa_extension_override_disables; -static char *extra_extensions = NULL; +static char *unrecognized_extensions = NULL; /** @@ -196,31 +196,17 @@ set_extension(struct gl_extensions *ext, int i, GLboolean state) return offset; } -/** - * The unrecognized extensions from \c MESA_EXTENSION_OVERRIDE. - * Returns \c NULL if empty. - */ -static const char * -get_extension_override( struct gl_context *ctx ) -{ - if (extra_extensions) - _mesa_problem(ctx, "Trying to enable unknown extensions: %s", - extra_extensions); - - return extra_extensions; -} - /** - * \brief Free extra_extensions string + * \brief Free string pointed by unrecognized_extensions * - * These strings are allocated early during the first context creation by + * This string is allocated early during the first context creation by * _mesa_one_time_init_extension_overrides. */ static void free_unknown_extensions_strings(void) { - free(extra_extensions); + free(unrecognized_extensions); } @@ -242,8 +228,8 @@ _mesa_one_time_init_extension_overrides(struct gl_context *ctx) const char *env_const = getenv("MESA_EXTENSION_OVERRIDE"); char *env; char *ext; - int len; size_t offset; + unsigned unknown_ext = 0; memset(&_mesa_extension_override_enables, 0, sizeof(struct gl_extensions)); memset(&_mesa_extension_override_disables, 0, sizeof(struct gl_extensions)); @@ -252,18 +238,11 @@ _mesa_one_time_init_extension_overrides(struct gl_context *ctx) return; } - /* extra_exts: List of unrecognized extensions. */ - extra_extensions = calloc(ALIGN(strlen(env_const) + 2, 4), sizeof(char)); - /* Copy env_const because strtok() is destructive. */ env = strdup(env_const); - if (env == NULL || - extra_extensions == NULL) { - free(env); - free(extra_extensions); + if (env == NULL) return; - } for (ext = strtok(env, " "); ext != NULL; ext = strtok(NULL, " ")) { int enable; @@ -292,19 +271,28 @@ _mesa_one_time_init_extension_overrides(struct gl_context *ctx) recognized = false; if (!recognized && enable) { - strcat(extra_extensions, ext); - strcat(extra_extensions, " "); + if (unknown_ext >= MAX_UNRECOGNIZED_EXTENSIONS) { + static bool warned; + + if (!warned) { + warned = true; + _mesa_problem(ctx, "Trying to enable too many unknown extension. " + "Only the first %d will be honoured", + MAX_UNRECOGNIZED_EXTENSIONS); + } + } else { + ctx->Extensions.unrecognized_extensions[unknown_ext] = ext; + unknown_ext++; + + _mesa_problem(ctx, "Trying to enable unknown extension: %s", ext); + } } } - free(env); - - /* Remove trailing space, and free if unused. */ - len = strlen(extra_extensions); - if (len == 0) { - free(extra_extensions); - } else if (extra_extensions[len - 1] == ' ') { - extra_extensions[len - 1] = '\0'; + if (!unknown_ext) { + free(env); + } else { + unrecognized_extensions = env; atexit(free_unknown_extensions_strings); } } @@ -366,8 +354,6 @@ _mesa_make_extension_string(struct gl_context *ctx) unsigned count; /* Indices of the extensions sorted by year */ extension_index extension_indices[MESA_EXTENSION_COUNT]; - /* String of extra extensions. */ - const char *extra_extensions = get_extension_override(ctx); unsigned k; unsigned j; unsigned maxYear = ~0; @@ -393,8 +379,9 @@ _mesa_make_extension_string(struct gl_context *ctx) extension_indices[count++] = k; } } - if (extra_extensions != NULL) - length += 1 + strlen(extra_extensions); /* +1 for space */ + for (k = 0; k < MAX_UNRECOGNIZED_EXTENSIONS; k++) + if (ctx->Extensions.unrecognized_extensions[k]) + length += 1 + strlen(ctx->Extensions.unrecognized_extensions[k]); /* +1 for space */ exts = calloc(ALIGN(length + 1, 4), sizeof(char)); if (exts == NULL) { @@ -408,8 +395,11 @@ _mesa_make_extension_string(struct gl_context *ctx) strcat(exts, i->name); strcat(exts, " "); } - if (extra_extensions != 0) { - strcat(exts, extra_extensions); + for (j = 0; j < MAX_UNRECOGNIZED_EXTENSIONS; j++) { + if (ctx->Extensions.unrecognized_extensions[j]) { + strcat(exts, ctx->Extensions.unrecognized_extensions[j]); + strcat(exts, " "); + } } return (GLubyte *) exts; diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 6b5c5bb..4682e02 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -4236,6 +4236,12 @@ struct gl_extensions * while meta is in progress. */ GLubyte Version; + /** + * Force-enabled, yet unrecognized, extensions. + * See _mesa_one_time_init_extension_overrides() + */ +#define MAX_UNRECOGNIZED_EXTENSIONS 16 + const char *unrecognized_extensions[MAX_UNRECOGNIZED_EXTENSIONS]; }; -- 2.7.4