Revert "winex11.drv: Handle X error from vkGetRandROutputDisplayEXT()."

This reverts commit 6f9d2080. 6f9d2080 was committed to work around a Nvidia driver bug that can cause vkGetRandROutputDisplayEXT() to generate an X exception and crash applications. The bug is later fixed in Nvidia driver 450.56.11 and newer. Thus 6f9d2080 is no longer necessary on the newer Nvidia drivers. Then after 18ae96e5, another bug in the Nvidia driver can cause vkGetRandROutputDisplayEXT() to hang forever when XLockDisplay() is called before vkGetRandROutputDisplayEXT() and this bug is still not fixed and affects multiple applications. Reverting 6f9d2080 allows us to work around the vkGetRandROutputDisplayEXT() hang bug because then it no longer calls XLockDisplay() before vkGetRandROutputDisplayEXT(). Nvidia driver 455 was released on September 9th 2020 so hopefully the fix is already widespread. We could theoretically still keep 6f9d2080 on older Nvidia drivers by doing version checks. But it's more straightforward to remove the workaround since it's not a bug of Wine. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53428

Revert "winex11.drv: Handle X error from vkGetRandROutputDisplayEXT()."
d287548c · Zhiyi Zhang · Alexandre Julliard · c2a4f381 · d287548c
Commit d287548c authored Feb 28, 2024 by Zhiyi Zhang Committed by Alexandre Julliard Feb 28, 2024
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

xrandr.c dlls/winex11.drv/xrandr.c +1 -3

No files found.
--- a/dlls/winex11.drv/xrandr.c
+++ b/dlls/winex11.drv/xrandr.c
@@ -707,11 +707,9 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid
    {
        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 );
-            XSync( gdi_display, FALSE );
-            if (X11DRV_check_error() || vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE)
+            if (vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE)
                continue;

            memset( &id, 0, sizeof(id) );