lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-16 23:10:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for hook fetching/populating on capture and replay

Browse Source
This commit is contained in:
baldurk
2014-11-16 12:34:55 +00:00
parent c7462dc69d
commit 643447f521
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/hooks/gl_linux_hooks.cpp
+4 -6
View File
@@ -49,7 +49,7 @@ typedef Bool (*PFNGLXQUERYEXTENSIONPROC)(Display *dpy, int *errorBase, int *even
void *libGLdlsymHandle = RTLD_NEXT; // default to RTLD_NEXT, but overwritten if app calls dlopen() on real libGL
#define HookInit(function) \
GL.function = (CONCAT(function, _hooktype))dlsym(libGLdlsymHandle, STRINGIZE(function));
if(GL.function == NULL) GL.function = (CONCAT(function, _hooktype))dlsym(libGLdlsymHandle, STRINGIZE(function));
#define HookExtension(funcPtrType, function) \
if(!strcmp(func, STRINGIZE(function))) \
@@ -239,6 +239,8 @@ class OpenGLHook : LibraryHook
{
LibraryHooks::GetInstance().RegisterHook("libGL.so", this);
RDCEraseEl(GL);
// TODO: need to check against implementation to ensure we don't claim to support
// an extension that it doesn't!
@@ -261,8 +263,6 @@ class OpenGLHook : LibraryHook
bool CreateHooks(const char *libName)
{
RDCEraseEl(GL);
if(!m_EnabledHooks)
return false;
@@ -488,8 +488,6 @@ bool OpenGLHook::SetupHooks(GLHookSet &GL)
if(glXGetConfig_real == NULL) glXGetConfig_real = (PFNGLXGETCONFIGPROC)dlsym(libGLdlsymHandle, "glXGetConfig");
if(glXGetVisualFromFBConfig_real == NULL) glXGetVisualFromFBConfig_real = (PFNGLXGETVISUALFROMFBCONFIGPROC)dlsym(libGLdlsymHandle, "glXGetVisualFromFBConfig");
if(glXQueryExtension_real == NULL) glXQueryExtension_real = (PFNGLXQUERYEXTENSIONPROC)dlsym(libGLdlsymHandle, "glXQueryExtension");
DLLExportHooks();
return success;
}
@@ -571,7 +569,7 @@ bool OpenGLHook::PopulateHooks()
glXGetProcAddress_real((const GLubyte *)"glXCreateContextAttribsARB");
#undef HookInit
#define HookInit(function) if(GL.function == NULL) GL.function = (CONCAT(function, _hooktype))dlsym(libGLdlsymHandle, "glXGetProcAddress");
#define HookInit(function) if(GL.function == NULL) { GL.function = (CONCAT(function, _hooktype))dlsym(libGLdlsymHandle, STRINGIZE(function)); glXGetProcAddress((const GLubyte *)STRINGIZE(function)); }
// cheeky
#undef HookExtension