summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2009-10-08 17:59:57 +0100
committerJosé Fonseca <jfonseca@vmware.com>2009-10-08 17:59:57 +0100
commit35a90e67ebc37dc0a8432db76c91b8855a94598a (patch)
tree67519ebed400d0949cee6a0019ebfc2b0b229c25 /src/gallium
parent37b86aa55c6bb520997c00dbf1a2b38d4aed38eb (diff)
llvmpipe: Assorted build fixes.
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/llvmpipe/lp_state_derived.c6
-rw-r--r--src/gallium/drivers/llvmpipe/lp_state_surface.c2
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 c9439c7154..4015b0439a 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 06560335d7..bb1396c3ab 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;
}
}