mesa: Branch 'master'

[Brian Paul]

 src/mesa/swrast/s_copypix.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 51a894e6ebc3412a6d634a7378806f137374b09a (from ac32b644eec8d4f88d0dd2ec352fcab4871192a2)
Author: Brian <brian at nostromo.localnet.net>
Date:   Thu Apr 5 21:12:44 2007 -0600

    fix color storage bug in convolution path

diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c
index b400c02..8f37a3d 100644
--- a/src/mesa/swrast/s_copypix.c
+++ b/src/mesa/swrast/s_copypix.c
@@ -163,7 +163,7 @@ copy_conv_rgba_pixels(GLcontext *ctx, GL
       /* write the new image */
       for (row = 0; row < height; row++) {
          const GLfloat *src = convImage + row * width * 4;
-         GLvoid *rgba = span.array->color.sz1.rgba; /* row storage */
+         GLvoid *rgba = (GLvoid *) span.array->attribs[FRAG_ATTRIB_COL0];
 
          /* copy convolved colors into span array */
          _mesa_memcpy(rgba, src, width * 4 * sizeof(GLfloat));