diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2016-05-19 19:20:12 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2016-05-25 14:17:29 -0700 |
| commit | 1b39c5efcabb7c4676c57ddc01d37edcce0f2d03 (patch) | |
| tree | a2217a04b3a479622a2479c49f9f22e88720b3d4 | |
| parent | 231dcb19f928858ca4143e8b91e4bdc4f220ac87 (diff) | |
| download | external_mesa3d-1b39c5efcabb7c4676c57ddc01d37edcce0f2d03.zip external_mesa3d-1b39c5efcabb7c4676c57ddc01d37edcce0f2d03.tar.gz external_mesa3d-1b39c5efcabb7c4676c57ddc01d37edcce0f2d03.tar.bz2 | |
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>
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_copy_image.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_copy_image.c b/src/mesa/drivers/dri/i965/intel_copy_image.c index ccb82b6..834c1a7 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; } |