From 93dbd14ed77a034a8c08521077d753fc47738c58 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Fri, 21 Oct 2022 12:25:18 +0300 Subject: [PATCH] anv: init major/minor before WSI So that we can provide that information to WSI if it asks for it immediately. Signed-off-by: Lionel Landwerlin Cc: mesa-stable Reviewed-by: Jason Ekstrand Part-of: --- src/intel/vulkan/anv_device.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 112fb89f20f..b4f98667a64 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -985,16 +985,7 @@ anv_physical_device_try_create(struct vk_instance *vk_instance, get_device_extensions(device, &device->vk.supported_extensions); - result = anv_init_wsi(device); - if (result != VK_SUCCESS) - goto fail_perf; - - anv_measure_device_init(device); - - anv_genX(&device->info, init_physical_device_state)(device); - - *out = &device->vk; - + /* Gather major/minor before WSI. */ struct stat st; if (stat(primary_path, &st) == 0) { @@ -1017,6 +1008,16 @@ anv_physical_device_try_create(struct vk_instance *vk_instance, device->local_minor = 0; } + result = anv_init_wsi(device); + if (result != VK_SUCCESS) + goto fail_perf; + + anv_measure_device_init(device); + + anv_genX(&device->info, init_physical_device_state)(device); + + *out = &device->vk; + return VK_SUCCESS; fail_perf: