diff options
author | Oz Linden <oz@lindenlab.com> | 2011-06-17 17:32:28 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-06-17 17:32:28 -0400 |
commit | 068c6d45099411d7827db3e50d9c91331fa5c189 (patch) | |
tree | c46cce78e6db0d87c1d9b0da9229ea0cf1d727de /indra/newview/app_settings/shaders/class3/lighting | |
parent | 5e5be51edebf0fb6a59d4907c9fcaac1b1667ac4 (diff) | |
parent | 806b11c5720e1bd9e9764fcfd896436b8385e8b2 (diff) |
merge mesh branch changes (storm-1390)
Diffstat (limited to 'indra/newview/app_settings/shaders/class3/lighting')
-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 04533fdce1..92347a5b4a 100644 --- a/indra/newview/app_settings/shaders/class3/lighting/sumLightsSpecularV.glsl +++ b/indra/newview/app_settings/shaders/class3/lighting/sumLightsSpecularV.glsl @@ -5,7 +5,7 @@ * $/LicenseInfo$ */ -#version 120 + float calcDirectionalLightSpecular(inout vec4 specular, vec3 view, vec3 n, vec3 l, vec3 lightCol, float da); vec3 calcPointLightSpecular(inout vec4 specular, vec3 view, vec3 v, vec3 n, vec3 l, float r, float pw, vec3 lightCol); diff --git a/indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl b/indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl index 73bc18b866..24bbc0a1a1 100644 --- a/indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl +++ b/indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl @@ -5,7 +5,7 @@ * $/LicenseInfo$ */ -#version 120 + float calcDirectionalLight(vec3 n, vec3 l); float calcPointLightOrSpotLight(vec3 v, vec3 n, vec4 lp, vec3 ln, float la, float is_pointlight); |