Skip to content
Snippets Groups Projects
Commit 6a3e1fb9 authored by Dave Airlie's avatar Dave Airlie
Browse files

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" <mesa-stable@lists.freedesktop.org>
Reviewed-by: default avatarIago Toral Quiroga <itoral@igalia.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent c3c24207
No related branches found
No related tags found
No related merge requests found
......@@ -238,9 +238,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;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment