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

call LLViewerTexture::isMemoryForTextureLow() less often and only for ATI cards.

meow-7.2.2
Xiaohong Bao 2011-12-05 16:28:13 -07:00
parent c278f259c6
commit 01d68a9f15
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
indra/newview/llviewertexture.cpp
View File

@ -420,8 +420,17 @@ F32 texmem_middle_bound_scale = 0.925f;
//static
bool LLViewerTexture::isMemoryForTextureLow()
{
const static S32 MIN_FREE_TEXTURE_MEMORY = 5 ; //MB
const static S32 MIN_FREE_MAIN_MEMORy = 100 ; //MB
const F32 WAIT_TIME = 1.0f ; //second
static LLFrameTimer timer ;
if(timer.getElapsedTimeF32() < WAIT_TIME) //call this once per second.
{
return false;
}
timer.reset() ;
const S32 MIN_FREE_TEXTURE_MEMORY = 5 ; //MB
const S32 MIN_FREE_MAIN_MEMORy = 100 ; //MB
bool low_mem = false ;
if (gGLManager.mHasATIMemInfo)
@ -433,6 +442,15 @@ bool LLViewerTexture::isMemoryForTextureLow()
{
low_mem = true ;
}
if(!low_mem) //check main memory, only works for windows.
{
LLMemory::updateMemoryInfo() ;
if(LLMemory::getAvailableMemKB() / 1024 < MIN_FREE_MAIN_MEMORy)
{
low_mem = true ;
}
}
}
#if 0 //ignore nVidia cards
else if (gGLManager.mHasNVXMemInfo)
@ -445,16 +463,7 @@ bool LLViewerTexture::isMemoryForTextureLow()
low_mem = true ;
}
}
#endif
if(!low_mem) //check main memory, only works for windows.
{
LLMemory::updateMemoryInfo() ;
if(LLMemory::getAvailableMemKB() / 1024 < MIN_FREE_MAIN_MEMORy)
{
low_mem = true ;
}
}
#endif
return low_mem ;
}