From 225d174ec6349ed8210b07b812f2c1e73f1eb088 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Thu, 18 Jul 2019 01:33:47 -0500 Subject: [PATCH] MIN_MEM_FOR_NON_TEXTURE setting doesn't work well with new math. Lower signifigantly. --- indra/llwindow/lldxhardware.cpp | 1 + indra/newview/llviewertexturelist.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/indra/llwindow/lldxhardware.cpp b/indra/llwindow/lldxhardware.cpp index ed63b32b3..0fd314c72 100644 --- a/indra/llwindow/lldxhardware.cpp +++ b/indra/llwindow/lldxhardware.cpp @@ -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; diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index acbcfcd35..d49210b6d 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -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