Mesa (main): radv: change queue family order in radv_get_physical_device_queue_family_properties

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: aff59c63eb3ab2ad1247a41f8750c4b56177dd18
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=aff59c63eb3ab2ad1247a41f8750c4b56177dd18

Author: Lynne <d...@lynne.ee>
Date:   Thu Nov 30 16:41:53 2023 +0100

radv: change queue family order in 
radv_get_physical_device_queue_family_properties

Fixes: 748b7f80ef1 ("radv: Move sparse binding into a dedicated queue.")
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26428>

---

 src/amd/vulkan/radv_physical_device.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/amd/vulkan/radv_physical_device.c 
b/src/amd/vulkan/radv_physical_device.c
index 14f26b8f2e9..9920c4a2eed 100644
--- a/src/amd/vulkan/radv_physical_device.c
+++ b/src/amd/vulkan/radv_physical_device.c
@@ -2110,16 +2110,6 @@ radv_get_physical_device_queue_family_properties(struct 
radv_physical_device *pd
       }
    }
 
-   if (*pCount > idx) {
-      *pQueueFamilyProperties[idx] = (VkQueueFamilyProperties){
-         .queueFlags = VK_QUEUE_SPARSE_BINDING_BIT,
-         .queueCount = 1,
-         .timestampValidBits = 64,
-         .minImageTransferGranularity = (VkExtent3D){1, 1, 1},
-      };
-      idx++;
-   }
-
    if (pdevice->instance->perftest_flags & RADV_PERFTEST_VIDEO_DECODE) {
       if (pdevice->rad_info.ip[pdevice->vid_decode_ip].num_queues > 0) {
          if (*pCount > idx) {
@@ -2134,6 +2124,16 @@ radv_get_physical_device_queue_family_properties(struct 
radv_physical_device *pd
       }
    }
 
+   if (*pCount > idx) {
+      *pQueueFamilyProperties[idx] = (VkQueueFamilyProperties){
+         .queueFlags = VK_QUEUE_SPARSE_BINDING_BIT,
+         .queueCount = 1,
+         .timestampValidBits = 64,
+         .minImageTransferGranularity = (VkExtent3D){1, 1, 1},
+      };
+      idx++;
+   }
+
    *pCount = idx;
 }