summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-04-19 18:00:13 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-04-19 18:00:13 -0700
commit894412285b3bbcb1f790145202e77a5aa6f369ec (patch)
tree93d97c3edf9cd9bb495fab2b5977d95809012b28 /indra/newview/app_settings
parente10cac8847b78f1bf6bb50527d347690c48896c9 (diff)
Fix forward decl to match changed func def and clear defines between shader compiles for ifdef sanity
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl
index 3f42e8a24b..11759af2ad 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl
@@ -56,7 +56,7 @@ mat4 getSkinnedTransform();
vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
void calcAtmospherics(vec3 inPositionEye);
-float calcDirectionalLight(vec3 n, vec3 l);
+vec3 calcDirectionalLight(vec3 n, vec3 l);
vec3 atmosAmbient(vec3 light);
vec3 atmosAffectDirectionalLight(float lightIntensity);