diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-16 20:45:46 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-16 20:45:46 +0000 |
| commit | 4af0b06ca6f10b4d37bab5fbc9768978b5d06298 (patch) | |
| tree | 947e35030631bf584c357584a342524d060668f5 /indra/newview/app_settings/shaders/class3 | |
| parent | 6128b4ecba42cb13d38f094ca67e873362d6861f (diff) | |
| parent | 822adebf898e87d88b4f2992acdc1e92b1ae7b4f (diff) | |
Merged in graham_linden/viewer-eep-graham (pull request #149)
Default
Diffstat (limited to 'indra/newview/app_settings/shaders/class3')
3 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl b/indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl index dadff40933..b5dcd2eba2 100644 --- a/indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl +++ b/indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl @@ -30,7 +30,6 @@ float calcPointLightOrSpotLight(vec3 v, vec3 n, vec4 lp, vec3 ln, float la, floa vec3 atmosAmbient(vec3 light); vec3 atmosAffectDirectionalLight(float lightIntensity); vec3 scaleDownLight(vec3 light); -vec3 scaleUpLight(vec3 light); uniform vec4 light_position[8]; uniform vec3 light_direction[8]; diff --git a/indra/newview/app_settings/shaders/class3/windlight/atmosphericsF.glsl b/indra/newview/app_settings/shaders/class3/windlight/atmosphericsF.glsl index fee1a7f311..c809a41a0f 100644 --- a/indra/newview/app_settings/shaders/class3/windlight/atmosphericsF.glsl +++ b/indra/newview/app_settings/shaders/class3/windlight/atmosphericsF.glsl @@ -26,9 +26,7 @@ vec3 getAdditiveColor(); vec3 getAtmosAttenuation(); -uniform sampler2D cloudMap; uniform vec4 gamma; -uniform vec4 cloud_pos_density1; uniform vec4 lightnorm; uniform vec4 sunlight_color; uniform vec4 ambient; diff --git a/indra/newview/app_settings/shaders/class3/windlight/transportF.glsl b/indra/newview/app_settings/shaders/class3/windlight/transportF.glsl index e8e9c53c38..c2f4c43101 100644 --- a/indra/newview/app_settings/shaders/class3/windlight/transportF.glsl +++ b/indra/newview/app_settings/shaders/class3/windlight/transportF.glsl @@ -30,8 +30,6 @@ vec3 getAdditiveColor(); vec3 getAtmosAttenuation(); -uniform sampler2D cloudMap; -uniform vec4 cloud_pos_density1; uniform int no_atmo; vec3 atmosFragTransport(vec3 light, vec3 atten, vec3 additive) { |