<div dir="ltr">This patch has been reviewed and tested:Â <div><a href="http://lists.freedesktop.org/archives/mesa-dev/2015-November/101027.html">http://lists.freedesktop.org/archives/mesa-dev/2015-November/101027.html</a> <div class="gmail_extra"> <div class="gmail_quote">On Sun, Nov 22, 2015 at 12:30 PM, Nanley Chery <<a href="mailto:nanleychery@gmail.com" target="_blank">nanleychery@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div dir="ltr"><div class="gmail_quote">From: Nanley Chery <<a href="mailto:nanley.g.chery@intel.com" target="_blank">nanley.g.chery@intel.com</a>> Provide the ability to prevent any permanently enabled extension from appearing in the string returned by glGetString[i](). Signed-off-by: Nanley Chery <<a href="mailto:nanley.g.chery@intel.com" target="_blank">nanley.g.chery@intel.com</a>> --- Â src/mesa/main/extensions.c | 64 +++++++++++++++++----------------------------- Â 1 file changed, 24 insertions(+), 40 deletions(-) diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 01cfdf1..fa50cb6 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -40,7 +40,6 @@ Â struct gl_extensions _mesa_extension_override_enables; Â struct gl_extensions _mesa_extension_override_disables; Â static char *extra_extensions = NULL; -static char *cant_disable_extensions = NULL; Â /** @@ -68,29 +67,30 @@ const struct mesa_extension _mesa_extension_table[] = { Â #undef EXT Â }; +static bool disabled_extensions[ARRAY_SIZE(_mesa_extension_table)]; Â /** Â * Given an extension name, lookup up the corresponding member of struct - * gl_extensions and return that member's offset (in bytes).Â If the name is - * not found in the \c _mesa_extension_table, return 0. + * gl_extensions and return that member's index.Â If the name is + * not found in the \c _mesa_extension_table, return -1. Â * Â * \param name Name of extension. - * \return Offset of member in struct gl_extensions. + * \return Index of member in struct gl_extensions. Â */ -static size_t -name_to_offset(const char* name) +static int +name_to_index(const char* name) Â { Â Â unsigned i; Â Â if (name == 0) -Â Â Â return 0; +Â Â Â return -1; Â Â for (i = 0; i < ARRAY_SIZE(_mesa_extension_table); ++i) { Â Â Â Â if (strcmp(name, _mesa_extension_table[i].name) == 0) -Â Â Â Â return _mesa_extension_table[i].offset; +Â Â Â Â return i; Â Â } -Â Â return 0; +Â Â return -1; Â } Â /** @@ -206,11 +206,11 @@ _mesa_enable_sw_extensions(struct gl_context *ctx) Â * \return offset of extensions withint `ext' or 0 if extension is not known Â */ Â static size_t -set_extension(struct gl_extensions *ext, const char *name, GLboolean state) +set_extension(struct gl_extensions *ext, int i, GLboolean state) Â { Â Â size_t offset; -Â Â offset = name_to_offset(name); +Â Â offset = i < 0 ? 0 : _mesa_extension_table[i].offset; Â Â if (offset != 0 && (offset != o(dummy_true) || state != GL_FALSE)) { Â Â Â Â ((GLboolean *) ext)[offset] = state; Â Â } @@ -240,12 +240,6 @@ get_extension_override( struct gl_context *ctx ) Â { Â Â override_extensions_in_context(ctx); -Â Â if (cant_disable_extensions != NULL) { -Â Â Â _mesa_problem(ctx, -Â Â Â Â Â Â Â Â Â Â "Trying to disable permanently enabled extensions: %s", -Â Â Â Â Â Â Â Â Â Â cant_disable_extensions); -Â Â } - Â Â if (extra_extensions == NULL) { Â Â Â Â return calloc(1, sizeof(char)); Â Â } else { @@ -257,7 +251,7 @@ get_extension_override( struct gl_context *ctx ) Â /** - * \brief Free extra_extensions and cant_disable_extensions strings + * \brief Free extra_extensions string Â * Â * These strings are allocated early during the first context creation by Â * _mesa_one_time_init_extension_overrides. @@ -266,7 +260,6 @@ static void Â free_unknown_extensions_strings(void) Â { Â Â free(extra_extensions); -Â Â free(cant_disable_extensions); Â } @@ -295,22 +288,20 @@ _mesa_one_time_init_extension_overrides(void) Â Â /* extra_exts: List of unrecognized extensions. */ Â Â extra_extensions = calloc(ALIGN(strlen(env_const) + 2, 4), sizeof(char)); -Â Â cant_disable_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 || -Â Â Â Â cant_disable_extensions == NULL) { +Â Â Â Â extra_extensions == NULL) { Â Â Â Â free(env); Â Â Â Â free(extra_extensions); -Â Â Â free(cant_disable_extensions); Â Â Â Â return; Â Â } Â Â for (ext = strtok(env, " "); ext != NULL; ext = strtok(NULL, " ")) { Â Â Â Â int enable; +Â Â Â int i; Â Â Â Â bool recognized; Â Â Â Â switch (ext[0]) { Â Â Â Â case '+': @@ -326,7 +317,8 @@ _mesa_one_time_init_extension_overrides(void) Â Â Â Â Â break; Â Â Â Â } -Â Â Â offset = set_extension(&_mesa_extension_override_enables, ext, enable); +Â Â Â i = name_to_index(ext); +Â Â Â offset = set_extension(&_mesa_extension_override_enables, i, enable); Â Â Â Â if (offset != 0 && (offset != o(dummy_true) || enable != GL_FALSE)) { Â Â Â Â Â ((GLboolean *) &_mesa_extension_override_disables)[offset] = !enable; Â Â Â Â Â recognized = true; @@ -334,14 +326,12 @@ _mesa_one_time_init_extension_overrides(void) Â Â Â Â Â recognized = false; Â Â Â Â } -Â Â Â if (!recognized) { -Â Â Â Â Â if (enable) { -Â Â Â Â Â Â strcat(extra_extensions, ext); -Â Â Â Â Â Â strcat(extra_extensions, " "); -Â Â Â Â Â } else if (offset == o(dummy_true)) { -Â Â Â Â Â Â strcat(cant_disable_extensions, ext); -Â Â Â Â Â Â strcat(cant_disable_extensions, " "); -Â Â Â Â Â } +Â Â Â if (i >= 0) +Â Â Â Â Â disabled_extensions[i] = !enable; + +Â Â Â if (!recognized && enable) { +Â Â Â Â Â strcat(extra_extensions, ext); +Â Â Â Â Â strcat(extra_extensions, " "); Â Â Â Â } Â Â } @@ -355,13 +345,6 @@ _mesa_one_time_init_extension_overrides(void) Â Â } else if (extra_extensions[len - 1] == ' ') { Â Â Â Â extra_extensions[len - 1] = '\0'; Â Â } -Â Â len = strlen(cant_disable_extensions); -Â Â if (len == 0) { -Â Â Â free(cant_disable_extensions); -Â Â Â cant_disable_extensions = NULL; -Â Â } else if (cant_disable_extensions[len - 1] == ' ') { -Â Â Â cant_disable_extensions[len - 1] = '\0'; -Â Â } Â } @@ -402,7 +385,8 @@ _mesa_extension_supported(const struct gl_context *ctx, extension_index i) Â Â const bool *base = (bool *) &ctx->Extensions; Â Â const struct mesa_extension *ext = _mesa_extension_table + i; -Â Â return (ctx->Version >= ext->version[ctx->API]) && base[ext->offset]; +Â Â return !disabled_extensions[i] && +Â Â Â Â Â (ctx->Version >= ext->version[ctx->API]) && base[ext->offset]; Â } Â /** -- 2.6.2 </div> </div> </blockquote></div> </div></div></div>