1 files changed, 158 insertions, 186 deletions
diff --git a/indra/newview/app_settings/shaders/class3/deferred/multiSpotLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/multiSpotLightF.glsl
index 9d62b9d180..23120bbbbe 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/multiSpotLightF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/multiSpotLightF.glsl
@@ -1,9 +1,9 @@
 /** 
- * @file multiSpotLightF.glsl
+ * @file class3\deferred\multiSpotLightF.glsl
  *
- * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $LicenseInfo:firstyear=2022&license=viewerlgpl$
  * Second Life Viewer Source Code
- * Copyright (C) 2007, Linden Research, Inc.
+ * Copyright (C) 2022, Linden Research, Inc.
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,25 +23,18 @@
  * $/LicenseInfo$
  */
  
-#extension GL_ARB_texture_rectangle : enable
-#extension GL_ARB_shader_texture_lod : enable
-
 /*[EXTRA_CODE_HERE]*/
 
-#ifdef DEFINE_GL_FRAGCOLOR
 out vec4 frag_color;
-#else
-#define frag_color gl_FragColor
-#endif
 
-uniform sampler2DRect diffuseRect;
-uniform sampler2DRect specularRect;
-uniform sampler2DRect depthMap;
-uniform sampler2DRect normalMap;
+uniform sampler2D diffuseRect;
+uniform sampler2D specularRect;
+uniform sampler2D depthMap;
+uniform sampler2D normalMap;
+uniform sampler2D emissiveRect; // PBR linear packed Occlusion, Roughness, Metal. See: pbropaqueF.glsl
 uniform samplerCube environmentMap;
-uniform sampler2DRect lightMap;
-uniform sampler2D noiseMap;
-uniform sampler2D projectionMap;
+uniform sampler2D lightMap;
+uniform sampler2D projectionMap; // rgba
 uniform sampler2D lightFunc;
 
 uniform mat4 proj_mat; //screen space to light space
@@ -61,231 +54,210 @@ uniform float sun_wash;
 uniform int proj_shadow_idx;
 uniform float shadow_fade;
 
+// Light params
 uniform vec3 center;
 uniform float size;
 uniform vec3 color;
 uniform float falloff;
 
-VARYING vec4 vary_fragcoord;
+in vec4 vary_fragcoord;
 uniform vec2 screen_res;
 
 uniform mat4 inv_proj;
 
-vec3 getNorm(vec2 pos_screen);
+void calcHalfVectors(vec3 lv, vec3 n, vec3 v, out vec3 h, out vec3 l, out float nh, out float nl, out float nv, out float vh, out float lightDist);
+float calcLegacyDistanceAttenuation(float distance, float falloff);
+vec3 colorized_dot(float x);
+bool clipProjectedLightVars(vec3 center, vec3 pos, out float dist, out float l_dist, out vec3 lv, out vec4 proj_tc );
+vec4 getNormalEnvIntensityFlags(vec2 screenpos, out vec3 n, out float envIntensity);
+vec3 getProjectedLightAmbiance(float amb_da, float attenuation, float lit, float nl, float noise, vec2 projected_uv);
+vec3 getProjectedLightDiffuseColor(float light_distance, vec2 projected_uv );
+vec3 getProjectedLightSpecularColor(vec3 pos, vec3 n);
+vec2 getScreenXY(vec4 clip);
+vec2 getScreenCoord(vec4 clip);
+vec3 srgb_to_linear(vec3 cs);
+vec3 legacy_adjust(vec3 c);
+vec4 texture2DLodSpecular(vec2 tc, float lod);
 
-vec4 texture2DLodSpecular(sampler2D projectionMap, vec2 tc, float lod)
-{
-    vec4 ret = texture2DLod(projectionMap, tc, lod);
-    
-    vec2 dist = vec2(0.5) - abs(tc-vec2(0.5));
-    
-    float det = min(lod/(proj_lod*0.5), 1.0);
-    
-    float d = min(dist.x, dist.y);
-    
-    d *= min(1, d * (proj_lod - lod));
-    
-    float edge = 0.25*det;
-    
-    ret *= clamp(d/edge, 0.0, 1.0);
-    
-    return ret;
-}
+vec4 getPosition(vec2 pos_screen);
 
