diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-03-11 19:02:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-11 19:02:27 +0200 |
| commit | 8297b923f0bec459ca2bfa916cf777ac5aa3af9e (patch) | |
| tree | 29df581352a6b0bfd1964b23c41b80db038f58a5 /indra/newview/app_settings | |
| parent | f02a400134d83a12f43151c3dba32732bf88fd8c (diff) | |
| parent | 8bb35ac0299eae3c6cd71bedd0acb85d5819d462 (diff) | |
Merge branch 'release/2025.03' into marchcat/2025.03-maint-b
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl | 1 |
2 files changed, 12 insertions, 0 deletions
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)); } |