lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-08 16:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't try and fetch fbconfig for NULL context in glXMakeCurrent

Browse Source
This commit is contained in:
baldurk
2018-07-12 15:30:16 +01:00
parent 64006a856c
commit b0378e9858
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/glx_hooks.cpp
+15 -9
View File
@@ -300,19 +300,25 @@ HOOK_EXPORT Bool glXMakeCurrent(Display *dpy, GLXDrawable drawable, GLXContext c
data.dpy = dpy;
data.wnd = drawable;
data.ctx = ctx;
data.cfg = NULL;
int fbconfigid = -1;
GLX.glXQueryContext(dpy, ctx, GLX_FBCONFIG_ID, &fbconfigid);
GLXFBConfig *config = NULL;
int attribs[] = {GLX_FBCONFIG_ID, fbconfigid, 0};
if(ctx)
{
int fbconfigid = -1;
GLX.glXQueryContext(dpy, ctx, GLX_FBCONFIG_ID, &fbconfigid);
int numElems = 0;
GLXFBConfig *config = GLX.glXChooseFBConfig(dpy, DefaultScreen(dpy), attribs, &numElems);
int attribs[] = {GLX_FBCONFIG_ID, fbconfigid, 0};
if(config)
data.cfg = GLX.glXGetVisualFromFBConfig(dpy, *config);
else
data.cfg = NULL;
int numElems = 0;
config = GLX.glXChooseFBConfig(dpy, DefaultScreen(dpy), attribs, &numElems);
if(config)
data.cfg = GLX.glXGetVisualFromFBConfig(dpy, *config);
else
data.cfg = NULL;
}
glxhook.driver.ActivateContext(data);