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

GSdx-TC11: Add support for depth formats in Direct3D11 Texture Cache. 

Add depth formats for Direct3D11 to properly support depth.
This commit is contained in:
lightningterror 2018-12-03 18:01:47 +01:00
parent c3a1cc3801
commit 7928cff354
1 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
plugins/GSdx/Renderers/DX11/GSTextureCache11.cpp
View File

@ -31,27 +31,42 @@ GSTextureCache11::GSTextureCache11(GSRenderer* r)
void GSTextureCache11::Read(Target* t, const GSVector4i& r) void GSTextureCache11::Read(Target* t, const GSVector4i& r)
{ {
if(t->m_type != RenderTarget) if (!t->m_dirty.empty() || r.width() == 0 || r.height() == 0)
{ {
// TODO
return; return;
} }
const GIFRegTEX0& TEX0 = t->m_TEX0; const GIFRegTEX0& TEX0 = t->m_TEX0;
if(TEX0.PSM != PSM_PSMCT32 DXGI_FORMAT format;
&& TEX0.PSM != PSM_PSMCT24 int ps_shader;
&& TEX0.PSM != PSM_PSMCT16 switch (TEX0.PSM)
&& TEX0.PSM != PSM_PSMCT16S)
{ {
//ASSERT(0); case PSM_PSMCT32:
case PSM_PSMCT24:
format = DXGI_FORMAT_R8G8B8A8_UNORM;
ps_shader = ShaderConvert_COPY;
break;
return; case PSM_PSMCT16:
} case PSM_PSMCT16S:
format = DXGI_FORMAT_R16_UINT;
ps_shader = ShaderConvert_RGBA8_TO_16_BITS;
break;
if (!t->m_dirty.empty() || r.width() == 0 || r.height() == 0) case PSM_PSMZ32:
{ case PSM_PSMZ24:
format = DXGI_FORMAT_R32_UINT;
ps_shader = ShaderConvert_FLOAT32_TO_32_BITS;
break;
case PSM_PSMZ16:
case PSM_PSMZ16S:
format = DXGI_FORMAT_R16_UINT;
ps_shader = ShaderConvert_FLOAT32_TO_32_BITS;
break;
default:
return; return;
} }
@ -62,30 +77,33 @@ void GSTextureCache11::Read(Target* t, const GSVector4i& r)
GSVector4 src = GSVector4(r) * GSVector4(t->m_texture->GetScale()).xyxy() / GSVector4(t->m_texture->GetSize()).xyxy(); GSVector4 src = GSVector4(r) * GSVector4(t->m_texture->GetScale()).xyxy() / GSVector4(t->m_texture->GetSize()).xyxy();
DXGI_FORMAT format = TEX0.PSM == PSM_PSMCT16 || TEX0.PSM == PSM_PSMCT16S ? DXGI_FORMAT_R16_UINT : DXGI_FORMAT_R8G8B8A8_UNORM; if (GSTexture* offscreen = m_renderer->m_dev->CopyOffscreen(t->m_texture, src, w, h, format, ps_shader))
if(GSTexture* offscreen = m_renderer->m_dev->CopyOffscreen(t->m_texture, src, w, h, format))
{ {
GSTexture::GSMap m; GSTexture::GSMap m;
if(offscreen->Map(m)) if (offscreen->Map(m))
{ {
// TODO: block level write // TODO: block level write
GSOffset* off = m_renderer->m_mem.GetOffset(TEX0.TBP0, TEX0.TBW, TEX0.PSM); GSOffset* off = m_renderer->m_mem.GetOffset(TEX0.TBP0, TEX0.TBW, TEX0.PSM);
switch(TEX0.PSM) switch (TEX0.PSM)
{ {
case PSM_PSMCT32: case PSM_PSMCT32:
case PSM_PSMZ32:
m_renderer->m_mem.WritePixel32(m.bits, m.pitch, off, r); m_renderer->m_mem.WritePixel32(m.bits, m.pitch, off, r);
break; break;
case PSM_PSMCT24: case PSM_PSMCT24:
case PSM_PSMZ24:
m_renderer->m_mem.WritePixel24(m.bits, m.pitch, off, r); m_renderer->m_mem.WritePixel24(m.bits, m.pitch, off, r);
break; break;
case PSM_PSMCT16: case PSM_PSMCT16:
case PSM_PSMCT16S: case PSM_PSMCT16S:
case PSM_PSMZ16:
case PSM_PSMZ16S:
m_renderer->m_mem.WritePixel16(m.bits, m.pitch, off, r); m_renderer->m_mem.WritePixel16(m.bits, m.pitch, off, r);
break; break;
default: default:
ASSERT(0); ASSERT(0);
} }