Merge pull request #1785 from degasus/custom_texture

VideoCommon: Custom texture handling
This commit is contained in:
Markus Wick
2015-01-08 13:29:45 +01:00
6 changed files with 178 additions and 193 deletions

View File

@ -510,19 +510,15 @@ u64 GetHash64(const u8 *src, int len, u32 samples)
}
// sets the hash function used for the texture cache
void SetHash64Function(bool useHiresTextures)
void SetHash64Function()
{
if (useHiresTextures)
{
ptrHashFunction = &GetHashHiresTexture;
}
#if _M_SSE >= 0x402
else if (cpu_info.bSSE4_2 && !useHiresTextures) // sse crc32 version
if (cpu_info.bSSE4_2) // sse crc32 version
{
ptrHashFunction = &GetCRC32;
}
#endif
else
#endif
{
ptrHashFunction = &GetMurmurHash3;
}

View File

@ -16,4 +16,4 @@ u64 GetCRC32(const u8 *src, int len, u32 samples); // SSE4.2 version of CRC32
u64 GetHashHiresTexture(const u8 *src, int len, u32 samples);
u64 GetMurmurHash3(const u8 *src, int len, u32 samples);
u64 GetHash64(const u8 *src, int len, u32 samples);
void SetHash64Function(bool useHiresTextures);
void SetHash64Function();