summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/lighting
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-05-21 16:00:45 -0700
committerGraham Linden <graham@lindenlab.com>2019-05-21 16:00:45 -0700
commite9dbee00262a437e4b3f971b37ea636e92032133 (patch)
tree57f79641ee532f3f80b0fbd89d3a1f42de398829 /indra/newview/app_settings/shaders/class1/lighting
parent78e62fe0f16d95a2afb6c4205b121db189c297b9 (diff)
SL-11238
Fix ambient light inputs to the renderer. Fix 3rd sky shader w/ mistaken density mod conversion. Make ambient clamp apply to all modes. Tune ALM ambient clamp to match non-ALM.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/lighting')
-rw-r--r--indra/newview/app_settings/shaders/class1/lighting/lightV.glsl3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightV.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightV.glsl
index 38230836eb..cf635ffa3f 100644
--- a/indra/newview/app_settings/shaders/class1/lighting/lightV.glsl
+++ b/indra/newview/app_settings/shaders/class1/lighting/lightV.glsl
@@ -28,11 +28,12 @@
// All lights, no specular highlights
vec3 atmosAmbient();
vec4 sumLights(vec3 pos, vec3 norm, vec4 color);
+float getAmbientClamp();
vec4 calcLighting(vec3 pos, vec3 norm, vec4 color)
{
vec4 c = sumLights(pos, norm, color);
- c.rgb += atmosAmbient() * color.rgb * 0.5;
+ c.rgb += atmosAmbient() * color.rgb * 0.5 * getAmbientClamp();
return c;
}