From c1013f5d404880046f304de706d4216b08bd3011 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Fri, 9 Oct 2009 12:26:49 +0100
Subject: llvmpipe: remove dead code

---
 src/gallium/drivers/llvmpipe/lp_flush.c         |  1 +
 src/gallium/drivers/llvmpipe/lp_jit.c           | 18 ------------------
 src/gallium/drivers/llvmpipe/lp_jit.h           |  4 ----
 src/gallium/drivers/llvmpipe/lp_state_surface.c |  6 +++++-
 4 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_flush.c b/src/gallium/drivers/llvmpipe/lp_flush.c
index d0dd41f09c..f7a1d89701 100644
--- a/src/gallium/drivers/llvmpipe/lp_flush.c
+++ b/src/gallium/drivers/llvmpipe/lp_flush.c
@@ -37,6 +37,7 @@
 #include "lp_surface.h"
 #include "lp_state.h"
 #include "lp_winsys.h"
+#include "lp_setup.h"
 
 
 void
diff --git a/src/gallium/drivers/llvmpipe/lp_jit.c b/src/gallium/drivers/llvmpipe/lp_jit.c
index a03eb874ac..fb6ec9bb37 100644
--- a/src/gallium/drivers/llvmpipe/lp_jit.c
+++ b/src/gallium/drivers/llvmpipe/lp_jit.c
@@ -108,24 +108,6 @@ lp_jit_init_globals(struct llvmpipe_screen *screen)
       screen->context_ptr_type = LLVMPointerType(context_type, 0);
    }
 
-   /* fetch_texel
-    */
-   {
-      LLVMTypeRef ret_type;
-      LLVMTypeRef arg_types[3];
-      LLVMValueRef fetch_texel;
-
-      ret_type = LLVMVoidType();
-      arg_types[0] = LLVMPointerType(LLVMInt8Type(), 0);  /* samplers */
-      arg_types[1] = LLVMInt32Type();                     /* unit */
-      arg_types[2] = LLVMPointerType(LLVMVectorType(LLVMFloatType(), 4), 0); /* store */
-
-      fetch_texel = lp_declare_intrinsic(screen->module, "fetch_texel",
-                                         ret_type, arg_types, Elements(arg_types));
-
-      LLVMAddGlobalMapping(screen->engine, fetch_texel, lp_fetch_texel_soa);
-   }
-
 #ifdef DEBUG
    LLVMDumpModule(screen->module);
 #endif
diff --git a/src/gallium/drivers/llvmpipe/lp_jit.h b/src/gallium/drivers/llvmpipe/lp_jit.h
index 207dfbfde1..7eccb5da85 100644
--- a/src/gallium/drivers/llvmpipe/lp_jit.h
+++ b/src/gallium/drivers/llvmpipe/lp_jit.h
@@ -118,10 +118,6 @@ typedef void
                     void *color,
                     void *depth);
 
-void PIPE_CDECL
-lp_fetch_texel_soa( struct tgsi_sampler **samplers,
-                    uint32_t unit,
-                    float *store );
 
 
 void
diff --git a/src/gallium/drivers/llvmpipe/lp_state_surface.c b/src/gallium/drivers/llvmpipe/lp_state_surface.c
index bb1396c3ab..909ca9f117 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_surface.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_surface.c
@@ -31,6 +31,7 @@
 #include "lp_context.h"
 #include "lp_state.h"
 #include "lp_surface.h"
+#include "lp_setup.h"
 
 #include "draw/draw_context.h"
 
@@ -82,7 +83,10 @@ llvmpipe_set_framebuffer_state(struct pipe_context *pipe,
    }
 
    if (dirty) {
-      lp_setup_set_framebuffer( lp->setup, fb );
+      lp_setup_bind_framebuffer( lp->setup,
+                                 fb->cbufs[0],
+                                 fb->zsbuf );
+
       lp->dirty |= LP_NEW_FRAMEBUFFER;
    }
 }
-- 
cgit v1.2.3