summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-11-01 12:33:59 -0500
committerDave Parks <davep@lindenlab.com>2011-11-01 12:33:59 -0500
commit74fcb62b3dc0084c61cdf611b2b95ab3b03203bd (patch)
treea4c48947c2028fe01ea4d38eaeeacd5f39fbee3b
parent5406ebad3e2073a860ced69094bbfb76880ce999 (diff)
SH-2546 Fix for black avatars and terrain on GF Go 7800 (use vec3 instead of float on varying parameters).
-rw-r--r--indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsF.glsl2
-rw-r--r--indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsV.glsl4
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsF.glsl b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsF.glsl
index e8e56e12c1..765b0927c3 100644
--- a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsF.glsl
+++ b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsF.glsl
@@ -26,7 +26,7 @@
VARYING vec3 vary_SunlitColor;
VARYING vec3 vary_AdditiveColor;
-VARYING float vary_AtmosAttenuation;
+VARYING vec3 vary_AtmosAttenuation;
vec3 getSunlitColor()
{
diff --git a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsV.glsl b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsV.glsl
index ba2ed6b1ce..99dbee15ee 100644
--- a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsV.glsl
+++ b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsV.glsl
@@ -25,7 +25,7 @@
VARYING vec3 vary_AdditiveColor;
-VARYING float vary_AtmosAttenuation;
+VARYING vec3 vary_AtmosAttenuation;
vec3 additive_color;
vec3 atmos_attenuation;
@@ -80,5 +80,5 @@ void setAdditiveColor(vec3 v)
void setAtmosAttenuation(vec3 v)
{
atmos_attenuation = v;
- vary_AtmosAttenuation = v.r;
+ vary_AtmosAttenuation = v;
}