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

Make global GetRealFunctions more unique (don't want to collide)

Browse Source
This commit is contained in:
baldurk
2015-08-23 21:43:25 +02:00
parent 62f7362e92
commit ce00be0075
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_hooks_linux.cpp
+2 -2
View File
@@ -306,7 +306,7 @@ class OpenGLHook : LibraryHook
static OpenGLHook glhooks;
const GLHookSet &GetRealFunctions()
const GLHookSet &GetRealGLFunctions()
{
if(!m_PopulatedHooks)
m_PopulatedHooks = PopulateHooks();
@@ -854,7 +854,7 @@ bool OpenGLHook::PopulateHooks()
OpenGLHook OpenGLHook::glhooks;
const GLHookSet &GetRealFunctions() { return OpenGLHook::glhooks.GetRealFunctions(); }
const GLHookSet &GetRealGLFunctions() { return OpenGLHook::glhooks.GetRealGLFunctions(); }
void MakeContextCurrent(GLWindowingData data)
{
renderdoc/driver/gl/gl_hooks_win32.cpp
+2 -2
View File
@@ -253,7 +253,7 @@ class OpenGLHook : LibraryHook
static OpenGLHook glhooks;
const GLHookSet &GetRealFunctions()
const GLHookSet &GetRealGLFunctions()
{
if(!m_PopulatedHooks)
m_PopulatedHooks = PopulateHooks();
@@ -856,7 +856,7 @@ class OpenGLHook : LibraryHook
OpenGLHook OpenGLHook::glhooks;
const GLHookSet &GetRealFunctions() { return OpenGLHook::glhooks.GetRealFunctions(); }
const GLHookSet &GetRealGLFunctions() { return OpenGLHook::glhooks.GetRealGLFunctions(); }
void MakeContextCurrent(GLWindowingData data)
{
renderdoc/driver/gl/gl_replay.cpp
+1 -1
View File
@@ -2860,7 +2860,7 @@ ShaderDebugTrace GLReplay::DebugThread(uint32_t frameID, uint32_t eventID, uint3
return ShaderDebugTrace();
}
const GLHookSet &GetRealFunctions();
const GLHookSet &GetRealGLFunctions();
// defined in gl_replay_<platform>.cpp
ReplayCreateStatus GL_CreateReplayDevice(const char *logfile, IReplayDriver **driver);
renderdoc/driver/gl/gl_replay_linux.cpp
+2 -2
View File
@@ -198,7 +198,7 @@ bool GLReplay::IsOutputWindowVisible(uint64_t id)
return true;
}
const GLHookSet &GetRealFunctions();
const GLHookSet &GetRealGLFunctions();
ReplayCreateStatus GL_CreateReplayDevice(const char *logfile, IReplayDriver **driver)
{
@@ -355,7 +355,7 @@ ReplayCreateStatus GL_CreateReplayDevice(const char *logfile, IReplayDriver **dr
}
}
WrappedOpenGL *gl = new WrappedOpenGL(logfile, GetRealFunctions());
WrappedOpenGL *gl = new WrappedOpenGL(logfile, GetRealGLFunctions());
gl->Initialise(initParams);
RDCLOG("Created device.");
renderdoc/driver/gl/gl_replay_win32.cpp
+2 -2
View File
@@ -230,7 +230,7 @@ bool GLReplay::IsOutputWindowVisible(uint64_t id)
return (IsWindowVisible(m_OutputWindows[id].wnd) == TRUE);
}
const GLHookSet &GetRealFunctions();
const GLHookSet &GetRealGLFunctions();
ReplayCreateStatus GL_CreateReplayDevice(const char *logfile, IReplayDriver **driver)
{
@@ -462,7 +462,7 @@ ReplayCreateStatus GL_CreateReplayDevice(const char *logfile, IReplayDriver **dr
}
}
const GLHookSet &real = GetRealFunctions();
const GLHookSet &real = GetRealGLFunctions();
PFNGLGETSTRINGPROC *ptrs = (PFNGLGETSTRINGPROC *)&real;
size_t num = sizeof(real)/sizeof(PFNGLGETSTRINGPROC);