On Tue, 2016-07-19 at 08:26 -0700, Jason Ekstrand wrote:
> 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 <ja...@jlekstrand.net>
> Cc: "12.0 11.2 11.1" <mesa-sta...@lists.freedesktop.org>
> ---
> src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> index 10158fe..1179c8a 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,14 @@ 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.
> + */
Maybe assert that image->Depth == 1 as you did in the previous patch
for 1d arrays?
> + *width = image->Width;
> + *height = image->Height;
> + *depth = 6;
> + break;
> default:
> *width = image->Width;
> *height = image->Height;
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
