fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 20:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

device-select: block xserver+zink reordering via xcb

Browse source 
this is broken

Fixes: 991cc686a5f (egl: really fix kopper fd passing)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30816>
This commit is contained in:
Mike Blumenkrantz 2024-08-23 09:08:26 -04:00 • committed by Marge Bot
parent 23658920d1
commit 0e73926c20
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/vulkan/device-select-layer/device_select_layer.c
View file

@ -54,7 +54,7 @@ struct instance_info {
PFN_vkGetPhysicalDeviceProperties2 GetPhysicalDeviceProperties2;
bool has_pci_bus, has_vulkan11;
bool has_wayland, has_xcb;
bool zink, xwayland;
bool zink, xwayland, xserver;
};
static struct hash_table *device_select_instance_ht = NULL;
@ -144,6 +144,7 @@ static VkResult device_select_CreateInstance(const VkInstanceCreateInfo *pCreate
info->GetInstanceProcAddr = GetInstanceProcAddr;
info->zink = !strcmp(engineName, "mesa zink");
info->xwayland = !strcmp(applicationName, "Xwayland");
info->xserver = !strcmp(applicationName, "Xorg") || !strcmp(applicationName, "Xephyr");
for (unsigned i = 0; i < pCreateInfo->enabledExtensionCount; i++) {
#ifdef VK_USE_PLATFORM_WAYLAND_KHR
@ -152,7 +153,7 @@ static VkResult device_select_CreateInstance(const VkInstanceCreateInfo *pCreate
#endif
#ifdef VK_USE_PLATFORM_XCB_KHR
if (!strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_XCB_SURFACE_EXTENSION_NAME))
info->has_xcb = true;
info->has_xcb = !info->xserver || !info->zink;
#endif
}