From e19b7f7f1b5d6a1d325c0129d6d6b9da6234330a Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 18 Jul 2016 22:00:30 -0700 Subject: i965/miptree: Set logical_depth0 == 6 for cube maps 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 Reviewed-by: Iago Toral Quiroga Reviewed-by: Chris Forbes Cc: "12.0 11.2 11.1" --- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'src/mesa/drivers') diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index 10158fe24f1..1e03f7ef26d 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -499,10 +499,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; @@ -1036,6 +1034,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; -- cgit v1.2.3