Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use a same-everywhere quick hash for now.

Browse source
This commit is contained in:
Unknown W. Brackets 2016-04-30 16:26:18 -07:00
parent 4f3bac1b0a
commit f039259a1a
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/TextureReplacer.cpp
View file

@ -160,7 +160,7 @@ u32 TextureReplacer::ComputeHash(u32 addr, int bufw, int w, int h, GETextureForm
const u32 *checkp = (const u32 *)Memory::GetPointer(addr); const u32 *checkp = (const u32 *)Memory::GetPointer(addr);
switch (hash_) { switch (hash_) {
case ReplacedTextureHash::QUICK: case ReplacedTextureHash::QUICK:
return DoQuickTexHash(checkp, sizeInRAM); return StableQuickTexHash(checkp, sizeInRAM);
default: default:
return 0; return 0;
} }

2
GPU/Common/TextureDecoder.cpp
View file

@ -301,6 +301,7 @@ void DoUnswizzleTex16Basic(const u8 *texptr, u32 *ydestp, int bxc, int byc, u32
#ifndef _M_SSE #ifndef _M_SSE
#ifndef ARM64 #ifndef ARM64
QuickTexHashFunc DoQuickTexHash = &QuickTexHashBasic; QuickTexHashFunc DoQuickTexHash = &QuickTexHashBasic;
QuickTexHashFunc StableQuickTexHash = &QuickTexHashNonSSE;
UnswizzleTex16Func DoUnswizzleTex16 = &DoUnswizzleTex16Basic; UnswizzleTex16Func DoUnswizzleTex16 = &DoUnswizzleTex16Basic;
ReliableHash32Func DoReliableHash32 = &XXH32; ReliableHash32Func DoReliableHash32 = &XXH32;
ReliableHash64Func DoReliableHash64 = &XXH64; ReliableHash64Func DoReliableHash64 = &XXH64;
@ -312,6 +313,7 @@ void SetupTextureDecoder() {
#ifdef HAVE_ARMV7 #ifdef HAVE_ARMV7
if (cpu_info.bNEON) { if (cpu_info.bNEON) {
DoQuickTexHash = &QuickTexHashNEON; DoQuickTexHash = &QuickTexHashNEON;
StableQuickTexHash = &QuickTexHashNEON;
DoUnswizzleTex16 = &DoUnswizzleTex16NEON; DoUnswizzleTex16 = &DoUnswizzleTex16NEON;
#ifndef IOS #ifndef IOS
// Not sure if this is safe on iOS, it's had issues with xxhash. // Not sure if this is safe on iOS, it's had issues with xxhash.

3
GPU/Common/TextureDecoder.h
View file

@ -39,6 +39,7 @@ void DoSwizzleTex16(const u32 *ysrcp, u8 *texptr, int bxc, int byc, u32 pitch);
#if defined(_M_SSE) #if defined(_M_SSE)
u32 QuickTexHashSSE2(const void *checkp, u32 size); u32 QuickTexHashSSE2(const void *checkp, u32 size);
#define DoQuickTexHash QuickTexHashSSE2 #define DoQuickTexHash QuickTexHashSSE2
#define StableQuickTexHash QuickTexHashSSE2
// Pitch must be aligned to 16 bits (as is the case on a PSP) // Pitch must be aligned to 16 bits (as is the case on a PSP)
void DoUnswizzleTex16Basic(const u8 *texptr, u32 *ydestp, int bxc, int byc, u32 pitch); void DoUnswizzleTex16Basic(const u8 *texptr, u32 *ydestp, int bxc, int byc, u32 pitch);
@ -59,6 +60,7 @@ typedef u32 ReliableHashType;
// For ARM64, NEON is mandatory, so we also statically link. // For ARM64, NEON is mandatory, so we also statically link.
#elif defined(ARM64) #elif defined(ARM64)
#define DoQuickTexHash QuickTexHashNEON #define DoQuickTexHash QuickTexHashNEON
#define StableQuickTexHash QuickTexHashNEON
#define DoUnswizzleTex16 DoUnswizzleTex16NEON #define DoUnswizzleTex16 DoUnswizzleTex16NEON
#define DoReliableHash32 ReliableHash32NEON #define DoReliableHash32 ReliableHash32NEON
@ -71,6 +73,7 @@ typedef u64 ReliableHashType;
#else #else
typedef u32 (*QuickTexHashFunc)(const void *checkp, u32 size); typedef u32 (*QuickTexHashFunc)(const void *checkp, u32 size);
extern QuickTexHashFunc DoQuickTexHash; extern QuickTexHashFunc DoQuickTexHash;
extern QuickTexHashFunc StableQuickTexHash;
typedef void (*UnswizzleTex16Func)(const u8 *texptr, u32 *ydestp, int bxc, int byc, u32 pitch); typedef void (*UnswizzleTex16Func)(const u8 *texptr, u32 *ydestp, int bxc, int byc, u32 pitch);
extern UnswizzleTex16Func DoUnswizzleTex16; extern UnswizzleTex16Func DoUnswizzleTex16;