Mesa (staging/21.3): zink: don't clamp 2D_ARRAY surfaces to 2D

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: cfba222afce07ccc4ebccaf6073ca19614a179aa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cfba222afce07ccc4ebccaf6073ca19614a179aa

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Thu Oct 28 10:31:40 2021 -0400

zink: don't clamp 2D_ARRAY surfaces to 2D

another thing that used to be needed but now isn't

cc: mesa-stable

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13586>
(cherry picked from commit aa5e544644431e9d4462b6f46208a3c028a1a13d)

---

 .pick_status.json                       | 2 +-
 src/gallium/drivers/zink/zink_surface.h | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index d80f3f008ae..1834d1caa29 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -85,7 +85,7 @@
         "description": "zink: don't clamp 2D_ARRAY surfaces to 2D",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/zink_surface.h b/src/gallium/drivers/zink/zink_surface.h
index cb08869c2b4..0c78008f7e6 100644
--- a/src/gallium/drivers/zink/zink_surface.h
+++ b/src/gallium/drivers/zink/zink_surface.h
@@ -125,9 +125,6 @@ zink_surface_clamp_viewtype(VkImageViewType viewType, unsigned first_layer, unsi
          return VK_IMAGE_VIEW_TYPE_2D;
       if (layerCount % 6 != 0 && (first_layer || layerCount != array_size))
          return VK_IMAGE_VIEW_TYPE_2D_ARRAY;
-   } else if (viewType == VK_IMAGE_VIEW_TYPE_2D_ARRAY) {
-      if (first_layer == last_layer)
-         return VK_IMAGE_VIEW_TYPE_2D;
    }
    return viewType;
 }