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

MIN_MEM_FOR_NON_TEXTURE setting doesn't work well with new math. Lower signifigantly.

Browse Source
This commit is contained in:
Shyotl
2019-07-18 01:33:47 -05:00
parent 3bc4d6fd63
commit 225d174ec6
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llwindow/lldxhardware.cpp
View File

@@ -546,6 +546,7 @@ BOOL LLDXHardware::getInfo(BOOL vram_only, S32Megabytes system_ram)
mVRAM -= ((S32)system_ram/2) + 1; // Ignore shared memory pool.
if (mVRAM <= 0)
{
LL_INFOS("AppInit") << "No dedicated VRAM. Using system memory instead." << LL_ENDL;
mVRAM = (S32)system_ram / 2; // Integrated graphics perhaps? Use half system ram.
}
LL_INFOS("AppInit") << "VRAM Detected: " << mVRAM << " DX9 string: " << ram_str << LL_ENDL;

4
indra/newview/llviewertexturelist.cpp
View File

@@ -1334,7 +1334,7 @@ S32Megabytes LLViewerTextureList::getMaxVideoRamSetting(bool get_recommended, fl
LL_INFOS() << "system_ram: " << system_ram << LL_ENDL;
LL_INFOS() << "max_texmem: " << max_texmem << LL_ENDL;
if (get_recommended)
max_texmem = llmin(max_texmem, system_ram/2);
max_texmem = llmin(S32Megabytes(max_texmem * .7f), system_ram/2);
else
max_texmem = llmin(max_texmem, system_ram);
@@ -1348,7 +1348,7 @@ S32Megabytes LLViewerTextureList::getMaxVideoRamSetting(bool get_recommended, fl
const S32Megabytes VIDEO_CARD_FRAMEBUFFER_MEM_MIN(12);
const S32Megabytes VIDEO_CARD_FRAMEBUFFER_MEM_MAX(512);
const S32Megabytes MIN_MEM_FOR_NON_TEXTURE(512);
const S32Megabytes MIN_MEM_FOR_NON_TEXTURE(16);
void LLViewerTextureList::updateMaxResidentTexMem(S32Megabytes mem)
{
// Initialize the image pipeline VRAM settings