ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GS/DX11: Get rid of local context reference in GSTexture11

This commit is contained in:
Connor McLaughlin 2022-01-11 20:17:48 +10:00 committed by lightningterror
parent 5bdb34521d
commit cf2b6a895f
4 changed files with 50 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/GS/Renderers/DX11/GSDevice11.cpp
View File

@ -537,7 +537,7 @@ GSTexture* GSDevice11::CreateSurface(GSTexture::Type type, int width, int height
if (SUCCEEDED(hr))
{
t = new GSTexture11(std::move(texture), type, format);
t = new GSTexture11(std::move(texture), desc, type, format);
assert(type == t->GetType());
}
else

4
pcsx2/GS/Renderers/DX11/GSDevice11.h
View File

@ -235,6 +235,10 @@ public:
GSDevice11();
virtual ~GSDevice11() {}
__fi static GSDevice11* GetInstance() { return static_cast<GSDevice11*>(g_gs_device.get()); }
__fi ID3D11Device* GetD3DDevice() const { return m_dev.get(); }
__fi ID3D11DeviceContext* GetD3DContext() const { return m_ctx.get(); }
bool SetFeatureLevel(D3D_FEATURE_LEVEL level, bool compat_mode);
void GetFeatureLevel(D3D_FEATURE_LEVEL& level) const { level = m_shader.level; }

95
pcsx2/GS/Renderers/DX11/GSTexture11.cpp
View File

@ -14,26 +14,22 @@
*/
#include "PrecompiledHeader.h"
#include "GSDevice11.h"
#include "GSTexture11.h"
#include "GS/GSPng.h"
#include "GS/GSPerfMon.h"
GSTexture11::GSTexture11(wil::com_ptr_nothrow<ID3D11Texture2D> texture, GSTexture::Type type, GSTexture::Format format)
: m_texture(std::move(texture)), m_layer(0)
GSTexture11::GSTexture11(wil::com_ptr_nothrow<ID3D11Texture2D> texture, const D3D11_TEXTURE2D_DESC& desc,
GSTexture::Type type, GSTexture::Format format)
: m_texture(std::move(texture))
, m_desc(desc)
, m_mapped_subresource(0)
{
ASSERT(m_texture);
m_texture->GetDevice(m_dev.put());
m_texture->GetDesc(&m_desc);
m_dev->GetImmediateContext(m_ctx.put());
m_size.x = (int)m_desc.Width;
m_size.y = (int)m_desc.Height;
m_size.x = static_cast<int>(desc.Width);
m_size.y = static_cast<int>(desc.Height);
m_type = type;
m_format = format;
m_mipmap_levels = static_cast<int>(m_desc.MipLevels);
m_mipmap_levels = static_cast<int>(desc.MipLevels);
}
void* GSTexture11::GetNativeHandle() const
@ -46,21 +42,16 @@ bool GSTexture11::Update(const GSVector4i& r, const void* data, int pitch, int l
if (layer >= m_mipmap_levels)
return false;
if (m_dev && m_texture)
{
g_perfmon.Put(GSPerfMon::TextureUploads, 1);
D3D11_BOX box = {(UINT)r.left, (UINT)r.top, 0U, (UINT)r.right, (UINT)r.bottom, 1U};
UINT subresource = layer; // MipSlice + (ArraySlice * MipLevels).
const D3D11_BOX box = {(UINT)r.left, (UINT)r.top, 0U, (UINT)r.right, (UINT)r.bottom, 1U};
const UINT subresource = layer; // MipSlice + (ArraySlice * MipLevels).
m_ctx->UpdateSubresource(m_texture.get(), subresource, &box, data, pitch, 0);
GSDevice11::GetInstance()->GetD3DContext()->UpdateSubresource(m_texture.get(), subresource, &box, data, pitch, 0);
m_needs_mipmaps_generated |= (layer == 0);
return true;
}
return false;
}
bool GSTexture11::Map(GSMap& m, const GSVector4i* r, int layer)
{
if (r != NULL)
@ -77,13 +68,11 @@ bool GSTexture11::Map(GSMap& m, const GSVector4i* r, int layer)
D3D11_MAPPED_SUBRESOURCE map;
UINT subresource = layer;
if (SUCCEEDED(m_ctx->Map(m_texture.get(), subresource, D3D11_MAP_READ_WRITE, 0, &map)))
if (SUCCEEDED(GSDevice11::GetInstance()->GetD3DContext()->Map(m_texture.get(), subresource, D3D11_MAP_READ_WRITE, 0, &map)))
{
m.bits = (u8*)map.pData;
m.pitch = (int)map.RowPitch;
m_layer = layer;
m_mapped_subresource = layer;
return true;
}
}
@ -93,32 +82,26 @@ bool GSTexture11::Map(GSMap& m, const GSVector4i* r, int layer)
void GSTexture11::Unmap()
{
if (m_texture)
{
UINT subresource = m_layer;
m_needs_mipmaps_generated |= (m_layer == 0);
m_ctx->Unmap(m_texture.get(), subresource);
}
const UINT subresource = m_mapped_subresource;
m_needs_mipmaps_generated |= (m_mapped_subresource == 0);
GSDevice11::GetInstance()->GetD3DContext()->Unmap(m_texture.get(), subresource);
}
bool GSTexture11::Save(const std::string& fn)
{
D3D11_TEXTURE2D_DESC desc;
m_texture->GetDesc(&desc);
D3D11_TEXTURE2D_DESC desc = m_desc;
desc.Usage = D3D11_USAGE_STAGING;
desc.BindFlags = 0;
desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
wil::com_ptr_nothrow<ID3D11Texture2D> res;
HRESULT hr = m_dev->CreateTexture2D(&desc, nullptr, res.put());
HRESULT hr = GSDevice11::GetInstance()->GetD3DDevice()->CreateTexture2D(&desc, nullptr, res.put());
if (FAILED(hr))
{
return false;
}
m_ctx->CopyResource(res.get(), m_texture.get());
GSDevice11::GetInstance()->GetD3DContext()->CopyResource(res.get(), m_texture.get());
if (m_desc.BindFlags & D3D11_BIND_DEPTH_STENCIL)
{
@ -126,7 +109,7 @@ bool GSTexture11::Save(const std::string& fn)
desc.CPUAccessFlags |= D3D11_CPU_ACCESS_WRITE;
wil::com_ptr_nothrow<ID3D11Texture2D> dst;
hr = m_dev->CreateTexture2D(&desc, nullptr, dst.put());
hr = GSDevice11::GetInstance()->GetD3DDevice()->CreateTexture2D(&desc, nullptr, dst.put());
if (FAILED(hr))
{
return false;
@ -134,22 +117,22 @@ bool GSTexture11::Save(const std::string& fn)
D3D11_MAPPED_SUBRESOURCE sm, dm;
hr = m_ctx->Map(res.get(), 0, D3D11_MAP_READ, 0, &sm);
hr = GSDevice11::GetInstance()->GetD3DContext()->Map(res.get(), 0, D3D11_MAP_READ, 0, &sm);
if (FAILED(hr))
{
return false;
}
auto unmap_res = wil::scope_exit([this, res]{ // Capture by value to preserve the original pointer
m_ctx->Unmap(res.get(), 0);
auto unmap_res = wil::scope_exit([res]{ // Capture by value to preserve the original pointer
GSDevice11::GetInstance()->GetD3DContext()->Unmap(res.get(), 0);
});
hr = m_ctx->Map(dst.get(), 0, D3D11_MAP_WRITE, 0, &dm);
hr = GSDevice11::GetInstance()->GetD3DContext()->Map(dst.get(), 0, D3D11_MAP_WRITE, 0, &dm);
if (FAILED(hr))
{
return false;
}
auto unmap_dst = wil::scope_exit([this, dst]{ // Capture by value to preserve the original pointer
m_ctx->Unmap(dst.get(), 0);
auto unmap_dst = wil::scope_exit([dst]{ // Capture by value to preserve the original pointer
GSDevice11::GetInstance()->GetD3DContext()->Unmap(dst.get(), 0);
});
const u8* s = static_cast<const u8*>(sm.pData);
@ -186,7 +169,7 @@ bool GSTexture11::Save(const std::string& fn)
}
D3D11_MAPPED_SUBRESOURCE sm;
hr = m_ctx->Map(res.get(), 0, D3D11_MAP_READ, 0, &sm);
hr = GSDevice11::GetInstance()->GetD3DContext()->Map(res.get(), 0, D3D11_MAP_READ, 0, &sm);
if (FAILED(hr))
{
return false;
@ -195,14 +178,14 @@ bool GSTexture11::Save(const std::string& fn)
int compression = theApp.GetConfigI("png_compression_level");
bool success = GSPng::Save(format, fn, static_cast<u8*>(sm.pData), desc.Width, desc.Height, sm.RowPitch, compression);
m_ctx->Unmap(res.get(), 0);
GSDevice11::GetInstance()->GetD3DContext()->Unmap(res.get(), 0);
return success;
}
void GSTexture11::GenerateMipmap()
{
m_ctx->GenerateMips(operator ID3D11ShaderResourceView*());
GSDevice11::GetInstance()->GetD3DContext()->GenerateMips(operator ID3D11ShaderResourceView*());
}
GSTexture11::operator ID3D11Texture2D*()
@ -212,7 +195,7 @@ GSTexture11::operator ID3D11Texture2D*()
GSTexture11::operator ID3D11ShaderResourceView*()
{
if (!m_srv && m_dev && m_texture)
if (!m_srv)
{
if (m_desc.Format == DXGI_FORMAT_R32G8X24_TYPELESS)
{
@ -222,11 +205,11 @@ GSTexture11::operator ID3D11ShaderResourceView*()
srvd.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
srvd.Texture2D.MipLevels = 1;
m_dev->CreateShaderResourceView(m_texture.get(), &srvd, m_srv.put());
GSDevice11::GetInstance()->GetD3DDevice()->CreateShaderResourceView(m_texture.get(), &srvd, m_srv.put());
}
else
{
m_dev->CreateShaderResourceView(m_texture.get(), nullptr, m_srv.put());
GSDevice11::GetInstance()->GetD3DDevice()->CreateShaderResourceView(m_texture.get(), nullptr, m_srv.put());
}
}
@ -235,11 +218,9 @@ GSTexture11::operator ID3D11ShaderResourceView*()
GSTexture11::operator ID3D11RenderTargetView*()
{
ASSERT(m_dev);
if (!m_rtv && m_dev && m_texture)
if (!m_rtv)
{
m_dev->CreateRenderTargetView(m_texture.get(), nullptr, m_rtv.put());
GSDevice11::GetInstance()->GetD3DDevice()->CreateRenderTargetView(m_texture.get(), nullptr, m_rtv.put());
}
return m_rtv.get();
@ -247,7 +228,7 @@ GSTexture11::operator ID3D11RenderTargetView*()
GSTexture11::operator ID3D11DepthStencilView*()
{
if (!m_dsv && m_dev && m_texture)
if (!m_dsv)
{
if (m_desc.Format == DXGI_FORMAT_R32G8X24_TYPELESS)
{
@ -256,11 +237,11 @@ GSTexture11::operator ID3D11DepthStencilView*()
dsvd.Format = DXGI_FORMAT_D32_FLOAT_S8X24_UINT;
dsvd.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2D;
m_dev->CreateDepthStencilView(m_texture.get(), &dsvd, m_dsv.put());
GSDevice11::GetInstance()->GetD3DDevice()->CreateDepthStencilView(m_texture.get(), &dsvd, m_dsv.put());
}
else
{
m_dev->CreateDepthStencilView(m_texture.get(), nullptr, m_dsv.put());
GSDevice11::GetInstance()->GetD3DDevice()->CreateDepthStencilView(m_texture.get(), nullptr, m_dsv.put());
}
}

10
pcsx2/GS/Renderers/DX11/GSTexture11.h
View File

@ -22,18 +22,16 @@
class GSTexture11 final : public GSTexture
{
wil::com_ptr_nothrow<ID3D11Device> m_dev;
wil::com_ptr_nothrow<ID3D11DeviceContext> m_ctx;
wil::com_ptr_nothrow<ID3D11Texture2D> m_texture;
D3D11_TEXTURE2D_DESC m_desc;
wil::com_ptr_nothrow<ID3D11ShaderResourceView> m_srv;
wil::com_ptr_nothrow<ID3D11RenderTargetView> m_rtv;
wil::com_ptr_nothrow<ID3D11DepthStencilView> m_dsv;
int m_layer;
D3D11_TEXTURE2D_DESC m_desc;
int m_mapped_subresource;
public:
explicit GSTexture11(wil::com_ptr_nothrow<ID3D11Texture2D> texture, GSTexture::Type type, GSTexture::Format format);
explicit GSTexture11(wil::com_ptr_nothrow<ID3D11Texture2D> texture, const D3D11_TEXTURE2D_DESC& desc,
GSTexture::Type type, GSTexture::Format format);
void* GetNativeHandle() const override;