AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: fix more instance detection stuff

Browse Source 
this was broken during the transition to generated code

Fixes: fe669ff4a0 ("zink: replace old code with generated zink_instance")

Reviewed-by: Hoe Hao Cheng <haochengho12907@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8250>
This commit is contained in:
Mike Blumenkrantz
2020-12-28 15:26:09 -05:00
parent 122da9bd2d
commit 0f5726c503
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_screen.c
+2 -2
View File
@@ -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);
src/gallium/drivers/zink/zink_screen.h
-5
View File
@@ -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;