From 57f4c66028786d0efc4074811db79b784c11f9b8 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Fri, 24 Apr 2020 15:34:01 +0200 Subject: [PATCH] mesa/main: one_time_init() -> _mesa_initialize() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This exposes the logic inside one_time_init() as _mesa_initialize(), so drivers who needs to use functionality initialized in one_time_init earlier if they need. This means we can reliably use the GLSL type-system when compiling driver built-in shaders. Reviewed-by: Marek Olšák Part-of: --- src/mesa/main/context.c | 6 +++--- src/mesa/main/context.h | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index bb181c6def3..2b8becb806d 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -368,8 +368,8 @@ one_time_fini(void) * * \sa _math_init(). */ -static void -one_time_init(void) +void +_mesa_initialize(void) { static bool initialized; @@ -1204,7 +1204,7 @@ _mesa_initialize_context(struct gl_context *ctx, _mesa_override_gl_version(ctx); /* misc one-time initializations */ - one_time_init(); + _mesa_initialize(); /* Plug in driver functions and context pointer here. * This is important because when we call alloc_shared_state() below diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h index f2feb7f9ed4..d5b97ac4fc7 100644 --- a/src/mesa/main/context.h +++ b/src/mesa/main/context.h @@ -107,6 +107,9 @@ _mesa_destroy_visual( struct gl_config *vis ); /** \name Context-related functions */ /*@{*/ +extern void +_mesa_initialize(void); + extern GLboolean _mesa_initialize_context( struct gl_context *ctx, gl_api api, -- 2.30.2