fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-11 21:00:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

i965/miptree: Set logical_depth0 == 6 for cube maps

Browse source 
This matches what we do for cube maps where logical_depth0 is in number of
face-layers rather than number of cubes.  This does mean that we will
temporarily be setting the surface bounds too loose for cube map textures
but we are already setting them too loose for cube arrays and we will be
fixing that in the next commit anyway.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
Cc: "12.0 11.2 11.1" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit e19b7f7f1b)
This commit is contained in:
Jason Ekstrand 2016-07-18 22:00:30 -07:00 • committed by Emil Velikov
parent 57c1d0ea07
commit 48e9ecc47f
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/mesa/drivers/dri/i965/intel_mipmap_tree.c
View file

@ -501,10 +501,8 @@ intel_miptree_create_layout(struct brw_context *brw,
}
}
if (target == GL_TEXTURE_CUBE_MAP) {
assert(depth0 == 1);
depth0 = 6;
}
if (target == GL_TEXTURE_CUBE_MAP)
assert(depth0 == 6);
mt->physical_width0 = width0;
mt->physical_height0 = height0;
@ -1038,6 +1036,15 @@ intel_get_image_dims(struct gl_texture_image *image,
*height = 1;
*depth = image->Height;
break;
case GL_TEXTURE_CUBE_MAP:
/* For Cube maps, the mesa/main api layer gives us a depth of 1 even
* though we really have 6 slices.
*/
assert(image->Depth == 1);
*width = image->Width;
*height = image->Height;
*depth = 6;
break;
default:
*width = image->Width;
*height = image->Height;