-vec4 texture2DLodDiffuse(sampler2D projectionMap, vec2 tc, float lod)
-{
-    vec4 ret = texture2DLod(projectionMap, tc, lod);
+const float M_PI = 3.14159265;
 
-    vec2 dist = vec2(0.5) - abs(tc-vec2(0.5));
-    
-    float det = min(lod/(proj_lod*0.5), 1.0);
-    
-    float d = min(dist.x, dist.y);
-    
-    float edge = 0.25*det;
-        
-    ret *= clamp(d/edge, 0.0, 1.0);
-    
-    return ret;
-}
+vec3 pbrPunctual(vec3 diffuseColor, vec3 specularColor, 
+                    float perceptualRoughness, 
+                    float metallic,
+                    vec3 n, // normal
+                    vec3 v, // surface point to camera
+                    vec3 l); //surface point to light
 
-vec4 texture2DLodAmbient(sampler2D projectionMap, vec2 tc, float lod)
+void main()
 {
-    vec4 ret = texture2DLod(projectionMap, tc, lod);
-
-    vec2 dist = tc-vec2(0.5);
-    
-    float d = dot(dist,dist);
-        
-    ret *= min(clamp((0.25-d)/0.25, 0.0, 1.0), 1.0);
-    
-    return ret;
-}
-
-
-vec4 getPosition(vec2 pos_screen);
+#if defined(LOCAL_LIGHT_KILL)
+    discard;
+#else
+    vec3 final_color = vec3(0,0,0);
+    vec2 tc          = getScreenCoord(vary_fragcoord);
+    vec3 pos         = getPosition(tc).xyz;
 
