diff options
| author | Roland Scheidegger <[email protected]> | 2015-03-21 01:13:54 +0100 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2015-03-21 01:52:03 +0100 |
| commit | e8039208c4a771b0c1fb8a44623bcf0261508f87 (patch) | |
| tree | a8560e3b0db1fb7cb72d3f2c9e6044a6836bbf86 /src/gallium | |
| parent | b2dccfd17eb045ce240cda232d40edb5dc1c7c31 (diff) | |
llvmpipe: use global llvm context for PIPE_SUBSYSTEM_EMBEDDED
There's 2 reasons why we'd want to use the global context:
1) There still seems to be one memory "leak" left when using multiple llvm
contexts (it is not a true leak as the memory disappears into some still
addressable pool but nevertheless the memory consumption grows). See
http://cgit.freedesktop.org/~jrfonseca/llvm-jitstress/
2) These contexts get kinda big - even when disposing modules etc. after
compiling a shader the LLVMContext can easily be over 100kB. So when there's
lots of llvm contexts arounds it adds up.
The downside is that at least right now this is absolutely not thread safe,
so this only works safely in environments where multiple pipe contexts are not
used concurrently.
Reviewed-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_context.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_context.c b/src/gallium/drivers/llvmpipe/lp_context.c index 06cc82020b1..80cb6578bd1 100644 --- a/src/gallium/drivers/llvmpipe/lp_context.c +++ b/src/gallium/drivers/llvmpipe/lp_context.c @@ -46,6 +46,10 @@ #include "lp_query.h" #include "lp_setup.h" +/* This is only safe if there's just one concurrent context */ +#ifdef PIPE_SUBSYSTEM_EMBEDDED +#define USE_GLOBAL_LLVM_CONTEXT +#endif static void llvmpipe_destroy( struct pipe_context *pipe ) { @@ -93,7 +97,9 @@ static void llvmpipe_destroy( struct pipe_context *pipe ) lp_delete_setup_variants(llvmpipe); +#ifndef USE_GLOBAL_LLVM_CONTEXT LLVMContextDispose(llvmpipe->context); +#endif llvmpipe->context = NULL; align_free( llvmpipe ); @@ -164,7 +170,12 @@ llvmpipe_create_context( struct pipe_screen *screen, void *priv ) llvmpipe_init_context_resource_funcs( &llvmpipe->pipe ); llvmpipe_init_surface_functions(llvmpipe); +#ifdef USE_GLOBAL_LLVM_CONTEXT + llvmpipe->context = LLVMGetGlobalContext(); +#else llvmpipe->context = LLVMContextCreate(); +#endif + if (!llvmpipe->context) goto fail; |