diff options
author | Dave Parks <davep@lindenlab.com> | 2022-09-28 16:49:11 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2022-09-28 16:49:11 -0500 |
commit | f887f65830c05d15517cbd8f15ca0e59210dfbee (patch) | |
tree | ea68a0c48699a965e3f28b781c38d497bac4e0a3 /indra/newview/app_settings/shaders/class2/deferred | |
parent | a63fcfc9d584075bb263ccf10857852b3327be43 (diff) |
SL-18190 WIP - Linear space atmospherics take 2
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/deferred')
-rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl index 93c51ba313..e6cb8f37c7 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl @@ -196,7 +196,7 @@ void main() vec3 irradiance = vec3(0); vec3 radiance = vec3(0); sampleReflectionProbes(irradiance, radiance, pos.xyz, norm.xyz, gloss); - irradiance = max(amblit,irradiance); + irradiance = max(amblit*2.0,irradiance); vec3 f0 = vec3(0.04); @@ -212,6 +212,9 @@ void main() color += pbrPunctual(diffuseColor, specularColor, perceptualRoughness, metallic, norm.xyz, v, light_dir) * sunlit*2.75 * scol; color += colorEmissive; + color = atmosFragLightingLinear(color, additive, atten); + color = scaleSoftClipFragLinear(color); + vec3 light = vec3(0); // Punctual lights @@ -227,8 +230,6 @@ void main() color.rgb += light.rgb; - color = atmosFragLightingLinear(color, additive, atten); - color = scaleSoftClipFragLinear(color); - + frag_color = vec4(color.rgb,albedo.a * vertex_color.a); } |