Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesa into 965-glsl

1 files changed, 2 insertions, 2 deletions

diff --git a/src/mesa/swrast/s_logic.c b/src/mesa/swrast/s_logic.c
index e680732beed..0af9063968a 100644
--- a/src/mesa/swrast/s_logic.c
+++ b/src/mesa/swrast/s_logic.c
@@ -229,13 +229,13 @@ _swrast_logicop_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb,
    if (span->array->ChanType == GL_UNSIGNED_BYTE) {
       /* treat 4*GLubyte as GLuint */
       logicop_uint1(ctx, span->end,
-                    (GLuint *) span->array->color.sz1.rgba,
+                    (GLuint *) span->array->rgba8,
                     (const GLuint *) rbPixels, span->array->mask);
    }
    else if (span->array->ChanType == GL_UNSIGNED_SHORT) {
       /* treat 2*GLushort as GLuint */
       logicop_uint2(ctx, 2 * span->end,
-                    (GLuint *) span->array->color.sz2.rgba,
+                    (GLuint *) span->array->rgba16,
                     (const GLuint *) rbPixels, span->array->mask);
    }
    else {