diff options
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_context.c | 18 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_context.h | 5 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_llvm.c | 11 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_llvm.h | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_context.c | 3 |
5 files changed, 31 insertions, 9 deletions
diff --git a/src/gallium/auxiliary/draw/draw_context.c b/src/gallium/auxiliary/draw/draw_context.c index 85f8e26eb33..b0f4ca2c4c0 100644 --- a/src/gallium/auxiliary/draw/draw_context.c +++ b/src/gallium/auxiliary/draw/draw_context.c @@ -81,7 +81,8 @@ draw_get_option_use_llvm(void) * Create new draw module context with gallivm state for LLVM JIT. */ static struct draw_context * -draw_create_context(struct pipe_context *pipe, boolean try_llvm) +draw_create_context(struct pipe_context *pipe, void *context, + boolean try_llvm) { struct draw_context *draw = CALLOC_STRUCT( draw_context ); if (draw == NULL) @@ -92,7 +93,7 @@ draw_create_context(struct pipe_context *pipe, boolean try_llvm) #if HAVE_LLVM if (try_llvm && draw_get_option_use_llvm()) { - draw->llvm = draw_llvm_create(draw); + draw->llvm = draw_llvm_create(draw, (LLVMContextRef)context); } #endif @@ -120,17 +121,26 @@ err_out: struct draw_context * draw_create(struct pipe_context *pipe) { - return draw_create_context(pipe, TRUE); + return draw_create_context(pipe, NULL, TRUE); } +#if HAVE_LLVM +struct draw_context * +draw_create_with_llvm_context(struct pipe_context *pipe, + void *context) +{ + return draw_create_context(pipe, context, TRUE); +} +#endif + /** * Create a new draw context, without LLVM JIT. */ struct draw_context * draw_create_no_llvm(struct pipe_context *pipe) { - return draw_create_context(pipe, FALSE); + return draw_create_context(pipe, NULL, FALSE); } diff --git a/src/gallium/auxiliary/draw/draw_context.h b/src/gallium/auxiliary/draw/draw_context.h index 48549fe200e..a5a6df5b72e 100644 --- a/src/gallium/auxiliary/draw/draw_context.h +++ b/src/gallium/auxiliary/draw/draw_context.h @@ -64,6 +64,11 @@ struct draw_so_target { struct draw_context *draw_create( struct pipe_context *pipe ); +#if HAVE_LLVM +struct draw_context *draw_create_with_llvm_context(struct pipe_context *pipe, + void *context); +#endif + struct draw_context *draw_create_no_llvm(struct pipe_context *pipe); void draw_destroy( struct draw_context *draw ); diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c index 8469d6999b1..14c802b3b2a 100644 --- a/src/gallium/auxiliary/draw/draw_llvm.c +++ b/src/gallium/auxiliary/draw/draw_llvm.c @@ -480,7 +480,7 @@ get_vertex_header_ptr_type(struct draw_llvm_variant *variant) * Create per-context LLVM info. */ struct draw_llvm * -draw_llvm_create(struct draw_context *draw) +draw_llvm_create(struct draw_context *draw, LLVMContextRef context) { struct draw_llvm *llvm; @@ -493,7 +493,11 @@ draw_llvm_create(struct draw_context *draw) llvm->draw = draw; - llvm->context = LLVMContextCreate(); + llvm->context = context; + if (!llvm->context) { + llvm->context = LLVMContextCreate(); + llvm->context_owned = true; + } if (!llvm->context) goto fail; @@ -517,7 +521,8 @@ fail: void draw_llvm_destroy(struct draw_llvm *llvm) { - LLVMContextDispose(llvm->context); + if (llvm->context_owned) + LLVMContextDispose(llvm->context); llvm->context = NULL; /* XXX free other draw_llvm data? */ diff --git a/src/gallium/auxiliary/draw/draw_llvm.h b/src/gallium/auxiliary/draw/draw_llvm.h index a4bd1edcf0d..54a7da2d02c 100644 --- a/src/gallium/auxiliary/draw/draw_llvm.h +++ b/src/gallium/auxiliary/draw/draw_llvm.h @@ -462,6 +462,7 @@ struct draw_llvm { struct draw_context *draw; LLVMContextRef context; + boolean context_owned; struct draw_jit_context jit_context; struct draw_gs_jit_context gs_jit_context; @@ -490,7 +491,7 @@ llvm_geometry_shader(struct draw_geometry_shader *gs) struct draw_llvm * -draw_llvm_create(struct draw_context *draw); +draw_llvm_create(struct draw_context *draw, LLVMContextRef llvm_context); void draw_llvm_destroy(struct draw_llvm *llvm); diff --git a/src/gallium/drivers/llvmpipe/lp_context.c b/src/gallium/drivers/llvmpipe/lp_context.c index 3a9b4c22a9b..37b1ff4ed1b 100644 --- a/src/gallium/drivers/llvmpipe/lp_context.c +++ b/src/gallium/drivers/llvmpipe/lp_context.c @@ -171,7 +171,8 @@ llvmpipe_create_context( struct pipe_screen *screen, void *priv ) /* * Create drawing context and plug our rendering stage into it. */ - llvmpipe->draw = draw_create(&llvmpipe->pipe); + llvmpipe->draw = draw_create_with_llvm_context(&llvmpipe->pipe, + llvmpipe->context); if (!llvmpipe->draw) goto fail; |