Mesa (lp-binning): llvmpipe: Assorted build fixes.

[Jose Fonseca]

Module: Mesa
Branch: lp-binning
Commit: 35a90e67ebc37dc0a8432db76c91b8855a94598a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=35a90e67ebc37dc0a8432db76c91b8855a94598a

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Oct  8 17:59:57 2009 +0100

llvmpipe: Assorted build fixes.

---

 src/gallium/drivers/llvmpipe/lp_state_derived.c |    6 ++++--
 src/gallium/drivers/llvmpipe/lp_state_surface.c |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_state_derived.c b/src/gallium/drivers/llvmpipe/lp_state_derived.c
index c9439c7..4015b04 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_derived.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_derived.c
@@ -228,8 +228,10 @@ update_tgsi_samplers( struct llvmpipe_context *llvmpipe )
 }
 
 static void 
-update_culling()
+update_culling(struct llvmpipe_context *lp)
 {
+   struct lp_setup_context *setup = lp->setup;
+
    if (lp->reduced_api_prim == PIPE_PRIM_TRIANGLES &&
        lp->rasterizer->fill_cw == PIPE_POLYGON_MODE_FILL &&
        lp->rasterizer->fill_ccw == PIPE_POLYGON_MODE_FILL) {
@@ -283,7 +285,7 @@ void llvmpipe_update_derived( struct llvmpipe_context *llvmpipe )
 }
 
 
-void llvmpipe_prepare( )
+void llvmpipe_prepare(struct lp_setup_context *setup)
 {
    struct llvmpipe_context *lp = setup->llvmpipe;
 
diff --git a/src/gallium/drivers/llvmpipe/lp_state_surface.c b/src/gallium/drivers/llvmpipe/lp_state_surface.c
index 0656033..bb1396c 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_surface.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_surface.c
@@ -82,7 +82,7 @@ llvmpipe_set_framebuffer_state(struct pipe_context *pipe,
    }
 
    if (dirty) {
-      lp_setup_set_framebuffer( llvmpipe->setup, fb );
+      lp_setup_set_framebuffer( lp->setup, fb );
       lp->dirty |= LP_NEW_FRAMEBUFFER;
    }
 }