marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GLX: Use gdk instead of XLib to make glXCreateContextAttribsARB not exit

liquid_container
Günther Brammer 2016-02-12 20:39:39 +01:00
parent 0c0c64642a
commit 92217e51e0
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/graphics/C4DrawGLCtx.cpp
View File

@ -456,11 +456,6 @@ void CStdGLCtx::Clear(bool multisample_change)
}
}
static int GLXErrorHandler(Display * dpy, XErrorEvent * ev)
{
return 0;
}
bool CStdGLCtx::Init(C4Window * pWindow, C4AbstractApp *)
{
// safety
@ -497,10 +492,9 @@ bool CStdGLCtx::Init(C4Window * pWindow, C4AbstractApp *)
if (glXCreateContextAttribsARB)
{
int (*oldErrorHandler) (Display *, XErrorEvent *) = XSetErrorHandler(GLXErrorHandler);
gdk_x11_display_error_trap_push(gdk_display_get_default());
ctx = glXCreateContextAttribsARB(dpy, pWindow->Info, share_context, True, attribs);
XSync(dpy, False);
XSetErrorHandler(oldErrorHandler);
gdk_x11_display_error_trap_pop_ignored(gdk_display_get_default());
}
if(!ctx) {
Log(" gl: falling back to attribute-less context creation.");