From d656511d0f3bf3855f61cef46747b0517d99ab91 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 5 Jul 2016 19:21:21 +0300
Subject: [PATCH] Don't register callback while still running global
 constructors

---
 renderdoc/driver/d3d11/d3d11_hooks.cpp | 4 ++--
 renderdoc/driver/d3d12/d3d12_hooks.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/renderdoc/driver/d3d11/d3d11_hooks.cpp b/renderdoc/driver/d3d11/d3d11_hooks.cpp
index c1d3a00db..01540a24f 100644
--- a/renderdoc/driver/d3d11/d3d11_hooks.cpp
+++ b/renderdoc/driver/d3d11/d3d11_hooks.cpp
@@ -45,14 +45,14 @@ public:
     LibraryHooks::GetInstance().RegisterHook(DLL_NAME, this);
     m_EnabledHooks = true;
     m_InsideCreate = false;
-
-    WrappedIDXGISwapChain3::RegisterD3DDeviceCallback(GetD3D11DeviceIfAlloc);
   }
 
   bool CreateHooks(const char *libName)
   {
     bool success = true;
 
+    WrappedIDXGISwapChain3::RegisterD3DDeviceCallback(GetD3D11DeviceIfAlloc);
+
     // also require d3dcompiler_??.dll
     if(GetD3DCompiler() == NULL)
     {
diff --git a/renderdoc/driver/d3d12/d3d12_hooks.cpp b/renderdoc/driver/d3d12/d3d12_hooks.cpp
index f69342e70..ea71bea29 100644
--- a/renderdoc/driver/d3d12/d3d12_hooks.cpp
+++ b/renderdoc/driver/d3d12/d3d12_hooks.cpp
@@ -79,14 +79,14 @@ public:
     LibraryHooks::GetInstance().RegisterHook(DLL_NAME, this);
     m_EnabledHooks = true;
     m_InsideCreate = false;
-
-    WrappedIDXGISwapChain3::RegisterD3DDeviceCallback(GetD3D12DeviceIfAlloc);
   }
 
   bool CreateHooks(const char *libName)
   {
     bool success = true;
 
+    WrappedIDXGISwapChain3::RegisterD3DDeviceCallback(GetD3D12DeviceIfAlloc);
+
     // also require d3dcompiler_??.dll
     if(GetD3DCompiler() == NULL)
     {