Remove ShutdownSwapchain - redundant vs ReleaseSwapchainResources

baldurk · baldurk · commit f96be406d2ee · 2016-07-10T18:10:06.000+02:00
diff --git a/renderdoc/driver/d3d11/d3d11_device.cpp b/renderdoc/driver/d3d11/d3d11_device.cpp
@@ -270,16 +270,6 @@ ReplayCreateStatus D3D11InitParams::Serialise()
   return eReplayCreate_Success;
 }
 
-void WrappedID3D11Device::ShutdownSwapchain(WrappedIDXGISwapChain3 *swapChain)
-{
-  for(int i = 0; i < swapChain->GetNumBackbuffers(); i++)
-  {
-    WrappedID3D11Texture2D1 *wrapped = (WrappedID3D11Texture2D1 *)swapChain->GetBackbuffers()[i];
-    if(wrapped)
-      wrapped->ViewRelease();
-  }
-}
-
 void WrappedID3D11Device::NewSwapchainBuffer(IUnknown *backbuffer)
 {
   WrappedID3D11Texture2D1 *wrapped = (WrappedID3D11Texture2D1 *)backbuffer;
diff --git a/renderdoc/driver/d3d11/d3d11_device.h b/renderdoc/driver/d3d11/d3d11_device.h
@@ -456,7 +456,6 @@ class WrappedID3D11Device : public IFrameCapturer, public ID3DDevice, public ID3
                                                                 UINT buffer, IUnknown *realSurface));
   HRESULT Present(WrappedIDXGISwapChain3 *swap, UINT SyncInterval, UINT Flags);
 
-  void ShutdownSwapchain(WrappedIDXGISwapChain3 *swapChain);
   void NewSwapchainBuffer(IUnknown *backbuffer);
 
   void ReleaseSwapchainResources(WrappedIDXGISwapChain3 *swap);
diff --git a/renderdoc/driver/d3d12/d3d12_command_queue.h b/renderdoc/driver/d3d12/d3d12_command_queue.h
@@ -285,11 +285,6 @@ class WrappedID3D12CommandQueue : public ID3D12CommandQueue,
   virtual IUnknown *GetDeviceInterface() { return (ID3D12CommandQueue *)this; }
   // the rest forward to the device
   virtual void FirstFrame(WrappedIDXGISwapChain3 *swapChain) { m_pDevice->FirstFrame(swapChain); }
-  virtual void ShutdownSwapchain(WrappedIDXGISwapChain3 *swapChain)
-  {
-    m_pDevice->FirstFrame(swapChain);
-  }
-
   virtual void NewSwapchainBuffer(IUnknown *backbuffer)
   {
     m_pDevice->NewSwapchainBuffer(backbuffer);
diff --git a/renderdoc/driver/d3d12/d3d12_device.h b/renderdoc/driver/d3d12/d3d12_device.h
@@ -382,7 +382,6 @@ class WrappedID3D12Device : public IFrameCapturer, public ID3DDevice, public ID3
                                                                 UINT buffer, IUnknown *realSurface));
   HRESULT Present(WrappedIDXGISwapChain3 *swap, UINT SyncInterval, UINT Flags);
 
-  void ShutdownSwapchain(WrappedIDXGISwapChain3 *swapChain) {}
   void NewSwapchainBuffer(IUnknown *backbuffer) {}
   void ReleaseSwapchainResources(WrappedIDXGISwapChain3 *swap);
 
diff --git a/renderdoc/driver/dxgi/dxgi_wrapped.cpp b/renderdoc/driver/dxgi/dxgi_wrapped.cpp
@@ -229,8 +229,6 @@ WrappedIDXGISwapChain3::~WrappedIDXGISwapChain3()
 {
   m_pDevice->ReleaseSwapchainResources(this);
 
-  m_pDevice->ShutdownSwapchain(this);
-
   SAFE_RELEASE(m_pDevice);
 
   SAFE_RELEASE(m_pReal1);
diff --git a/renderdoc/driver/dxgi/dxgi_wrapped.h b/renderdoc/driver/dxgi/dxgi_wrapped.h
@@ -168,7 +168,6 @@ struct ID3DDevice
   virtual IUnknown *GetDeviceInterface() = 0;
 
   virtual void FirstFrame(WrappedIDXGISwapChain3 *swapChain) = 0;
-  virtual void ShutdownSwapchain(WrappedIDXGISwapChain3 *swapChain) = 0;
 
   virtual void NewSwapchainBuffer(IUnknown *backbuffer) = 0;
   virtual void ReleaseSwapchainResources(WrappedIDXGISwapChain3 *swapChain) = 0;

Original file line number	Diff line number	Diff line change
`@@ -229,8 +229,6 @@ WrappedIDXGISwapChain3::~WrappedIDXGISwapChain3()`
`229`	`229`	`{`
`230`	`230`	`m_pDevice->ReleaseSwapchainResources(this);`
`231`	`231`
`232`		`- m_pDevice->ShutdownSwapchain(this);`
`233`		`-`
`234`	`232`	`SAFE_RELEASE(m_pDevice);`
`235`	`233`
`236`	`234`	`SAFE_RELEASE(m_pReal1);`