diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-21 11:47:58 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-21 11:47:58 -0400 |
| commit | fcf2ed5901699edfbc04d59d1a0517f19692df1a (patch) | |
| tree | 3960aa76222776cb2b2dcd12fe1872850fc59ad7 /indra/newview/app_settings/shaders/class3/lighting | |
| parent | 3595216efbeb0210f6c5777fd85a589bbbb08e4c (diff) | |
| parent | 4d77146b9016a4db37112e153e71c05c596f7fdc (diff) | |
merged .hgtags & BuildParams
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); |