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

Revert "gsdx state: TEX0 write behavior might depends on the context" 

This reverts commit b34243fa7b.

Unfortunately we have a regression on GT4. I'm doomed
This commit is contained in:
Gregory Hainaut 2016-09-28 20:00:56 +02:00
parent 90ad9cf668
commit 8d4fadb3c8
1 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
plugins/GSdx/GSState.cpp
View File

@ -821,8 +821,7 @@ void GSState::GIFRegHandlerXYZ2(const GIFReg* RESTRICT r)
template<int i> void GSState::ApplyTEX0(GIFRegTEX0& TEX0) template<int i> void GSState::ApplyTEX0(GIFRegTEX0& TEX0)
{ {
// Mask invalid bit before any comparison // even if TEX0 did not change, a new palette may have been uploaded and will overwrite the currently queued for drawing
TEX0.CPSM &= 0xa; // 1010b
// Handle invalid PSM here // Handle invalid PSM here
switch (TEX0.PSM) { switch (TEX0.PSM) {
@ -848,20 +847,6 @@ template<int i> void GSState::ApplyTEX0(GIFRegTEX0& TEX0)
break; break;
} }
if (PRIM->CTXT != i) {
// Context isn't current. Only update the register value.
// Handling (real write of the clut buffer) will be done when ctxt will be switched
if((TEX0.u32[0] ^ m_env.CTXT[i].TEX0.u32[0]) & 0x3ffffff) // TBP0 TBW PSM
{
m_env.CTXT[i].offset.tex = m_mem.GetOffset(TEX0.TBP0, TEX0.TBW, TEX0.PSM);
}
m_env.CTXT[i].TEX0 = (GSVector4i)TEX0;
return;
}
// even if TEX0 did not change, a new palette may have been uploaded and will overwrite the currently queued for drawing
bool wt = m_mem.m_clut.WriteTest(TEX0, m_env.TEXCLUT); bool wt = m_mem.m_clut.WriteTest(TEX0, m_env.TEXCLUT);
// clut loading already covered with WriteTest, for drawing only have to check CPSM and CSA (MGS3 intro skybox would be drawn piece by piece without this) // clut loading already covered with WriteTest, for drawing only have to check CPSM and CSA (MGS3 intro skybox would be drawn piece by piece without this)
@ -873,6 +858,7 @@ template<int i> void GSState::ApplyTEX0(GIFRegTEX0& TEX0)
Flush(); Flush();
} }
TEX0.CPSM &= 0xa; // 1010b
if((TEX0.u32[0] ^ m_env.CTXT[i].TEX0.u32[0]) & 0x3ffffff) // TBP0 TBW PSM if((TEX0.u32[0] ^ m_env.CTXT[i].TEX0.u32[0]) & 0x3ffffff) // TBP0 TBW PSM
{ {
@ -2446,21 +2432,9 @@ void GSState::SetGameCRC(uint32 crc, int options)
void GSState::UpdateContext() void GSState::UpdateContext()
{ {
bool context_switch = (m_context != &m_env.CTXT[PRIM->CTXT]);
m_context = &m_env.CTXT[PRIM->CTXT]; m_context = &m_env.CTXT[PRIM->CTXT];
UpdateScissor(); UpdateScissor();
if (context_switch) {
// Harley davidson sets TEX0 register before the context. Re-apply it now
// so clut is properly loaded
if (m_context == &m_env.CTXT[1]) {
ApplyTEX0<1>(m_env.CTXT[PRIM->CTXT].TEX0);
} else {
ApplyTEX0<0>(m_env.CTXT[PRIM->CTXT].TEX0);
}
}
} }
void GSState::UpdateScissor() void GSState::UpdateScissor()