KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i965: Respect miptree offsets in intel_readpixels_tiled_memcpy() 

Respect intel_miptree_slice::x_offset,y_offset and
intel_mipmap_tree::offset. All three may be non-zero when glReadPixels
is called on an EGLImage created from the non-base slice of a miptree.

Patch 2/2 that fixes test
'dEQP-EGL.functional.image.create.gles2_cubemap_*'.

Reported-by: Haixia Shi <hshi@chromium.org>
Diagnosed-by: Haixia Shi <hshi@chromium.org>
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Change-Id: I4b397b27e55a743a7094d29fb0a6a4b6b34352b0
This commit is contained in:
Chad Versace 2016-08-25 16:08:27 -07:00
parent c82f99e883
commit 5b03975889
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/mesa/drivers/dri/i965/intel_pixel_read.c
View File

@ -110,22 +110,6 @@ intel_readpixels_tiled_memcpy(struct gl_context * ctx,
if (ctx->_ImageTransferState)
return false;
/* This renderbuffer can come from a texture. In this case, we impose
* some of the same restrictions we have for textures and adjust for
* miplevels.
*/
if (rb->TexImage) {
if (rb->TexImage->TexObject->Target != GL_TEXTURE_2D &&
rb->TexImage->TexObject->Target != GL_TEXTURE_RECTANGLE)
return false;
int level = rb->TexImage->Level + rb->TexImage->TexObject->MinLevel;
/* Adjust x and y offset based on miplevel */
xoffset += irb->mt->level[level].level_x;
yoffset += irb->mt->level[level].level_y;
}
/* It is possible that the renderbuffer (or underlying texture) is
* multisampled. Since ReadPixels from a multisampled buffer requires a
* multisample resolve, we can't handle this here
@ -169,6 +153,9 @@ intel_readpixels_tiled_memcpy(struct gl_context * ctx,
return false;
}
xoffset += irb->mt->level[irb->mt_level].slice[irb->mt_layer].x_offset;
yoffset += irb->mt->level[irb->mt_level].slice[irb->mt_layer].y_offset;
dst_pitch = _mesa_image_row_stride(pack, width, format, type);
/* For a window-system renderbuffer, the buffer is actually flipped
@ -201,7 +188,7 @@ intel_readpixels_tiled_memcpy(struct gl_context * ctx,
xoffset * cpp, (xoffset + width) * cpp,
yoffset, yoffset + height,
pixels - (ptrdiff_t) yoffset * dst_pitch - (ptrdiff_t) xoffset * cpp,
bo->virtual,
bo->virtual + irb->mt->offset,
dst_pitch, irb->mt->pitch,
brw->has_swizzling,
irb->mt->tiling,