diff options
| author | Jakob Bornecrantz <wallbraker@gmail.com> | 2011-01-24 03:25:17 +0100 |
|---|---|---|
| committer | Jakob Bornecrantz <wallbraker@gmail.com> | 2011-01-24 03:26:59 +0100 |
| commit | a82408c3537afe09e40b3ee6b3a6cb1acc62f715 (patch) | |
| tree | 989b6a5a28972693ec695b1448c608e51b9fcd9e /src/gallium/drivers/r300/r300_context.c | |
| parent | 4c73030d47f39441d718157f7d9a59c136bbfac0 (diff) | |
Revert "r300g/swtcl: re-enable LLVM"
This reverts commit 88550083b3857184445075e70fed8b2eed4952a1.
Diffstat (limited to 'src/gallium/drivers/r300/r300_context.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_context.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c index 91263ad7bc..e265bdbd3b 100644 --- a/src/gallium/drivers/r300/r300_context.c +++ b/src/gallium/drivers/r300/r300_context.c @@ -35,10 +35,6 @@ #include "r300_screen_buffer.h" #include "r300_winsys.h" -#ifdef HAVE_LLVM -#include "gallivm/lp_bld_init.h" -#endif - static void r300_update_num_contexts(struct r300_screen *r300screen, int diff) { @@ -106,14 +102,9 @@ static void r300_destroy_context(struct pipe_context* context) if (r300->blitter) util_blitter_destroy(r300->blitter); - if (r300->draw) { + if (r300->draw) draw_destroy(r300->draw); -#ifdef HAVE_LLVM - gallivm_destroy(r300->gallivm); -#endif - } - if (r300->upload_vb) u_upload_destroy(r300->upload_vb); if (r300->upload_ib) @@ -432,12 +423,7 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen, if (!r300screen->caps.has_tcl) { /* Create a Draw. This is used for SW TCL. */ -#ifdef HAVE_LLVM - r300->gallivm = gallivm_create(); - r300->draw = draw_create_gallivm(&r300->context, r300->gallivm); -#else r300->draw = draw_create(&r300->context); -#endif if (r300->draw == NULL) goto fail; /* Enable our renderer. */ |