Merge pull request #6017 from lioncash/d3d-texture

D3DTexture: Remove unused class member
dolphin-emu · Sep 3, 2017 · 745cde8 · 745cde8
2 parents edf4bfa + 36e299c
commit 745cde8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Source/Core/VideoBackends/D3D/D3DTexture.cpp b/Source/Core/VideoBackends/D3D/D3DTexture.cpp
@@ -74,7 +74,7 @@ ID3D11DepthStencilView*& D3DTexture2D::GetDSV()
 
 D3DTexture2D::D3DTexture2D(ID3D11Texture2D* texptr, D3D11_BIND_FLAG bind, DXGI_FORMAT srv_format,
                            DXGI_FORMAT dsv_format, DXGI_FORMAT rtv_format, bool multisampled)
-    : ref(1), tex(texptr), srv(nullptr), rtv(nullptr), dsv(nullptr)
+    : tex{texptr}
 {
   D3D11_SRV_DIMENSION srv_dim =
       multisampled ? D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY : D3D11_SRV_DIMENSION_TEXTURE2DARRAY;

diff --git a/Source/Core/VideoBackends/D3D/D3DTexture.h b/Source/Core/VideoBackends/D3D/D3DTexture.h
@@ -39,11 +39,10 @@ class D3DTexture2D
   ~D3DTexture2D();
 
   ID3D11Texture2D* tex;
-  ID3D11ShaderResourceView* srv;
-  ID3D11RenderTargetView* rtv;
-  ID3D11DepthStencilView* dsv;
-  D3D11_BIND_FLAG bindflags;
-  UINT ref;
+  ID3D11ShaderResourceView* srv = nullptr;
+  ID3D11RenderTargetView* rtv = nullptr;
+  ID3D11DepthStencilView* dsv = nullptr;
+  UINT ref = 1;
 };
 
 }  // namespace DX11