From 4ed05fc84fce0fbee76c583e91feed5aff2dbbfc Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Thu, 25 Apr 2019 10:59:00 -0700 Subject: Fix dark ALM and strangeness at Mid lighting (class 3 but with a darkness about it). Make a distinct class3/lighting/lightV which boosts to WL levels (* 2.0) and make lighting without WL atmo enabled use class 2 or below. Make forward shaders (alpha and materialF with alpha-blend mode on) more consistent with deferred lighting. --- indra/newview/llviewershadermgr.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewershadermgr.cpp') diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index ebfdc38d50..0bd4a5eae0 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -478,7 +478,8 @@ void LLViewerShaderMgr::setShaders() //using shaders, disable fixed function LLGLSLShader::sNoFixedFunction = true; - S32 light_class = 2; + S32 light_class = 3; + S32 interface_class = 2; S32 env_class = 2; S32 obj_class = 2; S32 effect_class = 2; @@ -519,6 +520,10 @@ void LLViewerShaderMgr::setShaders() // windlight shaders to stub versions. wl_class = 2; } + else + { + light_class = 2; + } // Trigger a full rebuild of the fallback skybox / cubemap if we've toggled windlight shaders if (mShaderLevel[SHADER_WINDLIGHT] != wl_class && gSky.mVOSkyp.notNull()) @@ -528,7 +533,7 @@ void LLViewerShaderMgr::setShaders() // Load lighting shaders mShaderLevel[SHADER_LIGHTING] = light_class; - mShaderLevel[SHADER_INTERFACE] = light_class; + mShaderLevel[SHADER_INTERFACE] = interface_class; mShaderLevel[SHADER_ENVIRONMENT] = env_class; mShaderLevel[SHADER_WATER] = water_class; mShaderLevel[SHADER_OBJECT] = obj_class; -- cgit v1.2.3