From 65cc30d7281b831fc5baede4b7757e9a5257b27e Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 1 Sep 2015 15:13:45 +1000 Subject: [PATCH] st/readpixels: fix accel path for skipimages. We don't need to use the 3d image address here as that will include SKIP_IMAGES, and we are only blitting a single 2D anyways, so just use the 2D path. This fixes some memory overruns under CTS packed_pixels.packed_pixels_pixelstore when PACK_SKIP_IMAGES is used. Cc: "11.0" Reviewed-by: Iago Toral Quiroga Signed-off-by: Dave Airlie (cherry picked from commit 6a3e1fb958778e00e8fe2d860b6327fc4409c148) --- src/mesa/state_tracker/st_cb_readpixels.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c index d95a608d32e..b5b9066fa57 100644 --- a/src/mesa/state_tracker/st_cb_readpixels.c +++ b/src/mesa/state_tracker/st_cb_readpixels.c @@ -210,9 +210,9 @@ st_readpixels(struct gl_context *ctx, GLint x, GLint y, GLuint row; for (row = 0; row < (unsigned) height; row++) { - GLvoid *dest = _mesa_image_address3d(pack, pixels, + GLvoid *dest = _mesa_image_address2d(pack, pixels, width, height, format, - type, 0, row, 0); + type, row, 0); memcpy(dest, map, bytesPerRow); map += tex_xfer->stride; }