From 2c57caa8939a2d077912eeec287927da77c97ef7 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 15 Apr 2011 08:32:12 -0600 Subject: st/mesa: simplify a bit of the previous patch Grrr, this was supposed to go in the previous commit. --- src/mesa/state_tracker/st_cb_readpixels.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/mesa/state_tracker') diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c index 1b57e9b6f7e..2a63799bdbc 100644 --- a/src/mesa/state_tracker/st_cb_readpixels.c +++ b/src/mesa/state_tracker/st_cb_readpixels.c @@ -211,9 +211,11 @@ st_fast_readpixels(struct gl_context *ctx, struct st_renderbuffer *strb, if (strb->format == PIPE_FORMAT_B8G8R8A8_UNORM) { alphaORoperand = 0; - } else if (strb->format == PIPE_FORMAT_B8G8R8X8_UNORM ) { + } + else if (strb->format == PIPE_FORMAT_B8G8R8X8_UNORM ) { alphaORoperand = 0xff; - } else { + } + else { return GL_FALSE; } @@ -312,9 +314,10 @@ st_fast_readpixels(struct gl_context *ctx, struct st_renderbuffer *strb, const GLubyte *src = map + y * trans->stride; memcpy(dst, src, 4 * width); if (alphaORoperand) { - for (col = 0; col < width; col++) { - dst[col*4+3] |= alphaORoperand; - } + assert(alphaORoperand == 0xff); + for (col = 0; col < width; col++) { + dst[col*4+3] = 0xff; + } } dst += dstStride; y += dy; -- cgit v1.2.3