diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-03-20 16:10:10 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-03-20 16:10:10 +0000 |
| commit | fa6e4137e39f9adac8696af688d0f6f28f6cb29d (patch) | |
| tree | bb8d7caa122850d4ef4c18a9846a55504960d010 /indra/newview/app_settings/shaders/class3 | |
| parent | b1999722be317f2b293ad3e4a68310a82a467fc0 (diff) | |
| parent | 2d514e4b10025dc37c20db7db821e621dcdcaaf1 (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #305)
SL-10764, SL-10768. SL-10763
Diffstat (limited to 'indra/newview/app_settings/shaders/class3')
| -rw-r--r-- | indra/newview/app_settings/shaders/class3/lighting/sumLightsSpecularV.glsl | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class3/lighting/sumLightsSpecularV.glsl b/indra/newview/app_settings/shaders/class3/lighting/sumLightsSpecularV.glsl index e043ac873e..ce5855646c 100644 --- a/indra/newview/app_settings/shaders/class3/lighting/sumLightsSpecularV.glsl +++ b/indra/newview/app_settings/shaders/class3/lighting/sumLightsSpecularV.glsl @@ -32,7 +32,7 @@ vec3 atmosGetDiffuseSunlightColor(); vec3 scaleDownLight(vec3 light); uniform vec4 light_position[8]; -uniform vec3 light_attenuation[8]; +uniform vec4 light_attenuation[8]; uniform vec3 light_diffuse[8]; vec4 sumLightsSpecular(vec3 pos, vec3 norm, vec4 color, inout vec4 specularColor, vec4 baseCol) diff --git a/indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl b/indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl index 9842d9ba93..5302b05043 100644 --- a/indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl +++ b/indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl @@ -32,7 +32,7 @@ vec3 atmosAffectDirectionalLight(float lightIntensity); uniform vec4 light_position[8]; uniform vec3 light_direction[8]; -uniform vec3 light_attenuation[8]; +uniform vec4 light_attenuation[8]; uniform vec3 light_diffuse[8]; vec4 sumLights(vec3 pos, vec3 norm, vec4 color, vec4 baseLight) |