SL-17284 Reflection probe tuning and optimization take 1

2 files changed, 26 insertions, 17 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/aoUtil.glsl b/indra/newview/app_settings/shaders/class1/deferred/aoUtil.glsl
index 23adbded5e..73c125bbdc 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/aoUtil.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/aoUtil.glsl
@@ -29,8 +29,6 @@ uniform sampler2DRect   depthMap;
 
 uniform float ssao_radius;
 uniform float ssao_max_radius;
-uniform float ssao_factor;
-uniform float ssao_factor_inv;
 
 uniform mat4 inv_proj;
 uniform vec2 screen_res;
@@ -83,14 +81,14 @@ float calcAmbientOcclusion(vec4 pos, vec3 norm, vec2 pos_screen)
 {
     float ret = 1.0;
     vec3 pos_world = pos.xyz;
-    vec2 noise_reflect = texture2D(noiseMap, pos_screen.xy/128.0).xy;
+    
         
     float angle_hidden = 0.0;
     float points = 0;
         
-    float scale = min(ssao_radius / -pos_world.z, ssao_max_radius);
-    
     // it was found that keeping # of samples a constant was the fastest, probably due to compiler optimizations (unrolling?)
+    float scale = min(ssao_radius / -pos_world.z, ssao_max_radius);
+    vec2 noise_reflect = texture2D(noiseMap, pos_screen.xy/128.0).xy;
     for (int i = 0; i < 8; i++)
     {
         vec2 samppos_screen = pos_screen + scale * reflect(getKern(i), noise_reflect);
@@ -105,14 +103,14 @@ float calcAmbientOcclusion(vec4 pos, vec3 norm, vec2 pos_screen)
         //(k should vary inversely with # of samples, but this is taken care of later)
         
         float funky_val = (dot((samppos_world - 0.05*norm - pos_world), norm) > 0.0) ? 1.0 : 0.0;
-        angle_hidden = angle_hidden + funky_val * min(1.0/dist2, ssao_factor_inv);
+        angle_hidden = angle_hidden + funky_val * min(1.0/dist2, 1.0);
             
         // 'blocked' samples (significantly closer to camera relative to pos_world) are "no data", not "no occlusion" 
         float diffz_val = (diff.z > -1.0) ? 1.0 : 0.0;
         points = points + diffz_val;
     }
-        
-    angle_hidden = min(ssao_factor*angle_hidden/points, 1.0);
+
+    angle_hidden = min(angle_hidden/points, 1.0);
     
     float points_val = (points > 0.0) ? 1.0 : 0.0;
     ret = (1.0 - (points_val * angle_hidden));
diff --git a/indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl
index 596d0274af..fa3634f3b6 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl
@@ -69,36 +69,47 @@ void main()
     tc_mod *= 2.0;
     tc += ( (tc_mod - 0.5) * kern[1].z * dlt * 0.5 );
 
-    for (int i = 1; i < 4; i++)
+    // TODO: move this to kern instead of building kernel per pixel
+    vec3 k[7];
+    k[0] = kern[0];
+    k[2] = kern[1];
+    k[4] = kern[2];
+    k[6] = kern[3];
+
+    k[1] = (k[0]+k[2])*0.5f;
+    k[3] = (k[2]+k[4])*0.5f;
+    k[5] = (k[4]+k[6])*0.5f;
+    
+    for (int i = 1; i < 7; i++)
     {
-        vec2 samptc = tc + kern[i].z*dlt;
+        vec2 samptc = tc + k[i].z*dlt*2.0;
         vec3 samppos = getPosition(samptc).xyz; 
 
         float d = dot(norm.xyz, samppos.xyz-pos.xyz);// dist from plane
         
         if (d*d <= pointplanedist_tolerance_pow2)
         {
-            col += texture2DRect(lightMap, samptc)*kern[i].xyxx;
-            defined_weight += kern[i].xy;
+            col += texture2DRect(lightMap, samptc)*k[i].xyxx;
+            defined_weight += k[i].xy;
         }
     }
 
-    for (int i = 1; i < 4; i++)
+    for (int i = 1; i < 7; i++)
     {
-        vec2 samptc = tc - kern[i].z*dlt;
+        vec2 samptc = tc - k[i].z*dlt*2.0;
         vec3 samppos = getPosition(samptc).xyz; 
 
         float d = dot(norm.xyz, samppos.xyz-pos.xyz);// dist from plane
         
         if (d*d <= pointplanedist_tolerance_pow2)
         {
-            col += texture2DRect(lightMap, samptc)*kern[i].xyxx;
-            defined_weight += kern[i].xy;
+            col += texture2DRect(lightMap, samptc)*k[i].xyxx;
+            defined_weight += k[i].xy;
         }
     }
 
     col /= defined_weight.xyxx;
-    col.y *= col.y;
+    //col.y *= max(col.y, 0.75);
     
     frag_color = col;