struct gl_extensions _mesa_extension_override_enables;
struct gl_extensions _mesa_extension_override_disables;
-static char *extra_extensions = NULL;
+static char *unrecognized_extensions = NULL;
/**
ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;
ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;
ctx->Extensions.ARB_texture_filter_anisotropic = GL_TRUE;
-#ifdef TEXTURE_FLOAT_ENABLED
ctx->Extensions.ARB_texture_float = GL_TRUE;
-#endif
ctx->Extensions.ARB_texture_mirror_clamp_to_edge = GL_TRUE;
ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;
ctx->Extensions.ARB_texture_rg = GL_TRUE;
ctx->Extensions.ATI_texture_compression_3dc = GL_TRUE;
ctx->Extensions.ATI_texture_env_combine3 = GL_TRUE;
ctx->Extensions.ATI_texture_mirror_once = GL_TRUE;
- ctx->Extensions.ATI_separate_stencil = GL_TRUE;
ctx->Extensions.EXT_blend_color = GL_TRUE;
ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;
ctx->Extensions.EXT_blend_func_separate = GL_TRUE;
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);
}
* - Collect unrecognized extension names in a new string.
*/
void
-_mesa_one_time_init_extension_overrides(void)
+_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;
-
- atexit(free_unknown_extensions_strings);
+ unsigned unknown_ext = 0;
memset(&_mesa_extension_override_enables, 0, sizeof(struct gl_extensions));
memset(&_mesa_extension_override_disables, 0, sizeof(struct gl_extensions));
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;
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;
+ offset = set_extension(&_mesa_extension_override_disables, i, !enable);
+ if (offset != 0)
recognized = true;
- } else {
+ else
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);
- extra_extensions = NULL;
- } 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);
}
}
/* Number of extensions */
unsigned count;
/* Indices of the extensions sorted by year */
- extension_index *extension_indices;
- /* String of extra extensions. */
- const char *extra_extensions = get_extension_override(ctx);
+ extension_index extension_indices[MESA_EXTENSION_COUNT];
unsigned k;
unsigned j;
unsigned maxYear = ~0;
++count;
}
}
- 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) {
return NULL;
}
- extension_indices = malloc(count * sizeof(extension_index));
- if (extension_indices == NULL) {
- free(exts);
- return NULL;
- }
-
- /* Sort extensions in chronological order because certain old applications
- * (e.g., Quake3 demo) store the extension list in a static size buffer so
- * chronologically order ensure that the extensions that such applications
- * expect will fit into that buffer.
+ /* Sort extensions in chronological order because idTech 2/3 games
+ * (e.g., Quake3 demo) store the extension list in a fixed size buffer.
+ * Some cases truncate, while others overflow the buffer. Resulting in
+ * misrendering and crashes, respectively.
+ * Address the former here, while the latter will be addressed by setting
+ * the MESA_EXTENSION_MAX_YEAR environment variable.
*/
j = 0;
for (k = 0; k < MESA_EXTENSION_COUNT; ++k) {
strcat(exts, i->name);
strcat(exts, " ");
}
- free(extension_indices);
- 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;
if (_mesa_extension_supported(ctx, k))
ctx->Extensions.Count++;
}
+
+ for (k = 0; k < MAX_UNRECOGNIZED_EXTENSIONS; ++k) {
+ if (ctx->Extensions.unrecognized_extensions[k])
+ ctx->Extensions.Count++;
+ }
return ctx->Extensions.Count;
}
}
}
+ for (i = 0; i < MAX_UNRECOGNIZED_EXTENSIONS; ++i) {
+ if (ctx->Extensions.unrecognized_extensions[i]) {
+ if (n == index)
+ return (const GLubyte*) ctx->Extensions.unrecognized_extensions[i];
+ else
+ ++n;
+ }
+ }
return NULL;
}
projects / mesa.git / blobdiff