From 55914f99ae654de20b2c93ce44c9b02d6743e004 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 29 Oct 2015 17:42:26 +0100
Subject: [PATCH] GL hooks no longer need to be disabled - just don't hook nv
 VK driver

---
 renderdoc/driver/gl/gl_hooks_linux.cpp | 2 +-
 renderdoc/driver/gl/gl_hooks_win32.cpp | 3 +--
 renderdoc/os/win32/win32_hook.cpp      | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/renderdoc/driver/gl/gl_hooks_linux.cpp b/renderdoc/driver/gl/gl_hooks_linux.cpp
index 14083eca8..b6f1dbbca 100644
--- a/renderdoc/driver/gl/gl_hooks_linux.cpp
+++ b/renderdoc/driver/gl/gl_hooks_linux.cpp
@@ -262,7 +262,7 @@ class OpenGLHook : LibraryHook
 	public:
 		OpenGLHook()
 		{
-			//LibraryHooks::GetInstance().RegisterHook("libGL.so", this);
+			LibraryHooks::GetInstance().RegisterHook("libGL.so", this);
 			
 			RDCEraseEl(GL);
 
diff --git a/renderdoc/driver/gl/gl_hooks_win32.cpp b/renderdoc/driver/gl/gl_hooks_win32.cpp
index 461c130e5..c30390548 100644
--- a/renderdoc/driver/gl/gl_hooks_win32.cpp
+++ b/renderdoc/driver/gl/gl_hooks_win32.cpp
@@ -206,8 +206,7 @@ class OpenGLHook : LibraryHook
 	public:
 		OpenGLHook()
 		{
-			// VKTODOHIGH temporary hack while GL hooks are crashing vulkan
-			//LibraryHooks::GetInstance().RegisterHook(DLL_NAME, this);
+			LibraryHooks::GetInstance().RegisterHook(DLL_NAME, this);
 
 			m_GLDriver = NULL;
 
diff --git a/renderdoc/os/win32/win32_hook.cpp b/renderdoc/os/win32/win32_hook.cpp
index e268ce61e..631903082 100644
--- a/renderdoc/os/win32/win32_hook.cpp
+++ b/renderdoc/os/win32/win32_hook.cpp
@@ -139,7 +139,8 @@ struct CachedHookData
 			!_stricmp(modName, "opengl32.dll") ||
 			!_stricmp(modName, "gdi32.dll") ||
 			 strstr(lowername, "msvcr") == lowername ||
-			 strstr(lowername, "msvcp") == lowername)
+			 strstr(lowername, "msvcp") == lowername ||
+			 strstr(lowername, "nv-vk") == lowername)
 				return;
 
 		// set module pointer if we are hooking exports from this module