forked from Mirrors/wine-wine
winex11.drv: Handle X error from vkGetRandROutputDisplayEXT().
Nvidia implementation of vkGetRandROutputDisplayEXT() generates X exception when rrOutput is from different provider (or if rrOutput is just invalid). That can happen on certain multiple GPU configurations, on which Wine is currently unable to initialize display driver and thus create any window. According to Vulkan spec, vkGetRandROutputDisplayEXT is supposed to just return VK_NULL_HANDLE if there is no corresponding VkDisplayKHR. But it is probably better to workaround the problem to avoid long standing regression. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49407 Signed-off-by: Paul Gofman <pgofman@codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook@nvidia.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>feature/deterministic
parent
500a813579
commit
6f9d20806e
|
@ -756,9 +756,11 @@ static void get_vulkan_device_uuid( GUID *uuid, const XRRProviderInfo *provider_
|
|||
{
|
||||
for (output_idx = 0; output_idx < provider_info->noutputs; ++output_idx)
|
||||
{
|
||||
X11DRV_expect_error( gdi_display, XRandRErrorHandler, NULL );
|
||||
vr = pvkGetRandROutputDisplayEXT( vk_physical_devices[device_idx], gdi_display,
|
||||
provider_info->outputs[output_idx], &vk_display );
|
||||
if (vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE)
|
||||
XSync( gdi_display, FALSE );
|
||||
if (X11DRV_check_error() || vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE)
|
||||
continue;
|
||||
|
||||
memset( &id, 0, sizeof(id) );
|
||||
|
|
Loading…
Reference in New Issue