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

GSdx: Recycle the m_merge texture instead of deleting it; and made a note about a debug assertion that happens in XS2 (probably nothing useful, but no harm in making a note for future references) 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2006 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-10-14 16:42:59 +00:00
parent 863db9d52d
commit 6447ef282a
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GSdx/GSDevice.cpp
View File

@ -188,7 +188,7 @@ void GSDevice::Merge(GSTexture* st[2], GSVector4* sr, GSVector4* dr, const GSVec
{
if(!m_merge || !(m_merge->GetSize() == fs))
{
delete m_merge;
Recycle(m_merge);
m_merge = CreateRenderTarget(fs.x, fs.y, false);
}

1
plugins/GSdx/GSRendererSW.cpp
View File

@ -113,6 +113,7 @@ GSTexture* GSRendererSW::GetOutput(int i)
s_n++;
}
ReleaseTextureBufferLock();
}
return m_texture[i];

2
plugins/GSdx/GSTextureCache.cpp
View File

@ -647,6 +647,8 @@ GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, con
switch(TEX0.PSM)
{
default:
// Note: this assertion triggers in Xenosaga2 after the first intro scenes, when
// gameplay first begins (in the city).
ASSERT(0);
case PSM_PSMCT32:
src->m_fmt = FMT_32;