From d673111bc8a7fcdec4644aef3647d50900ebe5a0 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Mon, 30 Jan 2023 20:11:49 -0600
Subject: [PATCH] Revert "nvk: Stop returning VK_ERROR_FORMAT_NOT_SUPPORTED for
 non-blitable"

This reverts commit 74ad75f2624c50f732db35946a127eb11edee3e5.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
---
 src/nouveau/vulkan/nvk_physical_device.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c
index adabeb038a5..e52a833a039 100644
--- a/src/nouveau/vulkan/nvk_physical_device.c
+++ b/src/nouveau/vulkan/nvk_physical_device.c
@@ -469,6 +469,9 @@ nvk_GetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice,
    if (format == NULL)
       return VK_ERROR_FORMAT_NOT_SUPPORTED;
 
+   if (!format->supports_2d_blit)
+      return VK_ERROR_FORMAT_NOT_SUPPORTED;
+
    if (base_info->type == VK_IMAGE_TYPE_1D)
       base_props->imageFormatProperties.maxExtent = (VkExtent3D){32768, 1, 1};
    else if (base_info->type == VK_IMAGE_TYPE_2D)