From 2b2a5da0990def249dc028e0bb842843e51feed1 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 7 Mar 2022 17:16:29 -0600
Subject: [PATCH] SL-16972 Fix for blurry textures when "running out" of system
memory.
---
indra/newview/app_settings/settings.xml | 2 +-
indra/newview/lltextureview.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2212f7fbdf6..ebf9bfcfe8a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6487,7 +6487,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>1.6</real>
+ <real>4.0</real>
</map>
<key>MaxPersistentNotifications</key>
<map>
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp
index 0438ee2aaef..b74577315e3 100644
--- a/indra/newview/lltextureview.cpp
+++ b/indra/newview/lltextureview.cpp
@@ -549,10 +549,11 @@ void LLGLTexMemBar::draw()
U32 texFetchLatMed = U32(recording.getMean(LLTextureFetch::sTexFetchLatency).value() * 1000.0f);
U32 texFetchLatMax = U32(recording.getMax(LLTextureFetch::sTexFetchLatency).value() * 1000.0f);
- text = llformat("GL Tot: %d/%d MB GL Free: %d MB Bound: %4d/%4d MB FBO: %d MB Raw Tot: %d MB Bias: %.2f Cache: %.1f/%.1f MB",
+ text = llformat("GL Tot: %d/%d MB GL Free: %d Sys Free: %d MB Bound: %4d/%4d MB FBO: %d MB Raw Tot: %d MB Bias: %.2f Cache: %.1f/%.1f MB",
total_mem.value(),
max_total_mem.value(),
LLImageGLThread::getFreeVRAMMegabytes(),
+ LLMemory::getAvailableMemKB()/1024,
bound_mem.value(),
max_bound_mem.value(),
LLRenderTarget::sBytesAllocated/(1024*1024),
--
GitLab