diff options
| author | simon@lindenlab.com <simon@lindenlab.com> | 2011-06-21 09:36:31 -0700 |
|---|---|---|
| committer | simon@lindenlab.com <simon@lindenlab.com> | 2011-06-21 09:36:31 -0700 |
| commit | d11cabc4898a7a1995ed7c89d2cdac46dfcf24ec (patch) | |
| tree | 9f8e5e57d4ed074e148227c56556bcace90e2e3a /indra/newview/app_settings/shaders/class3/lighting | |
| parent | c0c0a2b9a5f41fc06619330a81c34955a39ddfe2 (diff) | |
| parent | ede3b577d8cebd5065514bb485e2cbd93dd5b05a (diff) | |
Merge with latest lindenlab/viewer-development
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); |