From 2ec7a9af8212211a15a65e5301e44807e2e4e53d Mon Sep 17 00:00:00 2001
From: Ptolemy <ptolemy@lindenlab.com>
Date: Wed, 29 Jun 2022 08:43:33 -0700
Subject: SL-17274: Fix typo in reference to SL-14035
---
indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 2 +-
indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'indra')
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..7eba8689b3 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);
--
cgit v1.2.3
From 7515353d8ea17c433b08f1fdc05cc7a812babff4 Mon Sep 17 00:00:00 2001
From: Ptolemy <ptolemy@lindenlab.com>
Date: Wed, 29 Jun 2022 09:02:50 -0700
Subject: SL-17274: Simplify occlusion and make not about future
occlusion_strength
---
.../newview/app_settings/shaders/class3/deferred/softenLightF.glsl | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
(limited to 'indra')
diff --git a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
index 7eba8689b3..bd6ba4bf15 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
@@ -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;
--
cgit v1.2.3