We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] modifies SDL_x11opengl.c:X11_GL_CreateContext to filter out any X11 errors before they would cause aborts

glx_error.diff (text/plain), 3.53 KB, created by Lee Salzman on 2013-03-10 08:47:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lee Salzman

Created: 2013-03-10 08:47:49 UTC

Size: 3.53 KB

patch

obsolete

>diff -r 11a03a79dfe8 src/video/x11/SDL_x11opengl.c
>--- a/src/video/x11/SDL_x11opengl.c	Wed Mar 06 11:59:21 2013 -0800
>+++ b/src/video/x11/SDL_x11opengl.c	Sun Mar 10 14:24:35 2013 -0700
>@@ -491,16 +491,43 @@ X11_GL_GetVisual(_THIS, Display * displa
> 
>     vinfo = _this->gl_data->glXChooseVisual(display, screen, attribs);
>     if (!vinfo) {
>         SDL_SetError("Couldn't find matching GLX visual");
>     }
>     return vinfo;
> }
> 
>+#ifndef GLXBadContext
>+#define GLXBadContext 0
>+#endif
>+#ifndef GLXBadFBConfig
>+#define GLXBadFBConfig 9
>+#endif
>+#ifndef GLXBadProfileARB
>+#define GLXBadProfileARB 13
>+#endif
>+static int (*handler) (Display *, XErrorEvent *) = NULL;
>+static int
>+X11_GL_CreateContextErrorHandler(Display * d, XErrorEvent * e)
>+{
>+    switch (e->error_code) {
>+    case GLXBadContext:
>+    case GLXBadFBConfig:
>+    case GLXBadProfileARB:
>+    case BadRequest:
>+    case BadMatch:
>+    case BadValue:
>+    case BadAlloc:
>+        return (0);
>+    default:
>+        return (handler(d, e));
>+    }
>+}
>+
> SDL_GLContext
> X11_GL_CreateContext(_THIS, SDL_Window * window)
> {
>     SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
>     Display *display = data->videodata->display;
>     int screen =
>         ((SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata)->screen;
>     XWindowAttributes xattr;
>@@ -511,36 +538,34 @@ X11_GL_CreateContext(_THIS, SDL_Window *
>     if (_this->gl_config.share_with_current_context) {
>         share_context = (GLXContext)(_this->current_glctx);
>     } else {
>         share_context = NULL;
>     }
> 
>     /* We do this to create a clean separation between X and GLX errors. */
>     XSync(display, False);
>+    handler = XSetErrorHandler(X11_GL_CreateContextErrorHandler);
>     XGetWindowAttributes(display, data->xwindow, &xattr);
>     v.screen = screen;
>     v.visualid = XVisualIDFromVisual(xattr.visual);
>     vinfo = XGetVisualInfo(display, VisualScreenMask | VisualIDMask, &v, &n);
>     if (vinfo) {
>         if (_this->gl_config.major_version < 3 &&
>             _this->gl_config.profile_mask == 0 &&
>             _this->gl_config.flags == 0) {
>             /* Create legacy context */
>             context =
>                 _this->gl_data->glXCreateContext(display, vinfo, share_context, True);
>         } else {
>             /* If we want a GL 3.0 context or later we need to get a temporary
>                context to grab the new context creation function */
>             GLXContext temp_context =
>                 _this->gl_data->glXCreateContext(display, vinfo, NULL, True);
>-            if (!temp_context) {
>-                SDL_SetError("Could not create GL context");
>-                return NULL;
>-            } else {
>+            if (temp_context) {
>                 /* max 8 attributes plus terminator */
>                 int attribs[9] = {
>                     GLX_CONTEXT_MAJOR_VERSION_ARB,
>                     _this->gl_config.major_version,
>                     GLX_CONTEXT_MINOR_VERSION_ARB,
>                     _this->gl_config.minor_version,
>                     0
>                 };
>@@ -604,17 +629,18 @@ X11_GL_CreateContext(_THIS, SDL_Window *
>                                                           temp_context);
>                     }
>                 }
>             }
>         }
>         XFree(vinfo);
>     }
>     XSync(display, False);
>-
>+    XSetErrorHandler(handler);
>+    
>     if (!context) {
>         SDL_SetError("Could not create GL context");
>         return NULL;
>     }
> 
>     if (X11_GL_MakeCurrent(_this, window, context) < 0) {
>         X11_GL_DeleteContext(_this, context);
>         return NULL;

Actions: View | Diff

Attachments on bug 1749: 1065

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.