Mesa (master): mesa/main: only call _mesa_destroy_shader_compiler once on exit
Matt Turner
mattst88 at kemper.freedesktop.org
Mon Jun 29 16:39:44 UTC 2015
Module: Mesa
Branch: master
Commit: 195ab79ddecbdbf1f1714c233df278bff46c13e8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=195ab79ddecbdbf1f1714c233df278bff46c13e8
Author: Erik Faye-Lund <kusmabite at gmail.com>
Date: Sun Jun 28 14:51:06 2015 +0200
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 <kusmabite at gmail.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
---
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 265f98a..c4af8ea 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);
}
More information about the mesa-commit
mailing list