encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

X11: Provide specific X error when SDL_GL_CreateContext fails. 

This makes the X error handler used for GL context creation handle *all* errors
and provide the user with specific error messages when SDL_GL_CreateContext
fails.

CR: icculus@icculus.org
This commit is contained in:
J?rgen P. Tjern? 2014-06-03 21:13:00 -07:00
parent ece2a9bf06
commit c1e11f699e
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/video/x11/SDL_x11opengl.c
View File

@ -539,24 +539,30 @@ X11_GL_GetVisual(_THIS, Display * display, int screen)
#endif #endif
static int (*handler) (Display *, XErrorEvent *) = NULL; static int (*handler) (Display *, XErrorEvent *) = NULL;
static int errorBase = 0; static int errorBase = 0;
static int errorCode = 0;
static int static int
X11_GL_CreateContextErrorHandler(Display * d, XErrorEvent * e) X11_GL_CreateContextErrorHandler(Display * d, XErrorEvent * e)
{ {
switch (e->error_code) { char *x11_error = NULL;
case BadRequest: char x11_error_locale[256];
case BadMatch:
case BadValue: errorCode = e->error_code;
case BadAlloc: if (X11_XGetErrorText(d, errorCode, x11_error_locale, sizeof(x11_error_locale)) == Success)
return (0); {
default: x11_error = SDL_iconv_string("UTF-8", "", x11_error_locale, strlen(x11_error_locale));
if (errorBase &&
(e->error_code == errorBase + GLXBadContext ||
e->error_code == errorBase + GLXBadFBConfig ||
e->error_code == errorBase + GLXBadProfileARB)) {
return (0);
} }
return (handler(d, e));
if (x11_error)
{
SDL_SetError("Could not create GL context: %s", x11_error);
SDL_free(x11_error);
} }
else
{
SDL_SetError("Could not create GL context: %i (Base %i)\n", errorCode, errorBase);
}
return (0);
} }
SDL_GLContext SDL_GLContext
@ -581,6 +587,7 @@ X11_GL_CreateContext(_THIS, SDL_Window * window)
/* We do this to create a clean separation between X and GLX errors. */ /* We do this to create a clean separation between X and GLX errors. */
X11_XSync(display, False); X11_XSync(display, False);
errorBase = _this->gl_data->errorBase; errorBase = _this->gl_data->errorBase;
errorCode = Success;
handler = X11_XSetErrorHandler(X11_GL_CreateContextErrorHandler); handler = X11_XSetErrorHandler(X11_GL_CreateContextErrorHandler);
X11_XGetWindowAttributes(display, data->xwindow, &xattr); X11_XGetWindowAttributes(display, data->xwindow, &xattr);
v.screen = screen; v.screen = screen;
@ -675,7 +682,9 @@ X11_GL_CreateContext(_THIS, SDL_Window * window)
X11_XSetErrorHandler(handler); X11_XSetErrorHandler(handler);
if (!context) { if (!context) {
if (errorCode == Success) {
SDL_SetError("Could not create GL context"); SDL_SetError("Could not create GL context");
}
return NULL; return NULL;
} }