From 7ef2b43802da07b8f30b455448cb84bd1c26320d Mon Sep 17 00:00:00 2001
From: "Jonathan \"Geenz\" Goodman" <geenz@lindenlab.com>
Date: Wed, 10 Apr 2024 15:21:59 -0700
Subject: Multiple fixes for mirrors. (#1192)

* #1064 Fix for mirror surfaces going black when the roughness is set too high.

* #1130 Fix for the user's avatar not appearing in mouselook in a mirror.

* #1059 Disable mirrors on low settings per the feature table.

* #860 Modify the settings UI to better reflect that we only have two AA modes: off and FXAA.

* #1191 Add some settings for mirrors in preferences.

* #1185 Add support for runtime mirror resolution changing.  Useful for quality settings, and auto-FPS.
---
 .../en/floater_preferences_graphics_advanced.xml   | 183 +++++++++++++++------
 1 file changed, 133 insertions(+), 50 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index a3b18563d0..94c889f4e4 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -335,42 +335,10 @@
       name="FSAADisabled"
       value="0" />
     <combo_box.item
-      label="2x"
-      name="2x"
+      label="FXAA"
+      name="FXAA"
       value="2" />
-    <combo_box.item
-     label="4x"
-     name="4x"
-     value="4" />
-    <combo_box.item
-     label="8x"
-     name="8x"
-     value="8" />
-    <combo_box.item
-     label="16x"
-     name="16x"
-     value="16" />
   </combo_box>
-  <text
-    type="string"
-    length="1"
-    follows="left|top"
-    height="16"
-    layout="topleft"
-    left_pad="10"
-    name="antialiasing restart"
-    top_delta="0"
-    width="130">
-     (requires restart)
-  </text>
-   <view_border
-      bevel_style="in"
-      height="322"
-      layout="topleft"
-      left="385"
-      name="vert_border"
-      top="16"      
-      width="0"/>
   <text
     type="string"
     length="1"
@@ -378,23 +346,22 @@
     height="16"
     layout="topleft"
     name="MeshText"
-    top_delta="20"
-    left="400"
-  	top="21"
+    top_delta="16"
+    left="10"
     width="128">
-     Mesh
+    Mesh
   </text>
 
   <slider
     control_name="RenderTerrainLODFactor"
-    follows="left|top"
+    follows="topleft"
     height="16"
     increment="0.125"
     initial_value="160"
     label="Terrain Mesh Detail:"
     label_width="185"
     layout="topleft"
-    left="420"
+    left="30"
     min_val="1"
     max_val="2"
     name="TerrainMeshDetail"
@@ -408,7 +375,7 @@
   <text
     type="string"
     length="1"
-    follows="left|top"
+    follows="topleft"
     height="16"
     layout="topleft"
     name="TerrainMeshDetailText"
@@ -416,19 +383,19 @@
     top_delta="0"
     left_delta="304"
     width="65">
-       Low
+    Low
   </text>
 
   <slider
     control_name="RenderTreeLODFactor"
-    follows="left|top"
+    follows="topleft"
     height="16"
     increment="0.125"
     initial_value="160"
     label="Trees:"
     label_width="185"
     layout="topleft"
-    left="420"
+    left="30"
     name="TreeMeshDetail"
     show_text="false"
     top_delta="16"
@@ -447,7 +414,7 @@
     top_delta="0"
     left_delta="304"
     width="65">
-       Low
+    Low
   </text>
 
   <slider
@@ -459,7 +426,7 @@
     label="Objects:"
     label_width="185"
     layout="topleft"
-    left="420"
+    left="30"
     min_val="0"
     max_val="4"
     name="ObjectMeshDetail"
@@ -480,7 +447,7 @@
     top_delta="0"
     left_delta="304"
     width="65">
-       Low
+    Low
   </text>
 
   <slider
@@ -491,7 +458,7 @@
     label="Flexiprims:"
     label_width="185"
     layout="topleft"
-    left="420"
+    left="30"
     name="FlexibleMeshDetail"
     show_text="false"
     top_delta="16"
@@ -510,8 +477,28 @@
     top_delta="0"
     left_delta="304"
     width="65">
-       Low
+    Low
   </text>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left_pad="10"
+    name="antialiasing restart"
+    top_delta="0"
+    width="130">
+     (requires restart)
+  </text>
+   <view_border
+      bevel_style="in"
+      height="322"
+      layout="topleft"
+      left="385"
+      name="vert_border"
+      top="16"      
+      width="0"/>
   
   <text
     type="string"
@@ -520,7 +507,7 @@
     height="16"
     layout="topleft"
     name="ShadersText"
-    top_delta="20"
+    top_delta="-10"
     left="400"
     width="128">
      Shaders
@@ -747,6 +734,102 @@
     width="260">
   </slider>
 
+  <!-- Mirror settings. -->
+  <check_box
+    control_name="RenderMirrors"
+    height="16"
+    initial_value="false"
+    label="Mirrors"
+    layout="topleft"
+    left="420"
+    name="Mirrors"
+    top_delta="24"
+    width="240">
+    <check_box.commit_callback
+      function="Pref.RenderOptionUpdate" />
+  </check_box>
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left="420"
+    name="MirrorResolutionText"
+    text_readonly_color="LabelDisabledColor"
+    top_delta="22"
+    width="128">
+    Mirror Resolution:
+  </text>
+
+  <combo_box
+   control_name="RenderHeroProbeResolution"
+   height="18"
+   layout="topleft"
+   left_delta="130"
+   top_delta="0"
+   name="MirrorResolution"
+   width="150">
+    <combo_box.item
+      label="256"
+      name="0"
+      value="256"/>
+    <combo_box.item
+      label="512"
+      name="1"
+      value="512"/>
+    <combo_box.item
+      label="1024"
+      name="2"
+      value="1024"/>
+    <combo_box.item
+      label="2048"
+      name="3"
+      value="2048"/>
+  </combo_box>
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left="420"
+    name="HeroProbeUpdateText"
+    text_readonly_color="LabelDisabledColor"
+    top_delta="22"
+    width="128">
+    Mirror Update Rate:
+  </text>
+
+  <combo_box
+   control_name="RenderHeroProbeUpdateRate"
+   height="18"
+   layout="topleft"
+   left_delta="130"
+   top_delta="0"
+   name="HeroProbeUpdateRate"
+   width="150">
+    <combo_box.item
+      label="Every Frame"
+      name="0"
+      value="1"/>
+    <combo_box.item
+      label="Every 2nd Frame"
+      name="1"
+      value="2"/>
+    <combo_box.item
+      label="Every 3rd Frame"
+      name="2"
+      value="3"/>
+    <combo_box.item
+      label="Every 4th Frame"
+      name="3"
+      value="4"/>
+  </combo_box>
+  <!-- End of mirror settings -->
+
   <!-- End of Advanced Settings block -->
 	<view_border
       bevel_style="in"
-- 
cgit v1.2.3