From f336a4f9b32ef9ad0561a4e50f21cd253819ac60 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 6 Jul 2022 19:51:03 -0500 Subject: [PATCH] anv: Init supported extensions before WSI Otherwise WSI extension support checks won't work. Reviewed-by: Jesse Natalie Part-of: --- src/intel/vulkan/anv_device.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 25dfeef8828..d31d707c8ad 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -962,16 +962,16 @@ anv_physical_device_try_create(struct anv_instance *instance, device->local_fd = fd; - result = anv_init_wsi(device); - if (result != VK_SUCCESS) - goto fail_engine_info; - anv_physical_device_init_perf(device, fd); - anv_measure_device_init(device); - 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); *device_out = device; @@ -1000,7 +1000,8 @@ anv_physical_device_try_create(struct anv_instance *instance, return VK_SUCCESS; -fail_engine_info: +fail_perf: + ralloc_free(device->perf); free(device->engine_info); anv_physical_device_free_disk_cache(device); fail_compiler: