fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 04:20:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

meta/GetTexSubImage: Account for GL_PACK_SKIP_IMAGES on compressed textures

Browse source 
This option was being ignored when packing compressed 3D and cube textures.

Fixes CTS test (on gen8+):
* GL45-CTS.gtf32.GL3Tests.packed_pixels.packed_pixels_pixelstore

v2: Drop API checks.
v3 (Ken): Just apply the existing code in more cases.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eduardo Lima Mitev 2016-11-14 15:25:14 -08:00
parent 277f868e66
commit e73513f3c8
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/mesa/drivers/common/meta.c
View file

@ -3243,8 +3243,20 @@ _mesa_meta_GetTexSubImage(struct gl_context *ctx,
for (slice = 0; slice < depth; slice++) {
void *dst;
if (texImage->TexObject->Target == GL_TEXTURE_2D_ARRAY
|| texImage->TexObject->Target == GL_TEXTURE_CUBE_MAP_ARRAY) {
/* Section 8.11.4 (Texture Image Queries) of the GL 4.5 spec says:
*
* "For three-dimensional, two-dimensional array, cube map array,
* and cube map textures pixel storage operations are applied as
* if the image were two-dimensional, except that the additional
* pixel storage state values PACK_IMAGE_HEIGHT and
* PACK_SKIP_IMAGES are applied. The correspondence of texels to
* memory locations is as defined for TexImage3D in section 8.5."
*/
switch (texImage->TexObject->Target) {
case GL_TEXTURE_3D:
case GL_TEXTURE_2D_ARRAY:
case GL_TEXTURE_CUBE_MAP:
case GL_TEXTURE_CUBE_MAP_ARRAY: {
/* Setup pixel packing. SkipPixels and SkipRows will be applied
* in the decompress_texture_image() function's call to
* glReadPixels but we need to compute the dest slice's address
@ -3255,9 +3267,11 @@ _mesa_meta_GetTexSubImage(struct gl_context *ctx,
packing.SkipRows = 0;
dst = _mesa_image_address3d(&packing, pixels, width, height,
format, type, slice, 0, 0);
break;
}
else {
default:
dst = pixels;
break;
}
result = decompress_texture_image(ctx, texImage, slice,
xoffset, yoffset, width, height,