Mesa (lp-binning): llvmpipe: triangle struct owns its copy of shader inputs

[Keith Whitwell]

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

Author: Keith Whitwell <keithw at vmware.com>
Date:   Thu Oct  8 22:46:21 2009 +0100

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(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_rast.h b/src/gallium/drivers/llvmpipe/lp_rast.h
index 28bb0a6..64d668f 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 86c785b..8cd3fcc 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;