From 00f0d8c7b745edc3e470baac53c7055634660827 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 3 Jun 2020 12:18:08 +0100
Subject: [PATCH] Remove virtual from ID3DXXDeviceChild::Shutdown

---
 renderdoc/driver/d3d11/d3d11_resources.h | 7 ++-----
 renderdoc/driver/d3d12/d3d12_resources.h | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/renderdoc/driver/d3d11/d3d11_resources.h b/renderdoc/driver/d3d11/d3d11_resources.h
index 6e3d7cb79..dbe69234f 100644
--- a/renderdoc/driver/d3d11/d3d11_resources.h
+++ b/renderdoc/driver/d3d11/d3d11_resources.h
@@ -106,7 +106,7 @@ protected:
     m_pDevice->GetResourceManager()->AddCurrentResource(GetResourceID(), this);
   }
 
-  virtual void Shutdown()
+  void Shutdown()
   {
     m_pDevice->GetResourceManager()->RemoveWrapper(m_pReal);
     m_pDevice->GetResourceManager()->ReleaseCurrentResource(GetResourceID());
@@ -353,7 +353,6 @@ protected:
     RefCounter::SetSelfDeleting(false);
   }
 
-  virtual void Shutdown() { WrappedDeviceChild11::Shutdown(); }
   virtual ~WrappedResource11() {}
 public:
   void ViewAddRef()
@@ -765,15 +764,13 @@ protected:
     ((WrappedID3D11Buffer *)m_pResource)->ViewAddRef();
   }
 
-  virtual void Shutdown()
+  virtual ~WrappedView1()
   {
-    WrappedDeviceChild11::Shutdown();
     // cast is potentially invalid but functions in WrappedResource will be identical across each
     ((WrappedID3D11Buffer *)m_pResource)->ViewRelease();
     m_pResource = NULL;
   }
 
-  virtual ~WrappedView1() {}
 public:
   ResourceId GetResourceResID() { return m_ResourceResID; }
   const ResourceRange &GetResourceRange() { return m_ResourceRange; }
diff --git a/renderdoc/driver/d3d12/d3d12_resources.h b/renderdoc/driver/d3d12/d3d12_resources.h
index b3f9f53c9..124b5bce5 100644
--- a/renderdoc/driver/d3d12/d3d12_resources.h
+++ b/renderdoc/driver/d3d12/d3d12_resources.h
@@ -82,7 +82,7 @@ protected:
     m_pDevice->GetResourceManager()->AddCurrentResource(GetResourceID(), this);
   }
 
-  virtual void Shutdown()
+  void Shutdown()
   {
     if(m_pReal)
       m_pDevice->GetResourceManager()->RemoveWrapper(m_pReal);