summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary/draw
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/auxiliary/draw')
-rw-r--r--src/gallium/auxiliary/draw/draw_context.h6
-rw-r--r--src/gallium/auxiliary/draw/draw_llvm.c7
2 files changed, 6 insertions, 7 deletions
diff --git a/src/gallium/auxiliary/draw/draw_context.h b/src/gallium/auxiliary/draw/draw_context.h
index d42e4003183..a0e1c1c59b9 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 121cce3d717..4912b6ac508 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;