summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/llvmpipe/lp_screen.c
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2009-08-09 23:10:19 +0100
committerJosé Fonseca <jfonseca@vmware.com>2009-08-29 09:21:27 +0100
commit2d6b39f05edcd575b1e10d53f96a38bec848fa67 (patch)
tree2fcee25f45648d36f6ffeecb0ab9439f77acc4f7 /src/gallium/drivers/llvmpipe/lp_screen.c
parente7fc21434d2c5a9177a427950be5029ff4db43ee (diff)
llvmpipe: Use the generated SoA blending code.
Diffstat (limited to 'src/gallium/drivers/llvmpipe/lp_screen.c')
-rw-r--r--src/gallium/drivers/llvmpipe/lp_screen.c35
1 files changed, 33 insertions, 2 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index b71f15678e7..2236711e9ba 100644
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -26,6 +26,8 @@
**************************************************************************/
+#include <llvm-c/Transforms/Scalar.h>
+
#include "util/u_memory.h"
#include "util/u_simple_screen.h"
#include "pipe/internal/p_winsys_screen.h"
@@ -149,9 +151,17 @@ llvmpipe_is_format_supported( struct pipe_screen *screen,
static void
-llvmpipe_destroy_screen( struct pipe_screen *screen )
+llvmpipe_destroy_screen( struct pipe_screen *_screen )
{
- struct pipe_winsys *winsys = screen->winsys;
+ struct llvmpipe_screen *screen = llvmpipe_screen(_screen);
+
+ struct pipe_winsys *winsys = _screen->winsys;
+
+ if(screen->engine)
+ LLVMDisposeExecutionEngine(screen->engine);
+
+ if(screen->pass)
+ LLVMDisposePassManager(screen->pass);
if(winsys->destroy)
winsys->destroy(winsys);
@@ -169,6 +179,7 @@ struct pipe_screen *
llvmpipe_create_screen(struct pipe_winsys *winsys)
{
struct llvmpipe_screen *screen = CALLOC_STRUCT(llvmpipe_screen);
+ char *error = NULL;
if (!screen)
return NULL;
@@ -186,5 +197,25 @@ llvmpipe_create_screen(struct pipe_winsys *winsys)
llvmpipe_init_screen_texture_funcs(&screen->base);
u_simple_screen_init(&screen->base);
+ screen->module = LLVMModuleCreateWithName("llvmpipe");
+
+ screen->provider = LLVMCreateModuleProviderForExistingModule(screen->module);
+
+ if (LLVMCreateJITCompiler(&screen->engine, screen->provider, 1, &error)) {
+ fprintf(stderr, "%s\n", error);
+ LLVMDisposeMessage(error);
+ abort();
+ }
+
+ screen->pass = LLVMCreateFunctionPassManager(screen->provider);
+ LLVMAddTargetData(LLVMGetExecutionEngineTargetData(screen->engine), screen->pass);
+ /* These are the passes currently listed in llvm-c/Transforms/Scalar.h,
+ * but there are more on SVN. */
+ LLVMAddConstantPropagationPass(screen->pass);
+ LLVMAddInstructionCombiningPass(screen->pass);
+ LLVMAddPromoteMemoryToRegisterPass(screen->pass);
+ LLVMAddGVNPass(screen->pass);
+ LLVMAddCFGSimplificationPass(screen->pass);
+
return &screen->base;
}