From 1814395b7ef3506935ae1f12630cdd602e15cd55 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Thu, 8 Oct 2009 22:46:21 +0100 Subject: llvmpipe: triangle struct owns its copy of shader inputs --- src/gallium/drivers/llvmpipe/lp_rast.h | 2 +- src/gallium/drivers/llvmpipe/lp_rast_tri.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gallium') diff --git a/src/gallium/drivers/llvmpipe/lp_rast.h b/src/gallium/drivers/llvmpipe/lp_rast.h index 28bb0a60ebc..64d668f9983 100644 --- a/src/gallium/drivers/llvmpipe/lp_rast.h +++ b/src/gallium/drivers/llvmpipe/lp_rast.h @@ -98,7 +98,7 @@ struct lp_rast_triangle { float dx31; /* inputs for the shader */ - struct lp_rast_shader_inputs *inputs; + struct lp_rast_shader_inputs inputs; }; diff --git a/src/gallium/drivers/llvmpipe/lp_rast_tri.c b/src/gallium/drivers/llvmpipe/lp_rast_tri.c index 86c785babb8..8cd3fcc360b 100644 --- a/src/gallium/drivers/llvmpipe/lp_rast_tri.c +++ b/src/gallium/drivers/llvmpipe/lp_rast_tri.c @@ -48,7 +48,7 @@ static void block_full( struct lp_rasterizer *rast, int iy; for (iy = 0; iy < 8; iy += 2) - lp_rast_shade_quads(rast, tri->inputs, x, y + iy, masks); + lp_rast_shade_quads(rast, &tri->inputs, x, y + iy, masks); } #else static void block_full( struct lp_rasterizer *rast, @@ -59,7 +59,7 @@ static void block_full( struct lp_rasterizer *rast, int iy; for (iy = 0; iy < 4; iy += 2) - lp_rast_shade_quads(rast, tri->inputs, x, y + iy, masks); + lp_rast_shade_quads(rast, &tri->inputs, x, y + iy, masks); } #endif @@ -140,7 +140,7 @@ do_block( struct lp_rasterizer *rast, cx3 += xstep3; } - lp_rast_shade_quads(rast, tri->inputs, x, y + iy, masks); + lp_rast_shade_quads(rast, &tri->inputs, x, y + iy, masks); c1 += ystep1; c2 += ystep2; -- cgit v1.2.3