From da17623c33cddf96c0f63b32e25ebc33b04a2b14 Mon Sep 17 00:00:00 2001 From: José Fonseca Date: Wed, 7 Apr 2010 13:49:29 +0100 Subject: llvmpipe: Fix USE_DRAW_LLVM build. Use lp_build_engine. --- src/gallium/auxiliary/draw/draw_context.h | 6 +----- src/gallium/auxiliary/draw/draw_llvm.c | 7 +++++-- src/gallium/drivers/llvmpipe/lp_context.c | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) (limited to 'src/gallium') diff --git a/src/gallium/auxiliary/draw/draw_context.h b/src/gallium/auxiliary/draw/draw_context.h index d42e400318..a0e1c1c59b 100644 --- a/src/gallium/auxiliary/draw/draw_context.h +++ b/src/gallium/auxiliary/draw/draw_context.h @@ -40,10 +40,6 @@ #include "pipe/p_state.h" -#ifdef DRAW_LLVM -#include -#endif - struct pipe_context; struct draw_context; struct draw_stage; @@ -204,7 +200,7 @@ boolean draw_need_pipeline(const struct draw_context *draw, /******************************************************************************* * LLVM integration */ -struct draw_context *draw_create_with_llvm(LLVMExecutionEngineRef engine); +struct draw_context *draw_create_with_llvm(void); #endif #endif /* DRAW_CONTEXT_H */ diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c index 121cce3d71..4912b6ac50 100644 --- a/src/gallium/auxiliary/draw/draw_llvm.c +++ b/src/gallium/auxiliary/draw/draw_llvm.c @@ -11,6 +11,7 @@ #include "gallivm/lp_bld_debug.h" #include "gallivm/lp_bld_tgsi.h" #include "gallivm/lp_bld_printf.h" +#include "gallivm/lp_bld_init.h" #include "util/u_cpu_detect.h" #include "tgsi/tgsi_dump.h" @@ -199,12 +200,14 @@ draw_llvm_prepare(struct draw_llvm *llvm, int num_inputs) } -struct draw_context *draw_create_with_llvm(LLVMExecutionEngineRef engine) +struct draw_context *draw_create_with_llvm(void) { struct draw_context *draw = CALLOC_STRUCT( draw_context ); if (draw == NULL) goto fail; - draw->engine = engine; + + assert(lp_build_engine); + draw->engine = lp_build_engine; if (!draw_init(draw)) goto fail; diff --git a/src/gallium/drivers/llvmpipe/lp_context.c b/src/gallium/drivers/llvmpipe/lp_context.c index 62d42317d7..d94c2da2ff 100644 --- a/src/gallium/drivers/llvmpipe/lp_context.c +++ b/src/gallium/drivers/llvmpipe/lp_context.c @@ -182,7 +182,7 @@ llvmpipe_create_context( struct pipe_screen *screen, void *priv ) * Create drawing context and plug our rendering stage into it. */ #if USE_DRAW_LLVM - llvmpipe->draw = draw_create_with_llvm(llvmscreen->engine); + llvmpipe->draw = draw_create_with_llvm(); #else llvmpipe->draw = draw_create(); #endif -- cgit v1.2.3