diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-07 13:04:30 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-07 13:04:30 -0600 |
| commit | 8c8edbbaeb68d82e1653e92dd7940ba0439777f2 (patch) | |
| tree | daabfb5d6ce91cc1ad71b6f4428efee6a6c540f4 /indra/newview/app_settings/shaders | |
| parent | a6e40e6e02600cb47299dc9903400720786f72f0 (diff) | |
SH-2546 Fix for black water under terrain (use vec3 instead of float for vary_AtmosAttenuation
Diffstat (limited to 'indra/newview/app_settings/shaders')
3 files changed, 4 insertions, 7 deletions
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsWaterV.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsWaterV.glsl index ef34c5c853..8afcc20f6d 100644 --- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsWaterV.glsl +++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsWaterV.glsl @@ -25,7 +25,6 @@ VARYING vec3 vary_PositionEye; -VARYING float fog_depth; vec3 getPositionEye() { @@ -35,5 +34,4 @@ vec3 getPositionEye() void setPositionEye(vec3 v) { vary_PositionEye = v; - fog_depth = v.z; } diff --git a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsWaterF.glsl b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsWaterF.glsl index 23046f990d..163ef26444 100644 --- a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsWaterF.glsl +++ b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsWaterF.glsl @@ -24,9 +24,8 @@ */ VARYING vec3 vary_PositionEye; -VARYING vec3 vary_SunlitColor; VARYING vec3 vary_AdditiveColor; -VARYING float vary_AtmosAttenuation; +VARYING vec3 vary_AtmosAttenuation; vec3 getSunlitColor() { @@ -42,7 +41,7 @@ vec3 getAdditiveColor() } vec3 getAtmosAttenuation() { - return vec3(vary_AtmosAttenuation); + return vary_AtmosAttenuation; } vec3 getPositionEye() { diff --git a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsWaterV.glsl b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsWaterV.glsl index 279c4dd981..553f6752e6 100644 --- a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsWaterV.glsl +++ b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsWaterV.glsl @@ -25,7 +25,7 @@ VARYING vec3 vary_PositionEye; VARYING vec3 vary_AdditiveColor; -VARYING float vary_AtmosAttenuation; +VARYING vec3 vary_AtmosAttenuation; vec3 atmos_attenuation; vec3 sunlit_color; @@ -77,5 +77,5 @@ void setAdditiveColor(vec3 v) void setAtmosAttenuation(vec3 v) { atmos_attenuation = v; - vary_AtmosAttenuation = v.r; + vary_AtmosAttenuation = v; } |