Mesa (master): llvmpipe: Fix USE_DRAW_LLVM build. Use lp_build_engine.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Wed Apr 7 12:49:43 UTC 2010
Module: Mesa
Branch: master
Commit: da17623c33cddf96c0f63b32e25ebc33b04a2b14
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=da17623c33cddf96c0f63b32e25ebc33b04a2b14
Author: José Fonseca <jfonseca at vmware.com>
Date: Wed Apr 7 13:49:29 2010 +0100
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(-)
diff --git a/src/gallium/auxiliary/draw/draw_context.h b/src/gallium/auxiliary/draw/draw_context.h
index d42e400..a0e1c1c 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 <llvm-c/ExecutionEngine.h>
-#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 121cce3..4912b6a 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 62d4231..d94c2da 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
More information about the mesa-commit
mailing list