llvmpipe: triangle struct owns its copy of shader inputs

diff --git a/src/gallium/drivers/llvmpipe/lp_rast.h b/src/gallium/drivers/llvmpipe/lp_rast.h
index 28bb0a60ebc6b6dffb1c3d54ccff282a06095b71..64d668f998360da85074e6f7819318c4a65d4294 100644 (file)
--- 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 86c785babb83f70f7af4b8f9966f0a48fff51a10..8cd3fcc360bb3f9167e9c111796d9f17fbd97d81 100644 (file)
--- 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;