archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 11:51:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6017 from lioncash/d3d-texture

Browse source 
D3DTexture: Remove unused class member
This commit is contained in:
Markus Wick 2017-09-03 21:03:36 +02:00 committed by GitHub
commit 745cde81e5
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/VideoBackends/D3D/D3DTexture.cpp
View file

@ -74,7 +74,7 @@ ID3D11DepthStencilView*& D3DTexture2D::GetDSV()
D3DTexture2D::D3DTexture2D(ID3D11Texture2D* texptr, D3D11_BIND_FLAG bind, DXGI_FORMAT srv_format, D3DTexture2D::D3DTexture2D(ID3D11Texture2D* texptr, D3D11_BIND_FLAG bind, DXGI_FORMAT srv_format,
DXGI_FORMAT dsv_format, DXGI_FORMAT rtv_format, bool multisampled) 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 = D3D11_SRV_DIMENSION srv_dim =
multisampled ? D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY : D3D11_SRV_DIMENSION_TEXTURE2DARRAY; multisampled ? D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY : D3D11_SRV_DIMENSION_TEXTURE2DARRAY;

9
Source/Core/VideoBackends/D3D/D3DTexture.h
View file

@ -39,11 +39,10 @@ private:
~D3DTexture2D(); ~D3DTexture2D();
ID3D11Texture2D* tex; ID3D11Texture2D* tex;
ID3D11ShaderResourceView* srv; ID3D11ShaderResourceView* srv = nullptr;
ID3D11RenderTargetView* rtv; ID3D11RenderTargetView* rtv = nullptr;
ID3D11DepthStencilView* dsv; ID3D11DepthStencilView* dsv = nullptr;
D3D11_BIND_FLAG bindflags; UINT ref = 1;
UINT ref;
}; };
} // namespace DX11 } // namespace DX11