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

zzogl-pg: Mess around a bit with FlushReGetTarget. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4067 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-12-02 11:12:42 +00:00
parent f1c05a7f65
commit 5f1d99188d
1 changed files with 55 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,53 +455,8 @@ inline bool FlushInitialTest(VB& curvb, const pixTest& curtest, int context)
return false; return false;
} }
// Try to different approach if texture target was not found inline void TargetLog(int& tbw, int& tbp0, int& tpsm, VB& curvb)
inline CRenderTarget* FlushReGetTarget(int& tbw, int& tbp0, int& tpsm, VB& curvb)
{ {
// This was incorrect code
CRenderTarget* ptextarg = NULL;
if ((ptextarg == NULL) && (tpsm == PSMT8) && (conf.settings().reget))
{
// check for targets with half the width. Break Valkyrie Chronicles
ptextarg = s_RTs.GetTarg(tbp0, tbw / 2);
if (ptextarg == NULL)
{
tbp0 &= ~0x7ff;
ptextarg = s_RTs.GetTarg(tbp0, tbw / 2); // mgs3 hack
if (ptextarg == NULL)
{
// check the next level (mgs3)
tbp0 &= ~0xfff;
ptextarg = s_RTs.GetTarg(tbp0, tbw / 2); // mgs3 hack
}
if (ptextarg != NULL && ptextarg->start > tbp0*256)
{
// target beyond range, so ignore
ptextarg = NULL;
}
}
}
if (PSMT_ISZTEX(tpsm) && (ptextarg == NULL))
{
// try depth
ptextarg = s_DepthRTs.GetTarg(tbp0, tbw);
}
if ((ptextarg == NULL) && (conf.settings().texture_targs))
{
// check if any part of the texture intersects the current target
if (!PSMT_ISCLUT(tpsm) && (curvb.tex0.tbp0 >= curvb.frame.fbp) && ((curvb.tex0.tbp0) < curvb.prndr->end))
{
ptextarg = curvb.prndr;
}
}
#ifdef _DEBUG #ifdef _DEBUG
if (tbp0 == 0x3600 && tbw == 0x100) if (tbp0 == 0x3600 && tbw == 0x100)
{ {
@ -526,20 +481,69 @@ inline CRenderTarget* FlushReGetTarget(int& tbw, int& tbp0, int& tpsm, VB& curvb
else else
ZZLog::Debug_Log("Hit %x 0x%x %x", tbw, tbp0, tpsm); ZZLog::Debug_Log("Hit %x 0x%x %x", tbw, tbp0, tpsm);
} }
#endif #endif
}
// Try to different approach if texture target was not found
inline CRenderTarget* FlushReGetTarget(int& tbw, int& tbp0, int& tpsm, VB& curvb)
{
// This was incorrect code
CRenderTarget* ptextarg = NULL;
if (PSMT_ISZTEX(tpsm))
{
// try depth
ptextarg = s_DepthRTs.GetTarg(tbp0, tbw);
}
// I wonder if either of these hacks are useful, or if I can just remove them?
if ((conf.settings().reget) && (tpsm == PSMT8))
{
// check for targets with half the width. Break Valkyrie Chronicles
ptextarg = s_RTs.GetTarg(tbp0, tbw / 2);
if (ptextarg == NULL)
{
tbp0 &= ~0x7ff;
ptextarg = s_RTs.GetTarg(tbp0, tbw / 2); // mgs3 hack
if (ptextarg == NULL)
{
// check the next level (mgs3)
tbp0 &= ~0xfff;
ptextarg = s_RTs.GetTarg(tbp0, tbw / 2); // mgs3 hack
}
if (ptextarg != NULL && ptextarg->start > tbp0*256)
{
// target beyond range, so ignore
ptextarg = NULL;
}
}
}
if ((conf.settings().texture_targs) && (ptextarg == NULL))
{
// check if any part of the texture intersects the current target
if (!PSMT_ISCLUT(tpsm) && (curvb.tex0.tbp0 >= curvb.frame.fbp) && ((curvb.tex0.tbp0) < curvb.prndr->end))
{
ptextarg = curvb.prndr;
}
}
TargetLog(tbw, tbp0, tpsm, curvb);
return ptextarg; return ptextarg;
} }
// Find target to draw a texture, it's highly p // Find target to draw a texture.
inline CRenderTarget* FlushGetTarget(VB& curvb) inline CRenderTarget* FlushGetTarget(VB& curvb)
{ {
int tbw, tbp0, tpsm; int tbw, tbp0, tpsm;
CRenderTarget* ptextarg = NULL; CRenderTarget* ptextarg = NULL;
if (!curvb.curprim.tme) return ptextarg; if (!curvb.curprim.tme) return ptextarg; // Which would be NULL, currently.
if (curvb.bNeedTexCheck) if (curvb.bNeedTexCheck)
{ {
@ -558,8 +562,7 @@ inline CRenderTarget* FlushGetTarget(VB& curvb)
ptextarg = s_RTs.GetTarg(tbp0, tbw); ptextarg = s_RTs.GetTarg(tbp0, tbw);
if (ptextarg == NULL) if (ptextarg == NULL) ptextarg = FlushReGetTarget(tbw, tbp0, tpsm, curvb);
ptextarg = FlushReGetTarget(tbw, tbp0, tpsm, curvb);
if ((ptextarg != NULL) && !(ptextarg->status & CRenderTarget::TS_NeedUpdate)) if ((ptextarg != NULL) && !(ptextarg->status & CRenderTarget::TS_NeedUpdate))
{ {
@ -596,6 +599,7 @@ inline CRenderTarget* FlushGetTarget(VB& curvb)
} }
else else
{ {
// If a texture needs updating, clear it.
ptextarg = NULL; ptextarg = NULL;
} }