diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2021-10-28 10:31:40 -0400 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2021-11-03 20:15:48 +0000 |
| commit | ff163eeb640d260f611ff549e1c283876e67c86d (patch) | |
| tree | a9f1032d2ca82969ab763a053010b3a28a6f24aa | |
| parent | 9b5b2e2d80fb9ca6d4df20592013e28704f561b0 (diff) | |
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@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13586>
(cherry picked from commit aa5e544644431e9d4462b6f46208a3c028a1a13d)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_surface.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/.pick_status.json b/.pick_status.json index 3d630773b02..2e39216dcaf 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -607,7 +607,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; } |