i965: Account for MinLayer in CopyImageSubData's blitter/CPU paths.

Fixes Piglit's arb_copy_image-texview test with the Meta path disabled
(so we hit the blitter/CPU fallback paths).

v2: Add MinLayer even for cube maps (suggested by Ilia).

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
This commit is contained in:
Kenneth Graunke 2016-05-19 19:20:12 -07:00
parent 231dcb19f9
commit 1b39c5efca

View file

@ -250,6 +250,8 @@ intel_copy_image_sub_data(struct gl_context *ctx,
/* Cube maps actually have different images per face */
if (src_image->TexObject->Target == GL_TEXTURE_CUBE_MAP)
src_z = src_image->Face;
src_z += src_image->TexObject->MinLayer;
} else {
src_level = 0;
}
@ -260,6 +262,8 @@ intel_copy_image_sub_data(struct gl_context *ctx,
/* Cube maps actually have different images per face */
if (dst_image->TexObject->Target == GL_TEXTURE_CUBE_MAP)
dst_z = dst_image->Face;
dst_z += dst_image->TexObject->MinLayer;
} else {
dst_level = 0;
}