diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-11-27 12:50:03 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-27 12:50:03 +0800 |
| commit | da6872a5c1eb133d1ea4d22e9c50c95b53d72296 (patch) | |
| tree | 052b8e30552e8668741748ba7e9f9df0ba946ca8 /indra/newview/llfeaturemanager.cpp | |
| parent | b815cb96d3f52ff66945ee20c5cb7d135d353300 (diff) | |
| parent | a90377df950f83347e988754d15400b47a739cce (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index b25ef02e13..f45b70a6f9 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -655,8 +655,16 @@ void LLFeatureManager::applyBaseMasks() if (gGLManager.mIsIntel) { maskFeatures("Intel"); + + static constexpr F32 TARGET_GL_VERSION = +#if LL_DARWIN + 4.09f; +#else + 4.59f; +#endif + // check against 3.33 to avoid applying this fallback twice - if (gGLManager.mGLVersion < 4.59f && gGLManager.mGLVersion > 3.33f) + if (gGLManager.mGLVersion < TARGET_GL_VERSION && gGLManager.mGLVersion > 3.33f) { // if we don't have OpenGL 4.6 on intel, set it to OpenGL 3.3 // we also want to trigger the GL3 fallbacks on these chipsets |