Revert "r300g/swtcl: re-enable LLVM"

This reverts commit 88550083b3857184445075e70fed8b2eed4952a1.

diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c
index 91263ad..e265bdb 100644 (file)
--- 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"
 
 #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)
 {
 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->blitter)
         util_blitter_destroy(r300->blitter);

-    if (r300->draw) {
+    if (r300->draw)

         draw_destroy(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)
     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. */
 
     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);
         r300->draw = draw_create(&r300->context);

-#endif

         if (r300->draw == NULL)
             goto fail;
         /* Enable our renderer. */
         if (r300->draw == NULL)
             goto fail;
         /* Enable our renderer. */

diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h
index e09cf87..9030f1b 100644 (file)
--- a/src/gallium/drivers/r300/r300_context.h
+++ b/src/gallium/drivers/r300/r300_context.h
@@ -456,7 +456,6 @@ struct r300_context {
     struct r300_screen *screen;
 
     /* Draw module. Used mostly for SW TCL. */
     struct r300_screen *screen;
 
     /* Draw module. Used mostly for SW TCL. */

-    struct gallivm_state *gallivm;

     struct draw_context* draw;
     /* Vertex buffer for SW TCL. */
     struct pipe_resource* vbo;
     struct draw_context* draw;
     /* Vertex buffer for SW TCL. */
     struct pipe_resource* vbo;

diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
index 178ad63..37b8bc6 100644 (file)
--- a/src/gallium/drivers/r300/r300_screen.c
+++ b/src/gallium/drivers/r300/r300_screen.c
@@ -34,10 +34,6 @@
 
 #include "draw/draw_context.h"
 
 
 #include "draw/draw_context.h"
 

-#ifdef HAVE_LLVM
-#include "gallivm/lp_bld_init.h"
-#endif
-

 /* Return the identifier behind whom the brave coders responsible for this
  * amalgamation of code, sweat, and duct tape, routinely obscure their names.
  *
 /* Return the identifier behind whom the brave coders responsible for this
  * amalgamation of code, sweat, and duct tape, routinely obscure their names.
  *


@@ -483,9 +479,5 @@ struct pipe_screen* r300_screen_create(struct r300_winsys_screen *rws)
 
     util_format_s3tc_init();
 
 
     util_format_s3tc_init();
 

-#ifdef HAVE_LLVM
-    lp_build_init();
-#endif
-

     return &r300screen->screen;
 }
     return &r300screen->screen;
 }