summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/deferred
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-04-25 13:02:24 -0700
committerGraham Linden <graham@lindenlab.com>2019-04-25 13:02:24 -0700
commit5766325290974ee2cfa30fd655060ef396d1e87a (patch)
tree3a75f4bd27f5aeb51f4bad0b1235603d924540c9 /indra/newview/app_settings/shaders/class1/deferred
parent48ed3f9318cf3750f1c4f72d1e7195f06d06e53c (diff)
SL-10904, SL-10998, SL-11018
Fix handling of 1/light_y when y was tiny but getting even tinier. Add similar adjustment to shader version of same calc.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
index 8709053ac6..300900a9e5 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
@@ -229,13 +229,11 @@ vec3 post_diffuse = color.rgb;
//color.rgb = mix(diff.rgb, color.rgb, final_alpha);
- color.rgb = atmosFragLighting(color.rgb, additive, atten);
+ color.rgb = atmosFragLighting(color.rgb, additive, atten) * 2.0;
color.rgb = scaleSoftClipFrag(color.rgb);
vec4 light = vec4(0,0,0,0);
-vec3 prelight_linearish_maybe = srgb_to_linear(color.rgb);
-
#define LIGHT_LOOP(i) light.rgb += calcPointLightOrSpotLight(light_diffuse[i].rgb, diff.rgb, pos.xyz, norm, light_position[i], light_direction[i].xyz, light_attenuation[i].x, light_attenuation[i].y, light_attenuation[i].z, light_attenuation[i].w * 0.5);
LIGHT_LOOP(1)