diff options
| -rw-r--r-- | src/mesa/state_tracker/st_cb_readpixels.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c index 42d147fb7d..4c2f2ce768 100644 --- a/src/mesa/state_tracker/st_cb_readpixels.c +++ b/src/mesa/state_tracker/st_cb_readpixels.c @@ -522,14 +522,21 @@ st_ReadPixels(struct gl_context *ctx, GLint x, GLint y, /* memcpy data into a user buffer */ { const uint bytesPerRow = width * util_format_get_blocksize(dst_format); - GLuint row; - - for (row = 0; row < (unsigned) height; row++) { - void *dest = _mesa_image_address2d(pack, pixels, - width, height, format, - type, row, 0); - memcpy(dest, map, bytesPerRow); - map += tex_xfer->stride; + const uint destStride = _mesa_image_row_stride(pack, width, format, type); + char *dest = _mesa_image_address2d(pack, pixels, + width, height, format, + type, 0, 0); + + if (tex_xfer->stride == bytesPerRow && destStride == bytesPerRow) { + memcpy(dest, map, bytesPerRow * height); + } else { + GLuint row; + + for (row = 0; row < (unsigned) height; row++) { + memcpy(dest, map, bytesPerRow); + map += tex_xfer->stride; + dest += destStride; + } } } |