Module: Mesa Branch: master Commit: 0f5726c5035249a6398f8db884d199bffed14a77 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0f5726c5035249a6398f8db884d199bffed14a77
Author: Mike Blumenkrantz <[email protected]> Date: Mon Dec 28 15:26:09 2020 -0500 zink: fix more instance detection stuff this was broken during the transition to generated code Fixes: fe669ff4a02 ("zink: replace old code with generated zink_instance") Reviewed-by: Hoe Hao Cheng <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8250> --- src/gallium/drivers/zink/zink_screen.c | 4 ++-- src/gallium/drivers/zink/zink_screen.h | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 3b14b086df8..b706ead2cc7 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -814,7 +814,7 @@ load_instance_extensions(struct zink_screen *screen) printf("zink: Loader %d.%d.%d \n", VK_VERSION_MAJOR(screen->loader_version), VK_VERSION_MINOR(screen->loader_version), VK_VERSION_PATCH(screen->loader_version)); } - if (screen->have_physical_device_prop2_ext) { + if (screen->instance_info.have_KHR_get_physical_device_properties2) { // Not Vk 1.1+ so if VK_KHR_get_physical_device_properties2 the use it GET_PROC_ADDR_INSTANCE_LOCAL(screen->instance, GetPhysicalDeviceFeatures2KHR); GET_PROC_ADDR_INSTANCE_LOCAL(screen->instance, GetPhysicalDeviceProperties2KHR); @@ -950,7 +950,7 @@ static bool zink_internal_setup_moltenvk(struct zink_screen *screen) { #if defined(MVK_VERSION) - if (!screen->have_MVK_moltenvk) + if (!screen->instance_info.have_MVK_moltenvk) return true; GET_PROC_ADDR_INSTANCE(GetMoltenVKConfigurationMVK); diff --git a/src/gallium/drivers/zink/zink_screen.h b/src/gallium/drivers/zink/zink_screen.h index 146d00073d9..2bf407b92da 100644 --- a/src/gallium/drivers/zink/zink_screen.h +++ b/src/gallium/drivers/zink/zink_screen.h @@ -72,14 +72,9 @@ struct zink_screen { uint32_t cur_custom_border_color_samplers; uint32_t loader_version; - bool have_physical_device_prop2_ext; bool needs_mesa_wsi; -#if defined(MVK_VERSION) - bool have_moltenvk; -#endif - PFN_vkGetPhysicalDeviceFeatures2 vk_GetPhysicalDeviceFeatures2; PFN_vkGetPhysicalDeviceProperties2 vk_GetPhysicalDeviceProperties2; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
