Visual Polish Alpha

indra/llrender/llshadermgr.cpp

@@ -1386,6 +1386,10 @@ void LLShaderMgr::initAttribsAndUniforms()
     mReservedUniforms.push_back("glossySampleCount");
     mReservedUniforms.push_back("noiseSine");
     mReservedUniforms.push_back("adaptiveStepMultiplier");
+    mReservedUniforms.push_back("splitParamsStart");
+    mReservedUniforms.push_back("splitParamsEnd");
+    mReservedUniforms.push_back("maxZDepth");
+    mReservedUniforms.push_back("maxRoughness");
 
     mReservedUniforms.push_back("modelview_delta");
     mReservedUniforms.push_back("inv_modelview_delta");

indra/llrender/llshadermgr.h

@@ -189,6 +189,10 @@ class LLShaderMgr
         DEFERRED_SSR_GLOSSY_SAMPLES,        //  "glossySampleCount"
         DEFERRED_SSR_NOISE_SINE,            //  "noiseSine"
         DEFERRED_SSR_ADAPTIVE_STEP_MULT,    //  "adaptiveStepMultiplier"
+        DEFERRED_SSR_SPLIT_START,           //  "splitParamsStart"
+        DEFERRED_SSR_SPLIT_END,             //  "splitParamsEnd"
+        DEFERRED_SSR_MAX_Z,                 //  "maxZDepth"
+        DEFERRED_SSR_MAX_ROUGHNESS,         //  "maxRoughness"
 
         MODELVIEW_DELTA_MATRIX,             //  "modelview_delta"
         INVERSE_MODELVIEW_DELTA_MATRIX,     //  "inv_modelview_delta"

indra/newview/app_settings/settings.xml

@@ -7691,9 +7691,13 @@
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
-    <string>S32</string>
+    <string>Vector3</string>
     <key>Value</key>
-    <integer>25</integer>
+    <array>
+      <real>30</real>
+      <real>16</real>
+      <real>16</real>
+    </array>
   </map>
   <key>RenderScreenSpaceReflectionRayStep</key>
   <map>
@@ -7702,9 +7706,13 @@
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
-    <string>F32</string>
+    <string>Vector3</string>
     <key>Value</key>
-    <real>0.1</real>
+    <array>
+      <real>0.035</real>
+      <real>0.75</real>
+      <real>1</real>
+    </array>
   </map>
   <key>RenderScreenSpaceReflectionDistanceBias</key>
   <map>
@@ -7713,9 +7721,13 @@
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
-    <string>F32</string>
+    <string>Vector3</string>
     <key>Value</key>
-    <real>0.015</real>
+    <array>
+      <real>0.01</real>
+      <real>0.4</real>
+      <real>10</real>
+    </array>
   </map>
   <key>RenderScreenSpaceReflectionDepthRejectBias</key>
   <map>
@@ -7724,9 +7736,13 @@
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
-    <string>F32</string>
+    <string>Vector3</string>
     <key>Value</key>
-    <real>0.001</real>
+    <array>
+      <real>0.001</real>
+      <real>0.001</real>
+      <real>0.001</real>
+    </array>
   </map>
   <key>RenderScreenSpaceReflectionAdaptiveStepMultiplier</key>
   <map>
@@ -7735,9 +7751,43 @@
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
-    <string>F32</string>
+    <string>Vector3</string>
+    <key>Value</key>
+    <array>
+      <real>1.197</real>
+      <real>1.5</real>
+      <real>2</real>
+    </array>
+  </map>
+  <key>RenderScreenSpaceReflectionSplitStart</key>
+  <map>
+    <key>Comment</key>
+    <string>Starting splits for each SSR pass.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Vector3</string>
     <key>Value</key>
-    <real>1.6</real>
+    <array>
+      <real>0</real>
+      <real>5</real>
+      <real>50</real>
+    </array>
+  </map>
+  <key>RenderScreenSpaceReflectionSplitEnd</key>
+  <map>
+    <key>Comment</key>
+    <string>Ending splits for each SSR pass.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Vector3</string>
+    <key>Value</key>
+    <array>
+      <real>25</real>
+      <real>150</real>
+      <real>1000</real>
+    </array>
   </map>
   <key>RenderScreenSpaceReflectionGlossySamples</key>
   <map>
@@ -7748,7 +7798,29 @@
     <key>Type</key>
     <string>S32</string>
     <key>Value</key>
-    <integer>4</integer>
+    <integer>2</integer>
+  </map>
+  <key>RenderScreenSpaceReflectionMaxDepth</key>
+  <map>
+    <key>Comment</key>
+    <string>Maximum depth from the camera to attempt a trace.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>256</real>
+  </map>
+  <key>RenderScreenSpaceReflectionMaxRoughness</key>
+  <map>
+    <key>Comment</key>
+    <string>Maximum permitted roughness for screen space reflections.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>0.45</real>
   </map>
   <key>RenderBumpmapMinDistanceSquared</key>
     <map>

indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl

@@ -750,7 +750,7 @@ void doProbeSample(inout vec3 ambenv, inout vec3 glossenv,
     glossenv = sampleProbes(pos, normalize(refnormpersp), lod);
 
 #if defined(SSR)
-    if (cube_snapshot != 1 && glossiness >= 0.9)
+    if (cube_snapshot != 1)
     {
         vec4 ssr = vec4(0);
         if (transparent)