diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-10-04 10:04:13 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-10-04 10:04:13 -0400 |
commit | 14293b7b0a63fe5be904cbdc853f3b185e13f3fc (patch) | |
tree | 6a755ca689fc408de11e46b891fedb52002b6b9f /indra/newview/llviewershadermgr.cpp | |
parent | 71e89d6a493e51789008f74f87439611f11c13ab (diff) | |
parent | e093a98f86ad46374f5067adb616a2aead73eff5 (diff) |
Merge remote branch 'develop' into marchcat/xcode-16
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
-rw-r--r-- | indra/newview/llviewershadermgr.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 58b541b19b..a8fe221d98 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -37,7 +37,6 @@ #include "llrender.h" #include "llenvironment.h" #include "llerrorcontrol.h" -#include "llatmosphere.h" #include "llworld.h" #include "llsky.h" @@ -731,14 +730,6 @@ std::string LLViewerShaderMgr::loadBasicShaders() S32 sum_lights_class = 3; -#if LL_DARWIN - // Work around driver crashes on older Macs when using deferred rendering - // NORSPEC-59 - // - if (gGLManager.mIsMobileGF) - sum_lights_class = 3; -#endif - // Use the feature table to mask out the max light level to use. Also make sure it's at least 1. S32 max_light_class = gSavedSettings.getS32("RenderShaderLightingMaxLevel"); sum_lights_class = llclamp(sum_lights_class, 1, max_light_class); |