r300: Further reduced the radeon_span.c diff.

[mesa.git] / src / mesa / swrast / s_logic.c

diff --git a/src/mesa/swrast/s_logic.c b/src/mesa/swrast/s_logic.c
index 214e4e7735f0ec35a83524cbebcb0494b90759f7..e680732beed4019fe3b584076733c41f8375b50d 100644 (file)
--- a/src/mesa/swrast/s_logic.c
+++ b/src/mesa/swrast/s_logic.c
@@ -188,7 +188,7 @@ logicop_uint4(GLcontext *ctx, GLuint n, GLuint src[], const GLuint dest[],
  */
 void
 _swrast_logicop_ci_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                        struct sw_span *span)
+                        SWspan *span)
 {
    GLuint dest[MAX_WIDTH];
    GLuint *index = span->array->index;
@@ -216,7 +216,7 @@ _swrast_logicop_ci_span(GLcontext *ctx, struct gl_renderbuffer *rb,
  */
 void
 _swrast_logicop_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                          struct sw_span *span)
+                          SWspan *span)
 {
    void *rbPixels;
 
@@ -240,7 +240,7 @@ _swrast_logicop_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb,
    }
    else {
       logicop_uint4(ctx, 4 * span->end,
-                    (GLuint *) span->array->color.sz4.rgba,
+                    (GLuint *) span->array->attribs[FRAG_ATTRIB_COL0],
                     (const GLuint *) rbPixels, span->array->mask);
    }
 }