Merge remote-tracking branch 'mobserveur/experimental2'

1 files changed, 299 insertions, 50 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml
index 8b76ece106..ddc00915a5 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml
@@ -299,6 +299,71 @@ font="SansSerifSmall"
 Beware: SMAA + Sharpness currently causes a slow down on Mac.
 </text>
 
+<text
+follows="left|top"
+layout="topleft"
+width="400"
+height="18"
+left="55"
+top_pad="12"
+font="SansSerifSmall"
+>
+Disabling HUDS (Option + Shift + H) fixes the issue.
+</text>
+
+<text
+name="aniso_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="20"
+top_pad="40"
+font="SansSerifSmall"
+text_color="White"
+>
+Texture Filtering
+</text>
+
+<check_box
+name="mp_aniso_ctrl"
+control_name="RenderAnisotropic"
+label="Anisotropic Filtering"
+layout="topleft"
+width="200"
+height="16"
+left="20"
+top_delta="32"
+initial_value="true"
+>
+<check_box.commit_callback
+function="Pref.RenderOptionUpdate" />
+</check_box>
+
+<icon
+name="mp_aniso_bullet"
+tool_tip="Low performance impact on PC/Linux, Medium performance impact on Mac (We are investigating)"
+image_name="mp_yellow_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<icon
+name="mp_aniso_info_bullet"
+tool_tip="Improves textures clarity at certain angles (i.e. ground). This should be on, but on Mac there is an abnormal performance penalty, currently."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
 </panel>
 
 <panel
@@ -886,7 +951,7 @@ top_delta="-1"
 increment="0.1"
 initial_value="1.0"
 min_val="0.5"
-max_val="2.0"
+max_val="4.0"
 label_width="2"
 >
 </slider>
@@ -1542,12 +1607,26 @@ name="preferences_visuals_others"
 layout="topleft"
 follows="top|left">
 
+<text
+name="mp_aa_lbl"
+follows="left|top"
+layout="topleft"
+top_pad="20"
+width="400"
+height="18"
+left="20"
+font="SansSerifSmall"
+text_color="White"
+>
+Visual Quality Settings:
+</text>
+
 <check_box
 name="VintageCtrl"
 control_name="RenderDisableVintageMode"
 label="HDR and Emissive"
 layout="topleft"
-width="250"
+width="300"
 height="16"
 left="20"
 top_delta="32"
@@ -1565,7 +1644,7 @@ follows="left|top"
 width="16"
 height="16"
 layout="topleft"
-left_pad="5"
+left_pad="8"
 top_delta="-2"
 />
 
@@ -1586,7 +1665,7 @@ name="mp_transparent_water"
 control_name="RenderTransparentWater"
 label="Transparent Water"
 layout="topleft"
-width="250"
+width="300"
 height="16"
 left="20"
 top_delta="32"
@@ -1604,7 +1683,7 @@ follows="left|top"
 width="16"
 height="16"
 layout="topleft"
-left_pad="5"
+left_pad="8"
 top_delta="-2"
 />
 
@@ -1620,45 +1699,6 @@ left_pad="5"
 top_delta="0"
 />
 
-<check_box
-name="colorPrecisionCtrl"
-control_name="MPLowColorPrecision"
-label="Lower color precision (needs restart)"
-layout="topleft"
-width="250"
-height="16"
-left="20"
-top_delta="32"
-initial_value="false"
->
-<check_box.commit_callback
-function="Pref.RenderOptionUpdate" />
-</check_box>
-
-<icon
-name="mp_lowcolor_bullet"
-tool_tip="Can help performance specially in high resolution"
-image_name="mp_green_bullet"
-follows="left|top"
-width="16"
-height="16"
-layout="topleft"
-left_pad="5"
-top_delta="-2"
-/>
-
-<icon
-name="mp_lowcolor_info_bullet"
-tool_tip="Lowers the internal color precision which can help with performance."
-image_name="mp_info_bullet"
-follows="left|top"
-width="16"
-height="16"
-layout="topleft"
-left_pad="5"
-top_delta="0"
-/>
-
 <text
 name="mp_resdiv_lbl"
 follows="left|top"
@@ -1681,9 +1721,9 @@ height="16"
 left_delta="150"
 top_delta="-1"
 initial_value="1.0"
-increment="0.25"
-min_val="1.0"
-max_val="4.0"
+increment="0.1"
+min_val="0.8"
+max_val="2.0"
 decimal_digits="2"
 label_width="2">
 </slider>
@@ -1696,12 +1736,25 @@ name="preferences_visuals_others"
 layout="topleft"
 follows="top|left">
 
