From a81364b080236e2b99169800546ad4e61c266d98 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 10 May 2016 10:36:37 +0200 Subject: [PATCH] Don't clamp physical system memory clamped to 4GB --- indra/newview/llviewertexturelist.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index d1a753507d..373bec99fe 100755 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -1392,7 +1392,10 @@ 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 + // Texture memory management + //S32Megabytes system_ram = gSysMemory.getPhysicalMemoryClamped(); // In MB + S32Megabytes system_ram = gSysMemory.getPhysicalMemoryKB(); // In MB + // //LL_INFOS() << "*** DETECTED " << system_ram << " MB of system memory." << LL_ENDL; if (get_recommended) max_texmem = llmin(max_texmem, system_ram/2); @@ -1498,7 +1501,10 @@ void LLViewerTextureList::updateMaxResidentTexMem(S32Megabytes mem) // //system mem - S32Megabytes system_ram = gSysMemory.getPhysicalMemoryClamped(); + // Texture memory management + //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;