Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

Browse Source
This commit is contained in:
Lirusaito
2019-03-18 14:38:21 -04:00
parent beddc1cb21 30f6dc2b2d
commit bb26127ed5
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llviewertexture.cpp
View File

@@ -65,7 +65,7 @@
// extern
const S32Megabytes gMinVideoRam(32);
const S32Megabytes gMaxVideoRam(2048);
const S32Megabytes gMaxVideoRam(2048*4); // Bump to 8 gibibyte.
// statics

7
indra/newview/llviewertexturelist.cpp
View File

@@ -1284,7 +1284,7 @@ LLPointer<LLImageJ2C> LLViewerTextureList::convertToUploadFile(LLPointer<LLImage
// Returns min setting for TextureMemory (in MB)
S32Megabytes LLViewerTextureList::getMinVideoRamSetting()
{
S32Megabytes system_ram = gSysMemory.getPhysicalMemoryClamped();
S32Megabytes system_ram = gSysMemory.getPhysicalMemoryKB();
//min texture mem sets to 64M if total physical mem is more than 1.5GB
return (system_ram > S32Megabytes(1500)) ? S32Megabytes(64) : gMinVideoRam ;
}
@@ -1328,8 +1328,7 @@ S32Megabytes LLViewerTextureList::getMaxVideoRamSetting(bool get_recommended, fl
LL_WARNS() << "VRAM amount not detected, defaulting to " << max_texmem << " MB" << LL_ENDL;
}
S32Megabytes system_ram = gSysMemory.getPhysicalMemoryClamped(); // In MB
//LL_INFOS() << "*** DETECTED " << system_ram << " MB of system memory." << LL_ENDL;
S32Megabytes system_ram = gSysMemory.getPhysicalMemoryKB(); // In MB
if (get_recommended)
max_texmem = llmin(max_texmem, system_ram/2);
else
@@ -1381,7 +1380,7 @@ void LLViewerTextureList::updateMaxResidentTexMem(S32Megabytes mem)
}
//system mem
S32Megabytes system_ram = gSysMemory.getPhysicalMemoryClamped();
S32Megabytes system_ram = gSysMemory.getPhysicalMemoryKB();
//minimum memory reserved for non-texture use.
//if system_raw >= 1GB, reserve at least 512MB for non-texture use;