diff options
| -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; } |