Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559

2 files changed, 4 insertions, 6 deletions

diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index dfb93c17dc..677c9c244c 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -88,7 +88,7 @@ void main()
     da                = pow(da, light_gamma);
 
     vec4 diffuse     = texture2DRect(diffuseRect, tc);
-         diffuse.rgb = linear_to_srgb(diffuse.rgb); // SL-14025
+         diffuse.rgb = linear_to_srgb(diffuse.rgb); // SL-14035
     vec4 spec        = texture2DRect(specularRect, vary_fragcoord.xy);
 
     vec2 scol_ambocc = texture2DRect(lightMap, vary_fragcoord.xy).rg;
diff --git a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
index 5c62c3bc4a..bd6ba4bf15 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
@@ -163,7 +163,7 @@ void main()
     da                = pow(da, light_gamma);
 
     vec4 diffuse     = texture2DRect(diffuseRect, tc);
-         diffuse.rgb = linear_to_srgb(diffuse.rgb); // SL-14025
+         diffuse.rgb = linear_to_srgb(diffuse.rgb); // SL-14035
     vec4 spec        = texture2DRect(specularRect, vary_fragcoord.xy);
 
 
@@ -277,9 +277,7 @@ void main()
         vec3  kDiffuse      = colorDiffuse * (1.0 - FssEssLambert + FmsEms);
         colorDiffuse       += (FmsEms + kDiffuse) * irradiance;
 
-        float occlusion_strength = 1.0; // TODO: From glb
-        float ao     = packedORM.r;
-        colorDiffuse = mix(colorDiffuse, colorDiffuse * ao, occlusion_strength);
+        colorDiffuse *= packedORM.r; // Occlusion -- NOTE: pbropaque will need occlusion_strength pre-multiplied into spec.r
 
         color.rgb = colorDiffuse + colorEmissive + colorSpec;
 
@@ -293,7 +291,7 @@ void main()
         color.rgb = vec3(metal);
     #endif
     #if DEBUG_PBR_OCCLUSION
-        color.rgb = vec3(ao);
+        color.rgb = vec3(packedORM.r);
     #endif
     #if DEBUG_PBR_ORM
         color.rgb = packedORM;