Mesa (master): st/mesa: fix readpixels regression with MESA_pack_invert

Nicolai Hähnle nh at kemper.freedesktop.org
Fri Jun 24 10:36:08 UTC 2016


Module: Mesa
Branch: master
Commit: b3de274b05c75565d14ec2d665a8bbfe55a7fb16
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b3de274b05c75565d14ec2d665a8bbfe55a7fb16

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Wed Jun 22 17:36:18 2016 +0200

st/mesa: fix readpixels regression with MESA_pack_invert

Fixes an error introduced in commit 3948cd37973696dc319170877382676809659465.

Reported-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/mesa/state_tracker/st_cb_readpixels.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c
index 77c6332..99d9cd5 100644
--- a/src/mesa/state_tracker/st_cb_readpixels.c
+++ b/src/mesa/state_tracker/st_cb_readpixels.c
@@ -520,7 +520,7 @@ 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);
-      const uint destStride = _mesa_image_row_stride(pack, width, format, type);
+      const int destStride = _mesa_image_row_stride(pack, width, format, type);
       char *dest = _mesa_image_address2d(pack, pixels,
                                          width, height, format,
                                          type, 0, 0);




More information about the mesa-commit mailing list