nvk: set device info before use in nvk_get_device_extensions
authorThomas H.P. Andersen <phomes@gmail.com>
Fri, 3 Mar 2023 23:07:16 +0000 (00:07 +0100)
committerMarge Bot <emma+marge@anholt.net>
Fri, 4 Aug 2023 21:32:04 +0000 (21:32 +0000)
nvk_get_device_extensions uses device->info to enable extensions
only for supported device architectures.

Only info is needed, but it seemed cleaner to keep all the three
changed lines together.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>

src/nouveau/vulkan/nvk_physical_device.c

index 785896f..a322dd1 100644 (file)
@@ -565,6 +565,10 @@ nvk_physical_device_try_create(struct nvk_instance *instance,
    vk_physical_device_dispatch_table_from_entrypoints(
       &dispatch_table, &wsi_physical_device_entrypoints, false);
 
+   device->instance = instance;
+   device->dev = ndev;
+   device->info = ndev->info;
+
    struct vk_device_extension_table supported_extensions;
    nvk_get_device_extensions(device, &supported_extensions);
 
@@ -575,10 +579,6 @@ nvk_physical_device_try_create(struct nvk_instance *instance,
    if (result != VK_SUCCESS)
       goto fail_alloc;
 
-   device->instance = instance;
-   device->dev = ndev;
-   device->info = ndev->info;
-
    device->mem_heaps[0].flags = VK_MEMORY_HEAP_DEVICE_LOCAL_BIT;
    device->mem_types[0].propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
    device->mem_types[0].heapIndex = 0;