Commit da17623c authored by Jose Fonseca's avatar Jose Fonseca
Browse files

llvmpipe: Fix USE_DRAW_LLVM build. Use lp_build_engine.

parent 765dc9fc
......@@ -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 */
......@@ -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;
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment