summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-23 17:38:21 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-23 17:38:21 +0100
commit1a987e8d32a733cace7ffdb239729380cd53f87c (patch)
tree4548221dc8b0fc1db0587e3c966227b432f8be33 /indra
parent008873627d68b5c13eb9339d6294b43241c3348a (diff)
parentf313196363085de2eb8f3a4fd33abeb5617204c4 (diff)
merge
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl4
-rw-r--r--indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl4
-rw-r--r--indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl4
3 files changed, 3 insertions, 9 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
index 65540ad6fe..bf5dd4155c 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
@@ -270,7 +270,6 @@ void main()
vec2 scol_ambocc = texture2DRect(lightMap, vary_fragcoord.xy).rg;
float scol = max(scol_ambocc.r, diffuse.a);
float ambocc = scol_ambocc.g;
- float glowresult = 0.0;
calcAtmospherics(pos.xyz, ambocc);
@@ -286,7 +285,6 @@ void main()
vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz));
float sa = dot(refnormpersp, vary_light.xyz);
vec3 dumbshiny = vary_SunlitColor*scol_ambocc.r*texture2D(lightFunc, vec2(sa, spec.a)).a;
- glowresult = 0.08 * dot(dumbshiny.rgb, spec.rgb);
// screen-space cheap fakey reflection map
//
@@ -336,5 +334,5 @@ void main()
col = scaleSoftClip(col);
gl_FragColor.rgb = col;
- gl_FragColor.a = glowresult;
+ gl_FragColor.a = 0.0;
}
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index 67ef3d5280..28cfc6322e 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -269,7 +269,6 @@ void main()
vec2 scol_ambocc = texture2DRect(lightMap, vary_fragcoord.xy).rg;
float scol = max(scol_ambocc.r, diffuse.a);
float ambocc = scol_ambocc.g;
- float glowresult = 0.0;
calcAtmospherics(pos.xyz, ambocc);
@@ -285,7 +284,6 @@ void main()
vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz));
float sa = dot(refnormpersp, vary_light.xyz);
vec3 dumbshiny = vary_SunlitColor*scol_ambocc.r*texture2D(lightFunc, vec2(sa, spec.a)).a;
- glowresult = 0.08 * dot(dumbshiny.rgb, spec.rgb);
// screen-space cheap fakey reflection map
//
@@ -336,5 +334,5 @@ void main()
col = scaleSoftClip(col);
gl_FragColor.rgb = col;
- gl_FragColor.a = glowresult;
+ gl_FragColor.a = 0.0;
}
diff --git a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
index b5c6693d3b..9f94b9e8ea 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
@@ -272,7 +272,6 @@ void main()
vec2 scol_ambocc = texture2DRect(lightMap, vary_fragcoord.xy).rg;
float scol = max(scol_ambocc.r, diffuse.a);
float ambocc = scol_ambocc.g;
- float glowresult = 0.0;
calcAtmospherics(pos.xyz, ambocc);
@@ -288,7 +287,6 @@ void main()
vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz));
float sa = dot(refnormpersp, vary_light.xyz);
vec3 dumbshiny = vary_SunlitColor*scol*texture2D(lightFunc, vec2(sa, spec.a)).a;
- glowresult = 0.08 * dot(dumbshiny.rgb, spec.rgb);
// screen-space cheap fakey reflection map
//
@@ -342,7 +340,7 @@ void main()
gl_FragColor.rgb = col;
//gl_FragColor.rgb = gi_col.rgb;
- gl_FragColor.a = glowresult;
+ gl_FragColor.a = 0.0;
//gl_FragColor.rg = scol_ambocc.rg;
//gl_FragColor.rgb = texture2DRect(lightMap, vary_fragcoord.xy).rgb;