svn merge ^/branches/released .

1 files changed, 20 insertions, 1 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_cb_readpixels.c b/mesalib/src/mesa/state_tracker/st_cb_readpixels.c
index 425019dca..08f53054d 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_readpixels.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_readpixels.c
@@ -201,7 +201,8 @@ st_fast_readpixels(struct gl_context *ctx, struct st_renderbuffer *strb,
    enum combination {

       A8R8G8B8_UNORM_TO_RGBA_UBYTE,

       A8R8G8B8_UNORM_TO_RGB_UBYTE,

-      A8R8G8B8_UNORM_TO_BGRA_UINT

+      A8R8G8B8_UNORM_TO_BGRA_UINT,

+      A8R8G8B8_UNORM_TO_RGBA_UINT

    } combo;

 

    if (ctx->_ImageTransferState)

@@ -219,6 +220,10 @@ st_fast_readpixels(struct gl_context *ctx, struct st_renderbuffer *strb,
             format == GL_BGRA && type == GL_UNSIGNED_INT_8_8_8_8_REV) {

       combo = A8R8G8B8_UNORM_TO_BGRA_UINT;

    }

+   else if (strb->format == PIPE_FORMAT_B8G8R8A8_UNORM &&

+            format == GL_RGBA && type == GL_UNSIGNED_INT_8_8_8_8) {

+      combo = A8R8G8B8_UNORM_TO_RGBA_UINT;

+   }

    else {

       return GL_FALSE;

    }

@@ -305,6 +310,20 @@ st_fast_readpixels(struct gl_context *ctx, struct st_renderbuffer *strb,
             y += dy;

          }

          break;

+      case A8R8G8B8_UNORM_TO_RGBA_UINT:

+         for (row = 0; row < height; row++) {

+            const GLubyte *src = map + y * trans->stride;

+            for (col = 0; col < width; col++) {

+               GLuint pixel = ((GLuint *) src)[col];

+               dst[col*4+0] = (pixel >> 24) & 0xff;

+               dst[col*4+1] = (pixel >> 0) & 0xff;

+               dst[col*4+2] = (pixel >> 8) & 0xff;

+               dst[col*4+3] = (pixel >> 16) & 0xff;

+            }

+            dst += dstStride;

+            y += dy;

+         }

+         break;

       default:

          ; /* nothing */

       }