-void main() 
-{
-    vec4 frag = vary_fragcoord;
-    frag.xyz /= frag.w;
-    frag.xyz = frag.xyz*0.5+0.5;
-    frag.xy *= screen_res;
-    
-    vec3 pos = getPosition(frag.xy).xyz;
-    vec3 lv = center.xyz-pos.xyz;
-    float dist = length(lv);
-    dist /= size;
-    if (dist > 1.0)
+    vec3 lv;
+    vec4 proj_tc;
+    float dist, l_dist;
+    if (clipProjectedLightVars(center, pos, dist, l_dist, lv, proj_tc))
     {
         discard;
     }
-    
+
     float shadow = 1.0;
     
     if (proj_shadow_idx >= 0)
     {
-        vec4 shd = texture2DRect(lightMap, frag.xy);
-        shadow = (proj_shadow_idx == 0) ? shd.b : shd.a;
+        vec4 shd = texture(lightMap, tc);
+        shadow = (proj_shadow_idx==0)?shd.b:shd.a;
         shadow += shadow_fade;
         shadow = clamp(shadow, 0.0, 1.0);        
     }
-    
-    vec3 norm = texture2DRect(normalMap, frag.xy).xyz;
-    
-    float envIntensity = norm.z;
 
-    norm = getNorm(frag.xy);
-    
-    norm = normalize(norm);
-    float l_dist = -dot(lv, proj_n);
-    
-    vec4 proj_tc = (proj_mat * vec4(pos.xyz, 1.0));
-    if (proj_tc.z < 0.0)
-    {
-        discard;
-    }
-    
-    proj_tc.xyz /= proj_tc.w;
-    
-    float fa = (falloff*0.5)+1.0;
-    float dist_atten = min(1.0-(dist-1.0*(1.0-fa))/fa, 1.0);
-    dist_atten *= dist_atten;
-    dist_atten *= 2.0;
+    float envIntensity;
+    vec3 n;
+    vec4 norm = getNormalEnvIntensityFlags(tc, n, envIntensity);
+
+    float dist_atten = calcLegacyDistanceAttenuation(dist, falloff);
     if (dist_atten <= 0.0)
     {
         discard;
     }
-    
+
     lv = proj_origin-pos.xyz;
-    lv = normalize(lv);
-    float da = dot(norm, lv);
+    vec3  h, l, v = -normalize(pos);
+    float nh, nl, nv, vh, lightDist;
+    calcHalfVectors(lv, n, v, h, l, nh, nl, nv, vh, lightDist);
+
+    vec3 diffuse = texture(diffuseRect, tc).rgb;
+    vec4 spec    = texture(specularRect, tc);
+    vec3 dlit    = vec3(0, 0, 0);
+    vec3 slit    = vec3(0, 0, 0);
 
-    vec3 col = vec3(0,0,0);
+    vec3 amb_rgb = vec3(0);
+
+    if (GET_GBUFFER_FLAG(GBUFFER_FLAG_HAS_PBR))
+    {
+        vec3 colorEmissive = texture(emissiveRect, tc).rgb; 
+        vec3 orm = spec.rgb;
+        float perceptualRoughness = orm.g;
+        float metallic = orm.b;
+        vec3 f0 = vec3(0.04);
+        vec3 baseColor = diffuse.rgb;
         
-    vec3 diff_tex = srgb_to_linear(texture2DRect(diffuseRect, frag.xy).rgb);
-    
-    vec4 spec = texture2DRect(specularRect, frag.xy);
+        vec3 diffuseColor = baseColor.rgb*(vec3(1.0)-f0);
+        diffuseColor *= 1.0 - metallic;
 
-    vec3 dlit = vec3(0, 0, 0);
+        vec3 specularColor = mix(f0, baseColor.rgb, metallic);
+
+        // We need this additional test inside a light's frustum since a spotlight's ambiance can be applied
+        if (proj_tc.x > 0.0 && proj_tc.x < 1.0
+        &&  proj_tc.y > 0.0 && proj_tc.y < 1.0)
+        {
+            float lit = 0.0;
+            float amb_da = 0.0;
+
+            if (nl > 0.0)
+            {
+                amb_da += (nl*0.5 + 0.5) * proj_ambiance;
+                
+                dlit = getProjectedLightDiffuseColor( l_dist, proj_tc.xy );
 
-    float noise = texture2D(noiseMap, frag.xy/128.0).b;
-    if (proj_tc.z > 0.0 &&
-        proj_tc.x < 1.0 &&
-        proj_tc.y < 1.0 &&
-        proj_tc.x > 0.0 &&
-        proj_tc.y > 0.0)
+                vec3 intensity = dist_atten * dlit * 3.9 * shadow; // Legacy attenuation, magic number to balance with legacy materials
+                final_color += intensity*pbrPunctual(diffuseColor, specularColor, perceptualRoughness, metallic, n.xyz, v, normalize(lv));
+            }
+
+            amb_rgb = getProjectedLightAmbiance( amb_da, dist_atten, lit, nl, 1.0, proj_tc.xy );
+            final_color += diffuse.rgb * amb_rgb;
+        }
+    }
+    else
     {
-        float amb_da = proj_ambiance;
-        float lit = 0.0;
+        diffuse = legacy_adjust(diffuse);
+        diffuse = srgb_to_linear(diffuse);
+        spec.rgb = srgb_to_linear(spec.rgb);
 
-        if (da > 0.0)
+        if (proj_tc.z > 0.0 &&
+            proj_tc.x < 1.0 &&
+            proj_tc.y < 1.0 &&
+            proj_tc.x > 0.0 &&
+            proj_tc.y > 0.0)
         {
-            lit = da * dist_atten * noise;
+            float amb_da = 0;
+            float lit = 0.0;
 
-            float diff = clamp((l_dist-proj_focus)/proj_range, 0.0, 1.0);
-            float lod = diff * proj_lod;
-            
-            vec4 plcol = texture2DLodDiffuse(projectionMap, proj_tc.xy, lod);
+            if (nl > 0.0)
+            {
+                lit = nl * dist_atten;
+
+                dlit = getProjectedLightDiffuseColor( l_dist, proj_tc.xy );
+
+                final_color = dlit*lit*diffuse*shadow;
+
+                // unshadowed for consistency between forward and deferred?
+                amb_da += (nl*0.5+0.5) /* * (1.0-shadow) */ * proj_ambiance;
+            }
         
-            dlit = color.rgb * plcol.rgb * plcol.a;
-            
-            col = dlit*lit*diff_tex*shadow;
-            amb_da += (da*0.5)*(1.0-shadow)*proj_ambiance;
+            amb_rgb = getProjectedLightAmbiance( amb_da, dist_atten, lit, nl, 1.0, proj_tc.xy );
+            final_color += diffuse.rgb * amb_rgb;
         }
-        
-        //float diff = clamp((proj_range-proj_focus)/proj_range, 0.0, 1.0);
-        vec4 amb_plcol = texture2DLodAmbient(projectionMap, proj_tc.xy, proj_lod);
-                            
-        amb_da += (da*da*0.5+0.5)*(1.0-shadow)*proj_ambiance;
-                
-        amb_da *= dist_atten * noise;
-            
-        amb_da = min(amb_da, 1.0-lit);
-            
-        col += amb_da*color.rgb*diff_tex.rgb*amb_plcol.rgb*amb_plcol.a;
-    }
     
+        if (spec.a > 0.0)
+        {
+            dlit *= min(nl*6.0, 1.0) * dist_atten;
 
-    if (spec.a > 0.0)
-    {
-        vec3 npos = -normalize(pos);
-        dlit *= min(da*6.0, 1.0) * dist_atten;
-
-        //vec3 ref = dot(pos+lv, norm);
-        vec3 h = normalize(lv+npos);
-        float nh = dot(norm, h);
-        float nv = dot(norm, npos);
-        float vh = dot(npos, h);
-        float sa = nh;
-        float fres = pow(1 - dot(h, npos), 5)*0.4+0.5;
-
-        float gtdenom = 2 * nh;
-        float gt = max(0, min(gtdenom * nv / vh, gtdenom * da / vh));
+            float fres = pow(1 - vh, 5)*0.4+0.5;
+
+            float gtdenom = 2 * nh;
+            float gt = max(0, min(gtdenom * nv / vh, gtdenom * nl / vh));
                                 
-        if (nh > 0.0)
-        {
-            float scol = fres*texture2D(lightFunc, vec2(nh, spec.a)).r*gt/(nh*da);
-            col += dlit*scol*spec.rgb*shadow;
-            //col += spec.rgb;
-        }
-    }   
+            if (nh > 0.0)
+            {
+                float scol = fres*texture(lightFunc, vec2(nh, spec.a)).r*gt/(nh*nl);
+                vec3 speccol = dlit*scol*spec.rgb*shadow;
+                speccol = clamp(speccol, vec3(0), vec3(1));
+                final_color += speccol;
+            }
+        }   
 
-    if (envIntensity > 0.0)
-    {
-        vec3 ref = reflect(normalize(pos), norm);
+        if (envIntensity > 0.0)
+        {
+            vec3 ref = reflect(normalize(pos), n);
         
-        //project from point pos in direction ref to plane proj_p, proj_n
-        vec3 pdelta = proj_p-pos;
-        float ds = dot(ref, proj_n);
+            //project from point pos in direction ref to plane proj_p, proj_n
+            vec3 pdelta = proj_p-pos;
+            float ds = dot(ref, proj_n);
         
-        if (ds < 0.0)
-        {
-            vec3 pfinal = pos + ref * dot(pdelta, proj_n)/ds;
+            if (ds < 0.0)
+            {
+                vec3 pfinal = pos + ref * dot(pdelta, proj_n)/ds;
             
-            vec4 stc = (proj_mat * vec4(pfinal.xyz, 1.0));
+                vec4 stc = (proj_mat * vec4(pfinal.xyz, 1.0));
 
-            if (stc.z > 0.0)
-            {
-                stc /= stc.w;
-                                
-                if (stc.x < 1.0 &&
-                    stc.y < 1.0 &&
-                    stc.x > 0.0 &&
-                    stc.y > 0.0)
+                if (stc.z > 0.0)
                 {
-                    col += color.rgb * texture2DLodSpecular(projectionMap, stc.xy, (1 - spec.a) * (proj_lod * 0.6)).rgb * shadow * envIntensity;
+                    stc /= stc.w;
+                                
+                    if (stc.x < 1.0 &&
+                        stc.y < 1.0 &&
+                        stc.x > 0.0 &&
+                        stc.y > 0.0)
+                    {
+                        final_color += color.rgb * texture2DLodSpecular(stc.xy, (1 - spec.a) * (proj_lod * 0.6)).rgb * shadow * envIntensity;
+                    }
                 }
             }
         }
     }
 
     //not sure why, but this line prevents MATBUG-194
-    col = max(col, vec3(0.0));
-
-    col = scaleDownLight(col);
+    final_color = max(final_color, vec3(0.0));
 
-    //output linear space color as gamma correction happens down stream
-    frag_color.rgb = col;   
+    //output linear
+    frag_color.rgb = final_color;
     frag_color.a = 0.0;
+#endif // LOCAL_LIGHT_KILL
 }