From ce00be0075e5ad7354a2ced476cf0f8752b85ca2 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Sun, 23 Aug 2015 21:43:25 +0200
Subject: [PATCH] Make global GetRealFunctions more unique (don't want to
 collide)

---
 renderdoc/driver/gl/gl_hooks_linux.cpp  | 4 ++--
 renderdoc/driver/gl/gl_hooks_win32.cpp  | 4 ++--
 renderdoc/driver/gl/gl_replay.cpp       | 2 +-
 renderdoc/driver/gl/gl_replay_linux.cpp | 4 ++--
 renderdoc/driver/gl/gl_replay_win32.cpp | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/renderdoc/driver/gl/gl_hooks_linux.cpp b/renderdoc/driver/gl/gl_hooks_linux.cpp
index 6837d66cb..b1ee1b947 100644
--- a/renderdoc/driver/gl/gl_hooks_linux.cpp
+++ b/renderdoc/driver/gl/gl_hooks_linux.cpp
@@ -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)
 {
diff --git a/renderdoc/driver/gl/gl_hooks_win32.cpp b/renderdoc/driver/gl/gl_hooks_win32.cpp
index 2da7dbcbb..7bd995da5 100644
--- a/renderdoc/driver/gl/gl_hooks_win32.cpp
+++ b/renderdoc/driver/gl/gl_hooks_win32.cpp
@@ -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)
 {
diff --git a/renderdoc/driver/gl/gl_replay.cpp b/renderdoc/driver/gl/gl_replay.cpp
index 2e2406969..adef9f88a 100644
--- a/renderdoc/driver/gl/gl_replay.cpp
+++ b/renderdoc/driver/gl/gl_replay.cpp
@@ -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);
diff --git a/renderdoc/driver/gl/gl_replay_linux.cpp b/renderdoc/driver/gl/gl_replay_linux.cpp
index 452333597..c39e19433 100644
--- a/renderdoc/driver/gl/gl_replay_linux.cpp
+++ b/renderdoc/driver/gl/gl_replay_linux.cpp
@@ -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.");
diff --git a/renderdoc/driver/gl/gl_replay_win32.cpp b/renderdoc/driver/gl/gl_replay_win32.cpp
index f04fc4eec..238fd00f8 100644
--- a/renderdoc/driver/gl/gl_replay_win32.cpp
+++ b/renderdoc/driver/gl/gl_replay_win32.cpp
@@ -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);