AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 14:10:30 +00:00
Code Issues Projects Releases Wiki Activity

glx: Ignore all errors

Browse Source 
In error cases, glXCreateContextAttribsARB() will always return NULL so
it is enough to run the loop until the first non-NULL context is
returned.

And at that point, we can just look at the return value and ignore all
errors.
This commit is contained in:
Benjamin Otte 2023-06-05 19:12:29 +02:00
parent fd5d15004e
commit 1e60ad1430
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gdk/x11/gdkglcontext-glx.c
View File

@ -543,14 +543,14 @@ gdk_x11_context_create_glx_context (GdkGLContext *context,
if (share != NULL) if (share != NULL)
share_glx = GDK_X11_GL_CONTEXT_GLX (share); share_glx = GDK_X11_GL_CONTEXT_GLX (share);
gdk_x11_display_error_trap_push (display);
supported_versions = gdk_gl_versions_get_for_api (api); supported_versions = gdk_gl_versions_get_for_api (api);
for (j = 0; gdk_gl_version_greater_equal (&supported_versions[j], &version); j++) for (j = 0; gdk_gl_version_greater_equal (&supported_versions[j], &version); j++)
{ {
context_attribs [major_idx] = gdk_gl_version_get_major (&supported_versions[j]); context_attribs [major_idx] = gdk_gl_version_get_major (&supported_versions[j]);
context_attribs [minor_idx] = gdk_gl_version_get_minor (&supported_versions[j]); context_attribs [minor_idx] = gdk_gl_version_get_minor (&supported_versions[j]);
gdk_x11_display_error_trap_push (display);
/* If we don't have access to GLX_ARB_create_context_profile, then /* If we don't have access to GLX_ARB_create_context_profile, then
* we have to fall back to the old GLX 1.3 API. * we have to fall back to the old GLX 1.3 API.
*/ */
@ -568,19 +568,18 @@ gdk_x11_context_create_glx_context (GdkGLContext *context,
True, True,
context_attribs); context_attribs);
if (ctx == NULL) if (ctx != NULL)
{
gdk_x11_display_error_trap_pop_ignored (display);
}
else if (gdk_x11_display_error_trap_pop (display))
{
glXDestroyContext (dpy, ctx);
ctx = NULL;
}
else
break; break;
} }
gdk_x11_display_error_trap_pop_ignored (display);
if (ctx == NULL)
{
GDK_DISPLAY_DEBUG (display, OPENGL, "Failed to create a GLX context");
return 0;
}
GDK_DISPLAY_DEBUG (display, OPENGL, GDK_DISPLAY_DEBUG (display, OPENGL,
"Realized GLX context[%p], %s, version: %d.%d", "Realized GLX context[%p], %s, version: %d.%d",
context_glx->glx_context, context_glx->glx_context,