From 1b39c5efcabb7c4676c57ddc01d37edcce0f2d03 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 19 May 2016 19:20:12 -0700 Subject: [PATCH] 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 Reviewed-by: Anuj Phogat Reviewed-by: Chris Forbes --- src/mesa/drivers/dri/i965/intel_copy_image.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mesa/drivers/dri/i965/intel_copy_image.c b/src/mesa/drivers/dri/i965/intel_copy_image.c index ccb82b64d5f..834c1a7b569 100644 --- a/src/mesa/drivers/dri/i965/intel_copy_image.c +++ b/src/mesa/drivers/dri/i965/intel_copy_image.c @@ -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; } -- 2.30.2