livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-7326 Increased default texture and vfs cache size

meow-7.2.2
andreykproductengine 2017-07-13 19:17:07 +03:00
parent ab26a70047
commit 31ff6baf68
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings.xml
View File

@ -1393,7 +1393,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>512</integer>
<integer>1024</integer>
</map>
<key>CacheValidateCounter</key>
<map>

14
indra/newview/llappviewer.cpp
View File

@ -4397,23 +4397,15 @@ bool LLAppViewer::initCache()
// Init the texture cache
// Allocate 80% of the cache size for textures
const S32 MB = 1024 * 1024;
const S64 MIN_CACHE_SIZE = 64 * MB;
const S64 MIN_CACHE_SIZE = 256 * MB;
const S64 MAX_CACHE_SIZE = 9984ll * MB;
const S64 MAX_VFS_SIZE = 1024 * MB; // 1 GB
S64 cache_size = (S64)(gSavedSettings.getU32("CacheSize")) * MB;
cache_size = llclamp(cache_size, MIN_CACHE_SIZE, MAX_CACHE_SIZE);
S64 texture_cache_size = ((cache_size * 8) / 10);
S64 vfs_size = cache_size - texture_cache_size;
if (vfs_size > MAX_VFS_SIZE)
{
// Give the texture cache more space, since the VFS can't be bigger than 1GB.
// This happens when the user's CacheSize setting is greater than 5GB.
vfs_size = MAX_VFS_SIZE;
texture_cache_size = cache_size - MAX_VFS_SIZE;
}
S64 vfs_size = llmin((S64)((cache_size * 2) / 10), MAX_VFS_SIZE);
S64 texture_cache_size = cache_size - vfs_size;
S64 extra = LLAppViewer::getTextureCache()->initCache(LL_PATH_CACHE, texture_cache_size, texture_cache_mismatch);
texture_cache_size -= extra;

2
indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
View File

@ -32,7 +32,7 @@
height="23"
increment="64"
initial_value="1024"
label="Cache size (64 - 9984MB)"
label="Cache size (256 - 9984MB)"
label_width="150"
layout="topleft"
left="80"