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

Revert "gsdx tc: partial support of pseudo depth for Dx" 

This reverts commit
d6383e6c21

It created a regression in Everybody's Golf 4/Hot Shots Golf 4, breaking the renderering when depth emulation is disabled/when using a Direct3D Hardware renderer.
This commit is contained in:
FlatOutPS2 2017-01-16 17:51:02 +01:00
parent f9c2025149
commit fffd829f88
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/GSdx/GSTextureCache.cpp
View File

@ -89,6 +89,11 @@ void GSTextureCache::RemoveAll()
GSTextureCache::Source* GSTextureCache::LookupDepthSource(const GIFRegTEX0& TEX0, const GIFRegTEXA& TEXA, const GSVector4i& r, bool palette) GSTextureCache::Source* GSTextureCache::LookupDepthSource(const GIFRegTEX0& TEX0, const GIFRegTEXA& TEXA, const GSVector4i& r, bool palette)
{ {
if (!CanConvertDepth()) {
GL_CACHE("LookupDepthSource not supported (0x%x, F:0x%x)", TEX0.TBP0, TEX0.PSM);
throw GSDXRecoverableError();
}
const GSLocalMemory::psm_t& psm_s = GSLocalMemory::m_psm[TEX0.PSM]; const GSLocalMemory::psm_t& psm_s = GSLocalMemory::m_psm[TEX0.PSM];
Source* src = NULL; Source* src = NULL;
@ -113,17 +118,6 @@ GSTextureCache::Source* GSTextureCache::LookupDepthSource(const GIFRegTEX0& TEX0
} }
} }
if (!CanConvertDepth()) {
if (dst) {
GL_CACHE("LookupDepthSource not supported (0x%x, %s)", TEX0.TBP0, psm_str(TEX0.PSM));
throw GSDXRecoverableError();
} else {
// LookupSource call LookupDepthSource, I'm sure it is nice testcase for formal tools ;)
GL_CACHE("LookupDepthSource not supported let's try standard LookupSource");
return LookupSource(TEX0, TEXA, r);
}
}
if (!dst) { if (!dst) {
// Retry on the render target (Silent Hill 4) // Retry on the render target (Silent Hill 4)
for(auto t : m_dst[RenderTarget]) { for(auto t : m_dst[RenderTarget]) {
@ -671,6 +665,9 @@ GSTextureCache::Target* GSTextureCache::LookupTarget(const GIFRegTEX0& TEX0, int
// must invalidate the Target/Depth respectively // must invalidate the Target/Depth respectively
void GSTextureCache::InvalidateVideoMemType(int type, uint32 bp) void GSTextureCache::InvalidateVideoMemType(int type, uint32 bp)
{ {
if (!CanConvertDepth())
return;
for(list<Target*>::iterator i = m_dst[type].begin(); i != m_dst[type].end(); ++i) for(list<Target*>::iterator i = m_dst[type].begin(); i != m_dst[type].end(); ++i)
{ {
Target* t = *i; Target* t = *i;