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

zzogl-pg: Change a few assertions into warnings. (Makes it possible to run Final Fantasy X-2 with Debug builds. With tons of console spam, mind.) 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3413 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-07-07 10:14:42 +00:00
parent 6a3f1bdab2
commit b5d8508989
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/zzogl-pg/opengl/ZZoglFlush.cpp
View File

@ -633,8 +633,13 @@ inline void FlushSetContextTarget(VB& curvb, int context)
if (curvb.pdepth != NULL) if (curvb.pdepth != NULL)
{ {
assert(!(curvb.pdepth->status&CRenderTarget::TS_NeedUpdate)); #ifdef _DEBUG
// Reduce an assert to a warning.
if (curvb.pdepth->status & CRenderTarget::TS_NeedUpdate)
{
ZZLog::Debug_Log("In FlushSetContextTarget, pdepth is has TS_NeedUpdate set.");
}
#endif
if (!curvb.zbuf.zmsk) if (!curvb.zbuf.zmsk)
{ {
assert(!(curvb.pdepth->status & CRenderTarget::TS_Virtual)); assert(!(curvb.pdepth->status & CRenderTarget::TS_Virtual));
@ -1941,8 +1946,18 @@ void ZeroGS::SetContextTarget(int context)
if (vb[!context].prndr != curvb.prndr) vb[!context].bVarsSetTarg = false; if (vb[!context].prndr != curvb.prndr) vb[!context].bVarsSetTarg = false;
assert(!(curvb.prndr->status&CRenderTarget::TS_NeedUpdate)); #ifdef _DEBUG
assert(curvb.pdepth == NULL || !(curvb.pdepth->status&CRenderTarget::TS_NeedUpdate)); // These conditions happen often enough that we'll just warn about it rather then abort in Debug mode.
if (curvb.prndr->status & CRenderTarget::TS_NeedUpdate)
{
ZZLog::Debug_Log("In SetContextTarget, prndr is ending with TS_NeedUpdate set.");
}
if (curvb.pdepth != NULL && (curvb.pdepth->status & CRenderTarget::TS_NeedUpdate))
{
ZZLog::Debug_Log("In SetContextTarget, pdepth is ending with TS_NeedUpdate set.");
}
#endif
GL_REPORT_ERRORD(); GL_REPORT_ERRORD();
} }