OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/main: do not pass context to one-time extension init

Browse Source 
_mesa_problem doesn't use the ctx argument for anything, so there's no
reason to pass it. This saves us from needing a context passed down this
code-path in the first place.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4765>
This commit is contained in:
Erik Faye-Lund
2020-04-24 14:47:23 +02:00
committed by Marge Bot
parent 05c69752cf
commit 9bc98778a4
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/main/context.c
View File

@@ -388,7 +388,7 @@ one_time_init( struct gl_context *ctx )
_mesa_locale_init(); _mesa_locale_init();
_mesa_one_time_init_extension_overrides(ctx); _mesa_one_time_init_extension_overrides();
_mesa_get_cpu_features(); _mesa_get_cpu_features();

6
src/mesa/main/extensions.c
View File

@@ -236,7 +236,7 @@ free_unknown_extensions_strings(void)
* - Collect unrecognized extension names in a new string. * - Collect unrecognized extension names in a new string.
*/ */
void void
_mesa_one_time_init_extension_overrides(struct gl_context *ctx) _mesa_one_time_init_extension_overrides(void)
{ {
const char *env_const = getenv("MESA_EXTENSION_OVERRIDE"); const char *env_const = getenv("MESA_EXTENSION_OVERRIDE");
char *env; char *env;
@@ -289,14 +289,14 @@ _mesa_one_time_init_extension_overrides(struct gl_context *ctx)
if (!warned) { if (!warned) {
warned = true; warned = true;
_mesa_problem(ctx, "Trying to enable too many unknown extension. " _mesa_problem(NULL, "Trying to enable too many unknown extension. "
"Only the first %d will be honoured", "Only the first %d will be honoured",
MAX_UNRECOGNIZED_EXTENSIONS); MAX_UNRECOGNIZED_EXTENSIONS);
} }
} else { } else {
unrecognized_extensions.names[unknown_ext] = ext; unrecognized_extensions.names[unknown_ext] = ext;
unknown_ext++; unknown_ext++;
_mesa_problem(ctx, "Trying to enable unknown extension: %s", ext); _mesa_problem(NULL, "Trying to enable unknown extension: %s", ext);
} }
} }
} }

2
src/mesa/main/extensions.h
View File

@@ -47,7 +47,7 @@ struct gl_extensions;
extern void _mesa_enable_sw_extensions(struct gl_context *ctx); extern void _mesa_enable_sw_extensions(struct gl_context *ctx);
extern void _mesa_one_time_init_extension_overrides(struct gl_context *ctx); extern void _mesa_one_time_init_extension_overrides(void);
extern void _mesa_init_extensions(struct gl_extensions *extentions); extern void _mesa_init_extensions(struct gl_extensions *extentions);