From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Sat, 22 Jun 2019 00:27:05 +0000 (-0700)
Subject: panfrost: Divide array_size by 6 for cubemaps
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eb3c09716b886365c201fb0178dd9512fed1f22d;p=mesa.git

panfrost: Divide array_size by 6 for cubemaps

Addresses the disparity between Mali and Gallium definitions of
array_size.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
---

diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c
index a54e27612fc..d19ce10a88c 100644
--- a/src/gallium/drivers/panfrost/pan_context.c
+++ b/src/gallium/drivers/panfrost/pan_context.c
@@ -2224,6 +2224,7 @@ panfrost_create_sampler_view(
         if (texture->target == PIPE_TEXTURE_CUBE) {
                 /* TODO: Cubemap arrays */
                 assert(array_size == 6);
+                array_size /= 6;
         }
 
         struct mali_texture_descriptor texture_descriptor = {