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

GregMiscellaneous: zzogl-pg: Disable the Resolve messages by default. 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3848 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-09-28 10:40:08 +00:00
parent 175afa91b1
commit c48a820cd5
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/zzogl-pg/opengl/targets.cpp
View File

@ -2972,12 +2972,16 @@ void FlushTransferRanges(const tex0Info* ptex)
#endif #endif
//#define LOG_RESOLVE_PROFILE
template <typename Tdst, bool do_conversion> template <typename Tdst, bool do_conversion>
inline void Resolve_32_Bit(const void* psrc, int fbp, int fbw, int fbh, const int psm, u32 fbm) inline void Resolve_32_Bit(const void* psrc, int fbp, int fbw, int fbh, const int psm, u32 fbm)
{ {
u32 mask, imask; u32 mask, imask;
#ifdef LOG_RESOLVE_PROFILE
#ifdef __LINUX__ #ifdef __LINUX__
u32 startime = timeGetPreciseTime(); u32 startime = timeGetPreciseTime();
#endif
#endif #endif
if (PSMT_ISHALF(psm)) /* 16 bit */ if (PSMT_ISHALF(psm)) /* 16 bit */
@ -2998,7 +3002,10 @@ inline void Resolve_32_Bit(const void* psrc, int fbp, int fbw, int fbh, const in
int maxfbh = (MEMORY_END-fbp*256) / (sizeof(Tdst) * fbw); int maxfbh = (MEMORY_END-fbp*256) / (sizeof(Tdst) * fbw);
if( maxfbh > fbh ) maxfbh = fbh; if( maxfbh > fbh ) maxfbh = fbh;
ZZLog::Debug_Log("*** Resolve 32 bits: %dx%d in %x", maxfbh, fbw, psm);
#ifdef LOG_RESOLVE_PROFILE
ZZLog::Dev_Log("*** Resolve 32 bits: %dx%d in %x", maxfbh, fbw, psm);
#endif
// Start the src array at the end to reduce testing in loop // Start the src array at the end to reduce testing in loop
u32 raw_size = RH(Pitch(fbw))/sizeof(u32); u32 raw_size = RH(Pitch(fbw))/sizeof(u32);
@ -3049,8 +3056,10 @@ inline void Resolve_32_Bit(const void* psrc, int fbp, int fbw, int fbh, const in
} }
src -= raw_size; src -= raw_size;
} }
#ifdef LOG_RESOLVE_PROFILE
#ifdef __LINUX__ #ifdef __LINUX__
ZZLog::Error_Log("*** 32 bits: execution time %d", timeGetPreciseTime()-startime); ZZLog::Dev_Log("*** 32 bits: execution time %d", timeGetPreciseTime()-startime);
#endif
#endif #endif
} }
@ -3212,7 +3221,10 @@ void Resolve_32b(const void* psrc, int fbp, int fbw, int fbh, u32 fbm)
int maxfbh = (MEMORY_END-fbp*256) / (sizeof(Tdst) * fbw); int maxfbh = (MEMORY_END-fbp*256) / (sizeof(Tdst) * fbw);
if( maxfbh > fbh ) maxfbh = fbh; if( maxfbh > fbh ) maxfbh = fbh;
ZZLog::Error_Log("*** Resolve 32 to 32 bits: %dx%d. Frame Mask %x", maxfbh, fbw, imask);
#ifdef LOG_RESOLVE_PROFILE
ZZLog::Dev_Log("*** Resolve 32 to 32 bits: %dx%d. Frame Mask %x", maxfbh, fbw, imask);
#endif
// Start the src array at the end to reduce testing in loop // Start the src array at the end to reduce testing in loop
u32 raw_size = RH(Pitch(fbw))/sizeof(u32); u32 raw_size = RH(Pitch(fbw))/sizeof(u32);
@ -3276,8 +3288,10 @@ void Resolve_32b(const void* psrc, int fbp, int fbw, int fbh, u32 fbm)
} }
src -= raw_size; src -= raw_size;
} }
#ifdef LOG_RESOLVE_PROFILE
#ifdef __LINUX__ #ifdef __LINUX__
ZZLog::Error_Log("*** 32 bits: execution time %d (convert %d)", timeGetPreciseTime()-startime, do_conversion); ZZLog::Dev_Log("*** 32 bits: execution time %d (convert %d)", timeGetPreciseTime()-startime, do_conversion);
#endif
#endif #endif
} }