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

Merge pull request #460 from degasus/efbcache 

OGL: speed up the EFB cache.
This commit is contained in:
Tony Wasserka 2014-06-05 16:28:35 +02:00
parent 40031c9a72 9566dcf0da
commit 318b03ec92
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/VideoBackends/OGL/Render.cpp
View File

@ -110,6 +110,7 @@ static const u32 EFB_CACHE_RECT_SIZE = 64; // Cache 64x64 blocks.
static const u32 EFB_CACHE_WIDTH = (EFB_WIDTH + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_RECT_SIZE; // round up static const u32 EFB_CACHE_WIDTH = (EFB_WIDTH + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_RECT_SIZE; // round up
static const u32 EFB_CACHE_HEIGHT = (EFB_HEIGHT + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_RECT_SIZE; static const u32 EFB_CACHE_HEIGHT = (EFB_HEIGHT + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_RECT_SIZE;
static bool s_efbCacheValid[2][EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT]; static bool s_efbCacheValid[2][EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT];
static bool s_efbCacheIsCleared = false;
static std::vector<u32> s_efbCache[2][EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT]; // 2 for PEEK_Z and PEEK_COLOR static std::vector<u32> s_efbCache[2][EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT]; // 2 for PEEK_Z and PEEK_COLOR
int GetNumMSAASamples(int MSAAMode) int GetNumMSAASamples(int MSAAMode)
@ -615,6 +616,7 @@ Renderer::Renderer()
} }
} }
UpdateActiveConfig(); UpdateActiveConfig();
ClearEFBCache();
} }
Renderer::~Renderer() Renderer::~Renderer()
@ -882,11 +884,11 @@ void Renderer::SetColorMask()
void ClearEFBCache() void ClearEFBCache()
{ {
for (u32 i = 0; i < EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT; ++i) if (!s_efbCacheIsCleared)
s_efbCacheValid[0][i] = false; {
s_efbCacheIsCleared = true;
for (u32 i = 0; i < EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT; ++i) memset(s_efbCacheValid, 0, sizeof(s_efbCacheValid));
s_efbCacheValid[1][i] = false; }
} }
void Renderer::UpdateEFBCache(EFBAccessType type, u32 cacheRectIdx, const EFBRectangle& efbPixelRc, const TargetRectangle& targetPixelRc, const u32* data) void Renderer::UpdateEFBCache(EFBAccessType type, u32 cacheRectIdx, const EFBRectangle& efbPixelRc, const TargetRectangle& targetPixelRc, const u32* data)
@ -916,6 +918,7 @@ void Renderer::UpdateEFBCache(EFBAccessType type, u32 cacheRectIdx, const EFBRec
} }
s_efbCacheValid[cacheType][cacheRectIdx] = true; s_efbCacheValid[cacheType][cacheRectIdx] = true;
s_efbCacheIsCleared = false;
} }
// This function allows the CPU to directly access the EFB. // This function allows the CPU to directly access the EFB.