From dd1cc2f3b1df472be405f4b95107972be1ea1a62 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Fri, 19 Apr 2019 13:13:50 -0700 Subject: Fix sky and cloud shader usage of density_multiplier (not re-ranged from FS to WL). Remove all refs to now unused calcFragAtmospherics. --- .../newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl | 5 ----- .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl | 4 ---- 2 files changed, 9 deletions(-) (limited to 'indra/newview/app_settings/shaders/class1/windlight') diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl index 4f0e2a6cb6..4e0618e276 100644 --- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl +++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl @@ -46,8 +46,3 @@ vec3 atmosLighting(vec3 light) return light; } -void calcFragAtmospherics(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 atten, out vec3 additive) -{ - /* stub function for fallback compatibility on class1 hardware */ -} - diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl index 1d105690d1..3d05912f49 100644 --- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl +++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl @@ -42,10 +42,6 @@ uniform mat3 ssao_effect_mat; uniform int no_atmo; uniform float sun_moon_glow_factor; -vec3 nothing() { - return vec3(0, 0, 0); -} - void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten) { vec3 P = inPositionEye; -- cgit v1.2.3