GL hooks no longer need to be disabled - just don't hook nv VK driver

This commit is contained in:
baldurk
2016-02-07 18:44:52 +01:00
parent 6da044ae0a
commit 55914f99ae
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -262,7 +262,7 @@ class OpenGLHook : LibraryHook
public:
OpenGLHook()
{
//LibraryHooks::GetInstance().RegisterHook("libGL.so", this);
LibraryHooks::GetInstance().RegisterHook("libGL.so", this);
RDCEraseEl(GL);
+1 -2
View File
@@ -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;
+2 -1
View File
@@ -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