From 2a2076b0d20a8101311afbe8f4cd69c01593997b Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Mon, 30 Jan 2023 20:11:55 -0600
Subject: [PATCH] nvk: Don't advertise tiling on non-power-of-two formats

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

diff --git a/src/nouveau/vulkan/nvk_image.c b/src/nouveau/vulkan/nvk_image.c
index 1fdcb27b6a5..501128c1cd3 100644
--- a/src/nouveau/vulkan/nvk_image.c
+++ b/src/nouveau/vulkan/nvk_image.c
@@ -26,6 +26,10 @@ nvk_get_image_format_features(struct nvk_physical_device *pdevice,
    if (!nil_format_supports_texturing(pdevice->dev, p_format))
       return 0;
 
+   /* You can't tile a non-power-of-two */
+   if (!util_is_power_of_two_nonzero(util_format_get_blocksize(p_format)))
+      return 0;
+
    features |= VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT;
    features |= VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT;
    features |= VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT;