From 195ab79ddecbdbf1f1714c233df278bff46c13e8 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Sun, 28 Jun 2015 14:51:06 +0200 Subject: [PATCH] mesa/main: only call _mesa_destroy_shader_compiler once on exit There's no point in calling _mesa_destroy_shader_compiler multiple times on exit; the resources will only be released once anyway. So let's move the atexit-call into the part that is only called once. Signed-off-by: Erik Faye-Lund Reviewed-by: Matt Turner Reviewed-by: Brian Paul --- src/mesa/main/context.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 265f98aea46..c4af8ea16db 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -382,6 +382,8 @@ one_time_init( struct gl_context *ctx ) _mesa_ubyte_to_float_color_tab[i] = (float) i / 255.0F; } + atexit(_mesa_destroy_shader_compiler); + #if defined(DEBUG) && defined(__DATE__) && defined(__TIME__) if (MESA_VERBOSE != 0) { _mesa_debug(ctx, "Mesa %s DEBUG build %s %s\n", @@ -404,11 +406,6 @@ one_time_init( struct gl_context *ctx ) api_init_mask |= 1 << ctx->API; mtx_unlock(&OneTimeLock); - - /* Hopefully atexit() is widely available. If not, we may need some - * #ifdef tests here. - */ - atexit(_mesa_destroy_shader_compiler); } -- 2.30.2