GSdx: Disable CRC hacks - cleanups:

- Removed the #define DISABLE_CRC_HACKS (since it's at the GUI now).
- reverted r5315 and r5319 (which prevented gs dumps to have a correct CRC).
- Restored the functionality of these revisions via simple skip of the other hack calls.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5320 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
avihal 2012-06-20 18:51:30 +00:00
parent 35d381cd11
commit ae9c7791c2
4 changed files with 4 additions and 19 deletions

View File

@ -745,12 +745,7 @@ EXPORT_C_(int) GSsetupRecording(int start, void* data)
EXPORT_C GSsetGameCRC(uint32 crc, int options)
{
int userHacks_DisableCrcHacks1 = !!theApp.GetConfig("UserHacks", 0) ? theApp.GetConfig( "UserHacks_DisableCrcHacks", 0 ) : 0;
if (!userHacks_DisableCrcHacks1)
s_gs->SetGameCRC(crc, options);
else
s_gs->SetGameCRC(0xfffffffe, options);
}
EXPORT_C GSgetLastTag(uint32* tag)

View File

@ -545,13 +545,13 @@ CRC::Game CRC::Lookup(uint32 crc)
if(crcDups)
printf("[FIXME] GSdx: Duplicate CRC: Overall: %d\n", crcDups);
}
#ifndef DISABLE_CRC_HACKS
hash_map<uint32, Game*>::iterator i = m_map.find(crc);
if(i != m_map.end())
{
return *i->second;
}
#endif
return m_games[0];
}

View File

@ -173,12 +173,8 @@ void GSRendererHW::Draw()
{
if(m_dev->IsLost()) return;
#ifndef DISABLE_CRC_HACKS
if(GSRenderer::IsBadFrame(m_skip, m_userhacks_skipdraw)) return;
#endif
GSDrawingEnvironment& env = m_env;
GSDrawingContext* context = m_context;
@ -258,7 +254,7 @@ void GSRendererHW::Draw()
s_n++;
}
if(m_hacks.m_oi && !(this->*m_hacks.m_oi)(rt->m_texture, ds->m_texture, tex))
if(!userHacks_DisableCrcHacks && m_hacks.m_oi && !(this->*m_hacks.m_oi)(rt->m_texture, ds->m_texture, tex))
{
return;
}

View File

@ -32,12 +32,6 @@
//#define DISABLE_HW_TEXTURE_CACHE // Slow but fixes a lot of bugs
//#define DISABLE_CRC_HACKS // Disable all game specific hacks
#if defined(DISABLE_HW_TEXTURE_CACHE) && !defined(DISABLE_CRC_HACKS)
#define DISABLE_CRC_HACKS
#endif
//#define DISABLE_BITMASKING
//#define DISABLE_COLCLAMP