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

GSdx: Also wrapping CLUT writes now, previous revision broke SFEX. CLUT buffer overruns are very rare, tell me if you find any other game doing it. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4956 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gabest11 2011-11-02 21:15:44 +00:00
parent b158f98fc7
commit 67b12b3f92
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/GSdx/GSClut.cpp
View File

@ -30,7 +30,7 @@ GSClut::GSClut(GSLocalMemory* mem)
{ {
uint8* p = (uint8*)vmalloc(CLUT_ALLOC_SIZE, false); uint8* p = (uint8*)vmalloc(CLUT_ALLOC_SIZE, false);
m_clut = (uint16*)&p[0]; // 1k + 1k for buffer overruns (sfex: PSM == PSM_PSMT8, CPSM == PSM_PSMCT32, CSA != 0) m_clut = (uint16*)&p[0]; // 1k + 1k for buffer overruns (TODO: wrap CSM2 writes, too)
m_buff32 = (uint32*)&p[2048]; // 1k m_buff32 = (uint32*)&p[2048]; // 1k
m_buff64 = (uint64*)&p[4096]; // 2k m_buff64 = (uint64*)&p[4096]; // 2k
m_write.dirty = true; m_write.dirty = true;
@ -130,9 +130,9 @@ void GSClut::WriteCLUT32_I8_CSM1(const GIFRegTEX0& TEX0, const GIFRegTEXCLUT& TE
{ {
ALIGN_STACK(32); ALIGN_STACK(32);
ASSERT(TEX0.CSA == 0); // ASSERT(TEX0.CSA == 0); // sfex
WriteCLUT_T32_I8_CSM1((uint32*)m_mem->BlockPtr32(0, 0, TEX0.CBP, 1), m_clut + (TEX0.CSA << 4)); WriteCLUT_T32_I8_CSM1((uint32*)m_mem->BlockPtr32(0, 0, TEX0.CBP, 1), m_clut);
} }
void GSClut::WriteCLUT32_I4_CSM1(const GIFRegTEX0& TEX0, const GIFRegTEXCLUT& TEXCLUT) void GSClut::WriteCLUT32_I4_CSM1(const GIFRegTEX0& TEX0, const GIFRegTEXCLUT& TEXCLUT)
@ -141,26 +141,26 @@ void GSClut::WriteCLUT32_I4_CSM1(const GIFRegTEX0& TEX0, const GIFRegTEXCLUT& TE
ASSERT(TEX0.CSA < 16); ASSERT(TEX0.CSA < 16);
WriteCLUT_T32_I4_CSM1((uint32*)m_mem->BlockPtr32(0, 0, TEX0.CBP, 1), m_clut + (TEX0.CSA << 4)); WriteCLUT_T32_I4_CSM1((uint32*)m_mem->BlockPtr32(0, 0, TEX0.CBP, 1), m_clut + ((TEX0.CSA & 15) << 4));
} }
void GSClut::WriteCLUT16_I8_CSM1(const GIFRegTEX0& TEX0, const GIFRegTEXCLUT& TEXCLUT) void GSClut::WriteCLUT16_I8_CSM1(const GIFRegTEX0& TEX0, const GIFRegTEXCLUT& TEXCLUT)
{ {
ASSERT(TEX0.CSA < 16); ASSERT(TEX0.CSA < 16);
WriteCLUT_T16_I8_CSM1((uint16*)m_mem->BlockPtr16(0, 0, TEX0.CBP, 1), m_clut + (TEX0.CSA << 4)); WriteCLUT_T16_I8_CSM1((uint16*)m_mem->BlockPtr16(0, 0, TEX0.CBP, 1), m_clut + ((TEX0.CSA & 15) << 4));
} }
void GSClut::WriteCLUT16_I4_CSM1(const GIFRegTEX0& TEX0, const GIFRegTEXCLUT& TEXCLUT) void GSClut::WriteCLUT16_I4_CSM1(const GIFRegTEX0& TEX0, const GIFRegTEXCLUT& TEXCLUT)
{ {
ASSERT(TEX0.CSA < 32);
WriteCLUT_T16_I4_CSM1((uint16*)m_mem->BlockPtr16(0, 0, TEX0.CBP, 1), m_clut + (TEX0.CSA << 4)); WriteCLUT_T16_I4_CSM1((uint16*)m_mem->BlockPtr16(0, 0, TEX0.CBP, 1), m_clut + (TEX0.CSA << 4));
} }
void GSClut::WriteCLUT16S_I8_CSM1(const GIFRegTEX0& TEX0, const GIFRegTEXCLUT& TEXCLUT) void GSClut::WriteCLUT16S_I8_CSM1(const GIFRegTEX0& TEX0, const GIFRegTEXCLUT& TEXCLUT)
{ {
WriteCLUT_T16_I8_CSM1((uint16*)m_mem->BlockPtr16S(0, 0, TEX0.CBP, 1), m_clut + (TEX0.CSA << 4)); ASSERT(TEX0.CSA < 16);
WriteCLUT_T16_I8_CSM1((uint16*)m_mem->BlockPtr16S(0, 0, TEX0.CBP, 1), m_clut + ((TEX0.CSA & 15) << 4));
} }
void GSClut::WriteCLUT16S_I4_CSM1(const GIFRegTEX0& TEX0, const GIFRegTEXCLUT& TEXCLUT) void GSClut::WriteCLUT16S_I4_CSM1(const GIFRegTEX0& TEX0, const GIFRegTEXCLUT& TEXCLUT)
@ -256,7 +256,6 @@ void GSClut::Read(const GIFRegTEX0& TEX0)
case PSM_PSMT4: case PSM_PSMT4:
case PSM_PSMT4HL: case PSM_PSMT4HL:
case PSM_PSMT4HH: case PSM_PSMT4HH:
ASSERT(TEX0.CSA < 32);
clut += TEX0.CSA << 4; clut += TEX0.CSA << 4;
ReadCLUT_T16_I4(clut, m_buff32, m_buff64); ReadCLUT_T16_I4(clut, m_buff32, m_buff64);
break; break;
@ -282,7 +281,7 @@ void GSClut::Read32(const GIFRegTEX0& TEX0, const GIFRegTEXA& TEXA)
{ {
case PSM_PSMT8: case PSM_PSMT8:
case PSM_PSMT8H: case PSM_PSMT8H:
ASSERT(TEX0.CSA == 0); // ASSERT(TEX0.CSA == 0); // sfex
ReadCLUT_T32_I8(clut, m_buff32); ReadCLUT_T32_I8(clut, m_buff32);
break; break;
case PSM_PSMT4: case PSM_PSMT4:
@ -309,7 +308,6 @@ void GSClut::Read32(const GIFRegTEX0& TEX0, const GIFRegTEXA& TEXA)
case PSM_PSMT4: case PSM_PSMT4:
case PSM_PSMT4HL: case PSM_PSMT4HL:
case PSM_PSMT4HH: case PSM_PSMT4HH:
ASSERT(TEX0.CSA < 32);
clut += TEX0.CSA << 4; clut += TEX0.CSA << 4;
// TODO: merge these functions // TODO: merge these functions
Expand16(clut, m_buff32, 16, TEXA); Expand16(clut, m_buff32, 16, TEXA);