draw: Make it possible to create a llvm free context

Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Jakob Bornecrantz 2012-01-09 00:00:34 +01:00
parent a53cb348ba
commit 3e22c7a253
2 changed files with 35 additions and 15 deletions

View File

@ -65,30 +65,19 @@ draw_get_option_use_llvm(void)
#endif
/**
* Create new draw module context.
*/
struct draw_context *
draw_create(struct pipe_context *pipe)
{
return draw_create_gallivm(pipe, NULL);
}
/**
* Create new draw module context with gallivm state for LLVM JIT.
*/
struct draw_context *
draw_create_gallivm(struct pipe_context *pipe, struct gallivm_state *gallivm)
static struct draw_context *
draw_create_context(struct pipe_context *pipe, boolean try_llvm,
struct gallivm_state *gallivm)
{
struct draw_context *draw = CALLOC_STRUCT( draw_context );
if (draw == NULL)
goto fail;
#if HAVE_LLVM
if (draw_get_option_use_llvm()) {
if (try_llvm && draw_get_option_use_llvm()) {
if (!gallivm) {
gallivm = gallivm_create();
draw->own_gallivm = gallivm;
@ -112,6 +101,35 @@ fail:
}
/**
* Create new draw module context, with LLVM JIT.
*/
struct draw_context *
draw_create(struct pipe_context *pipe)
{
return draw_create_context(pipe, TRUE, NULL);
}
/**
* 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, NULL);
}
/**
* Create new draw module context with gallivm state for LLVM JIT.
*/
struct draw_context *
draw_create_gallivm(struct pipe_context *pipe, struct gallivm_state *gallivm)
{
return draw_create_context(pipe, TRUE, gallivm);
}
boolean draw_init(struct draw_context *draw)
{

View File

@ -54,6 +54,8 @@ struct gallivm_state;
struct draw_context *draw_create( struct pipe_context *pipe );
struct draw_context *draw_create_no_llvm(struct pipe_context *pipe);
struct draw_context *
draw_create_gallivm(struct pipe_context *pipe, struct gallivm_state *gallivm);