From 359bb89302cdbe0dd493b6eadb2781f5ac2c5421 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Thu, 21 Mar 2024 13:59:32 -0500
Subject: [PATCH] nvk: Move the mutableDescriptorType enable

The EXT extension overrides the VALVE one so put it in the EXT section.

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

diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c
index a49dc82e762..4fff38064ee 100644
--- a/src/nouveau/vulkan/nvk_physical_device.c
+++ b/src/nouveau/vulkan/nvk_physical_device.c
@@ -526,6 +526,9 @@ nvk_get_device_features(const struct nv_device_info *info,
       /* VK_EXT_multi_draw */
       .multiDraw = true,
 
+      /* VK_EXT_mutable_descriptor_type */
+      .mutableDescriptorType = true,
+
       /* VK_EXT_non_seamless_cube_map */
       .nonSeamlessCubeMap = true,
 
@@ -577,9 +580,6 @@ nvk_get_device_features(const struct nv_device_info *info,
 
       /* VK_NV_shader_sm_builtins */
       .shaderSMBuiltins = true,
-
-      /* VK_VALVE_mutable_descriptor_type */
-      .mutableDescriptorType = true,
    };
 }