From d47ca67cde37e5d4a7b11fc62a976c9dcf3f9990 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Mon, 30 Jan 2023 20:12:03 -0600
Subject: [PATCH] nvk: Advertise MSAA via image format properties

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

diff --git a/src/nouveau/vulkan/nvk_image.c b/src/nouveau/vulkan/nvk_image.c
index b5354c24384..dfb073be6aa 100644
--- a/src/nouveau/vulkan/nvk_image.c
+++ b/src/nouveau/vulkan/nvk_image.c
@@ -132,7 +132,10 @@ nvk_GetPhysicalDeviceImageFormatProperties2(
       maxExtent = (VkExtent3D) { 16384, 16384, 1 };
       maxMipLevels = 15;
       maxArraySize = 2048;
-      sampleCounts = VK_SAMPLE_COUNT_1_BIT; /* TODO: MSAA */
+      sampleCounts = VK_SAMPLE_COUNT_1_BIT |
+                     VK_SAMPLE_COUNT_2_BIT |
+                     VK_SAMPLE_COUNT_4_BIT |
+                     VK_SAMPLE_COUNT_8_BIT;
       break;
    case VK_IMAGE_TYPE_3D:
       maxExtent = (VkExtent3D) { 2048, 2048, 2048 };