niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

winex11.drv: Handle X errors from glXCopyContext().

Browse source 
glxCopyContext() may throw X errors and cause the current process to exit. For example, Mesa doesn't
support glxCopyContext() for direct rendering contexts and ends up using the code path for indirect
rendering contexts. When Xorg receives such requests, it rejects them because they're for direct
rendering contexts and reports an X error. We also can't use indirect rendering context because
it needs to be explicitly enabled in xorg.conf and has poor performance. So handle this error before
graphics drivers implement the support.

Fix Cladun X2 crash at start.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
This commit is contained in:
Zhiyi Zhang 2022-04-22 17:21:15 +08:00 • committed by Alexandre Julliard
parent e386cc8f87
commit ed546bf190
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dlls/winex11.drv/opengl.c
View file

@ -1711,9 +1711,21 @@ static BOOL WINAPI glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_con
{
TRACE("%p -> %p mask %#x\n", src, dst, mask);
pglXCopyContext(gdi_display, src->ctx, dst->ctx, mask);
X11DRV_expect_error( gdi_display, GLXErrorHandler, NULL );
pglXCopyContext( gdi_display, src->ctx, dst->ctx, mask );
XSync( gdi_display, False );
if (X11DRV_check_error())
{
static unsigned int once;
if (!once++)
{
ERR("glXCopyContext failed. glXCopyContext() for direct rendering contexts not "
"implemented in the host graphics driver?\n");
}
return FALSE;
}
/* As opposed to wglCopyContext, glXCopyContext doesn't return anything, so hopefully we passed */
return TRUE;
}