Mesa (main): zink: don't multiply cube array image layers

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 6a67315d8a60288e0cc7c8c92e8eb497e7250e8a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6a67315d8a60288e0cc7c8c92e8eb497e7250e8a

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri Mar 19 18:24:28 2021 -0400

zink: don't multiply cube array image layers

this whole thing seems broken, but this part in particular is super broken

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10824>

---

 src/gallium/drivers/zink/zink_resource.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c
index 8cb062bc5d6..377393e9166 100644
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -335,8 +335,7 @@ create_ici(struct zink_screen *screen, const struct pipe_resource *templ, unsign
    ici.samples = templ->nr_samples ? templ->nr_samples : VK_SAMPLE_COUNT_1_BIT;
    ici.tiling = bind & PIPE_BIND_LINEAR ? VK_IMAGE_TILING_LINEAR : VK_IMAGE_TILING_OPTIMAL;
 
-   if (templ->target == PIPE_TEXTURE_CUBE ||
-       templ->target == PIPE_TEXTURE_CUBE_ARRAY)
+   if (templ->target == PIPE_TEXTURE_CUBE)
       ici.arrayLayers *= 6;
 
    if (templ->usage == PIPE_USAGE_STAGING &&