+<text
+follows="left|top"
+layout="topleft"
+top_pad="20"
+width="400"
+height="18"
+left="20"
+font="SansSerifSmall"
+text_color="White"
+>
+Advanced settings:
+</text>
+
 <check_box
 name="MultiTexCtrl"
 control_name="RenderGLMultiThreadedTextures"
 label="Multithreaded Textures"
 layout="topleft"
-width="250"
+width="400"
 height="16"
 left="20"
 top_delta="32"
@@ -1738,7 +1791,7 @@ name="AppleMultGLCtrl"
 control_name="RenderAppleUseMultGL"
 label="Apple Multithreaded OpenGL"
 layout="topleft"
-width="250"
+width="400"
 height="16"
 left="20"
 top_delta="32"
@@ -1770,12 +1823,194 @@ left_pad="5"
 top_delta="0"
 />
 
+<text
+name="color_precision_lbl"
+follows="left|top"
+layout="topleft"
+width="200"
+height="18"
+left="32"
+top_pad="20"
+font="SansSerifSmall"
+>
+Color precision (needs restart):
+</text>
+
+<combo_box
+name="colorPrecisionCtrl"
+control_name="MPColorPrecision"
+layout="topleft"
+width="80"
+height="18"
+left_pad="8"
+top_delta="0"
+>
+<combo_box.item
+label="Low"
+name="low"
+value="1"/>
+<combo_box.item
+label="Default"
+name="default"
+value="0"/>
+<combo_box.item
+label="High"
+name="high"
+value="2"/>
+</combo_box>
+
+<icon
+name="mp_lowcolor_bullet"
+tool_tip="Low setting can help performance specially in high resolution"
+image_name="mp_green_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="104"
+top_delta="-2"
+/>
+
+<icon
+name="mp_lowcolor_info_bullet"
+tool_tip="Sets the internal color resolution. Improves the speed or quality."
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="0"
+/>
+
+<text
+follows="left|top"
+layout="topleft"
+top_pad="30"
+width="400"
+height="18"
+left="20"
+font="SansSerifSmall"
+text_color="White"
+>
+HDR Display (Experimental - Mac only):
+</text>
+
+<icon
+name="mp_hdrd_bullet"
+tool_tip="You need an Apple hdr/xdr display"
+image_name="mp_info_bullet"
+follows="left|top"
+width="16"
+height="16"
+layout="topleft"
+left_pad="5"
+top_delta="-2"
+/>
+
+<text
+follows="left|top"
+layout="topleft"
+width="400"
+height="18"
+left="20"
+top_pad="12"
+font="SansSerifSmall"
+text_color="White"
+>
+Warning: HDR shows extreme luminosity contrast. Use carefully!
+</text>
+
+<check_box
+name="HDRDisplayCtrl"
+control_name="MPHDRDisplay"
+label="HDR Display (Mac)"
+layout="topleft"
+width="250"
+height="16"
+left="20"
+top_delta="32"
+initial_value="true"
+>
+</check_box>
+
+<text
+name="mp_hdrd_gamma_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="16"
+font="SansSerifSmall"
+>
+Gamma
+</text>
+
+<slider
+control_name="MPHDRGamma"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+initial_value="2.2"
+increment="0.05"
+min_val="1.8"
+max_val="2.6"
+decimal_digits="2"
+label_width="2">
+</slider>
+
+<text
+name="mp_hdrd_uiboost_lbl"
+follows="left|top"
+layout="topleft"
+width="140"
+height="18"
+left="32"
+top_pad="16"
+font="SansSerifSmall"
+>
+UI Luminosity Boost
+</text>
+
+<slider
+control_name="MPHDRUIBoost"
+follows="left|top"
+layout="topleft"
+width="200"
+height="16"
+left_delta="150"
+top_delta="-1"
+initial_value="1.0"
+increment="0.1"
+min_val="1.0"
+max_val="1.4"
+decimal_digits="2"
+label_width="2">
+</slider>
+
+<text
+follows="left|top"
+layout="topleft"
+top_pad="30"
+width="400"
+height="18"
+left="20"
+font="SansSerifSmall"
+text_color="White"
+>
+Developer settings:
+</text>
+
 <check_box
 name="NoGLDebugCtrl"
 control_name="MPNoGLDebug"
 label="No GL Debug"
 layout="topleft"
-width="250"
+width="400"
 height="16"
 left="20"
 top_delta="32"
@@ -1807,8 +2042,22 @@ left_pad="5"
 top_delta="0"
 />
 
+<check_box
+name="MPAppleVBModeCtrl"
+control_name="MPVertexBufferMode"
+label="Megapahit Vertex Buffer Mode (needs restart)"
+layout="topleft"
+width="400"
+height="16"
+left="20"
+top_delta="32"
+initial_value="false"
+>
+</check_box>
+
 </panel>
 
+
 </tab_container>
 
 </panel>
\ No newline at end of file