From 9ecad149325a59f62017f2075569387b9daa1e98 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 26 Jun 2018 12:19:21 +0100 Subject: [PATCH] Provide default implementation for LibraryHook::OptionsUpdated --- renderdoc/driver/d3d11/d3d11_hooks.cpp | 1 - renderdoc/driver/d3d12/d3d12_hooks.cpp | 1 - renderdoc/driver/d3d8/d3d8_hooks.cpp | 1 - renderdoc/driver/d3d9/d3d9_hooks.cpp | 1 - renderdoc/driver/dxgi/dxgi_hooks.cpp | 1 - renderdoc/driver/gl/gl_hooks_apple.cpp | 1 - renderdoc/driver/gl/gl_hooks_egl.cpp | 1 - renderdoc/driver/gl/gl_hooks_linux.cpp | 1 - renderdoc/driver/gl/gl_hooks_win32.cpp | 1 - renderdoc/hooks/hooks.h | 2 +- renderdoc/os/win32/sys_win32_hooks.cpp | 1 - 11 files changed, 1 insertion(+), 11 deletions(-) diff --git a/renderdoc/driver/d3d11/d3d11_hooks.cpp b/renderdoc/driver/d3d11/d3d11_hooks.cpp index 3da09c9f0..fe9086e1b 100644 --- a/renderdoc/driver/d3d11/d3d11_hooks.cpp +++ b/renderdoc/driver/d3d11/d3d11_hooks.cpp @@ -169,7 +169,6 @@ public: return true; } - void OptionsUpdated(const char *libName) {} private: static D3D11Hook d3d11hooks; diff --git a/renderdoc/driver/d3d12/d3d12_hooks.cpp b/renderdoc/driver/d3d12/d3d12_hooks.cpp index 651bed953..211c65f63 100644 --- a/renderdoc/driver/d3d12/d3d12_hooks.cpp +++ b/renderdoc/driver/d3d12/d3d12_hooks.cpp @@ -122,7 +122,6 @@ public: return true; } - void OptionsUpdated(const char *libName) {} private: static D3D12Hook d3d12hooks; diff --git a/renderdoc/driver/d3d8/d3d8_hooks.cpp b/renderdoc/driver/d3d8/d3d8_hooks.cpp index 750075d81..25bad3f4f 100644 --- a/renderdoc/driver/d3d8/d3d8_hooks.cpp +++ b/renderdoc/driver/d3d8/d3d8_hooks.cpp @@ -53,7 +53,6 @@ public: return true; } - void OptionsUpdated(const char *libName) {} private: static D3D8Hook d3d8hooks; diff --git a/renderdoc/driver/d3d9/d3d9_hooks.cpp b/renderdoc/driver/d3d9/d3d9_hooks.cpp index df1325162..b4da647c6 100644 --- a/renderdoc/driver/d3d9/d3d9_hooks.cpp +++ b/renderdoc/driver/d3d9/d3d9_hooks.cpp @@ -68,7 +68,6 @@ public: return true; } - void OptionsUpdated(const char *libName) {} private: static D3D9Hook d3d9hooks; diff --git a/renderdoc/driver/dxgi/dxgi_hooks.cpp b/renderdoc/driver/dxgi/dxgi_hooks.cpp index ff0df3fd4..88b78d9dc 100644 --- a/renderdoc/driver/dxgi/dxgi_hooks.cpp +++ b/renderdoc/driver/dxgi/dxgi_hooks.cpp @@ -92,7 +92,6 @@ public: return true; } - void OptionsUpdated(const char *libName) {} private: static DXGIHook dxgihooks; diff --git a/renderdoc/driver/gl/gl_hooks_apple.cpp b/renderdoc/driver/gl/gl_hooks_apple.cpp index bb096f847..fd4d32705 100644 --- a/renderdoc/driver/gl/gl_hooks_apple.cpp +++ b/renderdoc/driver/gl/gl_hooks_apple.cpp @@ -39,7 +39,6 @@ public: OpenGLHook() {} ~OpenGLHook() {} bool CreateHooks(const char *libName) { return false; } - void OptionsUpdated(const char *libName) {} virtual GLWindowingData MakeContext(GLWindowingData share) { RDCUNIMPLEMENTED("MakeContext"); diff --git a/renderdoc/driver/gl/gl_hooks_egl.cpp b/renderdoc/driver/gl/gl_hooks_egl.cpp index 9bfbbba6e..65f29fb76 100644 --- a/renderdoc/driver/gl/gl_hooks_egl.cpp +++ b/renderdoc/driver/gl/gl_hooks_egl.cpp @@ -54,7 +54,6 @@ public: bool CreateHooks(const char *libName); - void OptionsUpdated(const char *libName) {} void PopulateEGLFunctions() { if(!m_PopulatedHooks) diff --git a/renderdoc/driver/gl/gl_hooks_linux.cpp b/renderdoc/driver/gl/gl_hooks_linux.cpp index d41855698..103e995d9 100644 --- a/renderdoc/driver/gl/gl_hooks_linux.cpp +++ b/renderdoc/driver/gl/gl_hooks_linux.cpp @@ -79,7 +79,6 @@ public: return true; } - void OptionsUpdated(const char *libName) {} // see callsite in glXSwapBuffers for explanation of why this is necessary XID UnwrapGLXWindow(XID id) { diff --git a/renderdoc/driver/gl/gl_hooks_win32.cpp b/renderdoc/driver/gl/gl_hooks_win32.cpp index d845b9a67..af785603c 100644 --- a/renderdoc/driver/gl/gl_hooks_win32.cpp +++ b/renderdoc/driver/gl/gl_hooks_win32.cpp @@ -694,7 +694,6 @@ public: return true; } - void OptionsUpdated(const char *libName) {} static OpenGLHook glhooks; void PopulateGLFunctions() diff --git a/renderdoc/hooks/hooks.h b/renderdoc/hooks/hooks.h index 7e535aa7e..35e647954 100644 --- a/renderdoc/hooks/hooks.h +++ b/renderdoc/hooks/hooks.h @@ -83,7 +83,7 @@ private: struct LibraryHook { virtual bool CreateHooks(const char *libName) = 0; - virtual void OptionsUpdated(const char *libName) = 0; + virtual void OptionsUpdated(const char *libName) {} }; // this singleton allows you to compile in code that defines a hook for a given library diff --git a/renderdoc/os/win32/sys_win32_hooks.cpp b/renderdoc/os/win32/sys_win32_hooks.cpp index b344e1ba1..4baaf268b 100644 --- a/renderdoc/os/win32/sys_win32_hooks.cpp +++ b/renderdoc/os/win32/sys_win32_hooks.cpp @@ -141,7 +141,6 @@ public: return true; } - void OptionsUpdated(const char *libName) {} private: static SysHook syshooks;