From 5ce0c5858c387346b7b8923ec55b4cee3f1c4d12 Mon Sep 17 00:00:00 2001
From: "Jonathan \"Geenz\" Goodman" <geenz@lindenlab.com>
Date: Tue, 11 Mar 2025 00:40:36 -0400
Subject: #3409 Make maximum probe count adjustable. (#3709)

* #3409 Make probe count adjustable to better accomodate low VRAM scenarios
---
 indra/newview/app_settings/settings.xml                       | 11 +++++++++++
 .../app_settings/shaders/class1/deferred/deferredUtil.glsl    |  1 +
 2 files changed, 12 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 594f40e5a1..0c83355a81 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9076,6 +9076,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+    <key>RenderReflectionProbeCount</key>
+    <map>
+        <key>Comment</key>
+        <string>Number of probes to render.  Maximum of 256.  Clamps to the nearest power of 2.</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>U32</string>
+        <key>Value</key>
+        <integer>256</integer>
+    </map>
   <key>RenderReflectionProbeResolution</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl b/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl
index 0283104a76..dba9c46332 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl
@@ -87,6 +87,7 @@ vec3 clampHDRRange(vec3 color)
     // This is a safety measure to prevent that.
     // As to the specific number there - allegedly some HDR displays expect values to be in the 0-11.2 range. Citation needed.
     // -Geenz 2025-03-05
+    color = mix(color, vec3(1), isinf(color));
     color = mix(color, vec3(0.0), isnan(color));
     return clamp(color, vec3(0.0), vec3(11.2));
 }
-- 
cgit v1.2.3