From f92787679d668bd1f48929da49d4df55be635fa9 Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Thu, 8 Oct 2009 19:03:35 +0100
Subject: llvmpipe: More assorted build fixes.
---
src/gallium/drivers/llvmpipe/lp_rast_tri.c | 4 ++--
src/gallium/drivers/llvmpipe/lp_setup.c | 1 -
src/gallium/drivers/llvmpipe/lp_state_derived.c | 30 ++++---------------------
3 files changed, 6 insertions(+), 29 deletions(-)
(limited to 'src/gallium/drivers')
diff --git a/src/gallium/drivers/llvmpipe/lp_rast_tri.c b/src/gallium/drivers/llvmpipe/lp_rast_tri.c
index 40965d5f65..63e956fb20 100644
--- a/src/gallium/drivers/llvmpipe/lp_rast_tri.c
+++ b/src/gallium/drivers/llvmpipe/lp_rast_tri.c
@@ -203,8 +203,8 @@ void lp_rast_triangle( struct lp_rasterizer *rast,
*/
minx = MAX2(tri->maxx, rast->x);
miny = MAX2(tri->miny, rast->y);
- maxx = MIN2(tri->maxx, rast->x + TILESIZE);
- maxy = MIN2(tri->maxy, rast->y + TILESIZE);
+ maxx = MIN2(tri->maxx, rast->x + TILE_SIZE);
+ maxy = MIN2(tri->maxy, rast->y + TILE_SIZE);
if (miny == maxy ||
minx == maxx) {
diff --git a/src/gallium/drivers/llvmpipe/lp_setup.c b/src/gallium/drivers/llvmpipe/lp_setup.c
index 43a4f5f029..9016c4b364 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup.c
@@ -250,7 +250,6 @@ lp_setup_clear( struct setup_context *setup,
{
if (setup->state == SETUP_ACTIVE) {
struct lp_rast_clear_info *clear_info;
- unsigned i, j;
clear_info = alloc_clear_info( setup );
diff --git a/src/gallium/drivers/llvmpipe/lp_state_derived.c b/src/gallium/drivers/llvmpipe/lp_state_derived.c
index 4015b0439a..b801f054a2 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_derived.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_derived.c
@@ -205,28 +205,7 @@ compute_cliprect(struct llvmpipe_context *lp)
}
-static void
-update_tgsi_samplers( struct llvmpipe_context *llvmpipe )
-{
- unsigned i;
-
- /* vertex shader samplers */
- for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
- llvmpipe->tgsi.vert_samplers[i].sampler = llvmpipe->sampler[i];
- llvmpipe->tgsi.vert_samplers[i].texture = llvmpipe->texture[i];
- llvmpipe->tgsi.vert_samplers[i].base.get_samples = lp_get_samples;
- }
-
- /* fragment shader samplers */
- for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
- llvmpipe->tgsi.frag_samplers[i].sampler = llvmpipe->sampler[i];
- llvmpipe->tgsi.frag_samplers[i].texture = llvmpipe->texture[i];
- llvmpipe->tgsi.frag_samplers[i].base.get_samples = lp_get_samples;
- }
-
- llvmpipe->jit_context.samplers = (struct tgsi_sampler **)llvmpipe->tgsi.frag_samplers_list;
-}
-
+#if 0
static void
update_culling(struct llvmpipe_context *lp)
{
@@ -243,6 +222,7 @@ update_culling(struct llvmpipe_context *lp)
setup->winding = PIPE_WINDING_NONE;
}
}
+#endif
/* Hopefully this will remain quite simple, otherwise need to pull in
@@ -259,10 +239,6 @@ void llvmpipe_update_derived( struct llvmpipe_context *llvmpipe )
llvmpipe->dirty |= LP_NEW_TEXTURE;
}
- if (llvmpipe->dirty & (LP_NEW_SAMPLER |
- LP_NEW_TEXTURE))
- update_tgsi_samplers( llvmpipe );
-
if (llvmpipe->dirty & (LP_NEW_RASTERIZER |
LP_NEW_FS |
LP_NEW_VS))
@@ -285,6 +261,7 @@ void llvmpipe_update_derived( struct llvmpipe_context *llvmpipe )
}
+#if 0
void llvmpipe_prepare(struct lp_setup_context *setup)
{
struct llvmpipe_context *lp = setup->llvmpipe;
@@ -294,3 +271,4 @@ void llvmpipe_prepare(struct lp_setup_context *setup)
}
}
+#endif
--
cgit v1.2.3