summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Linden <46733234+brad-linden@users.noreply.github.com>2024-11-26 13:33:44 -0800
committerGitHub <noreply@github.com>2024-11-26 13:33:44 -0800
commit3d9ee4072dd829350c60c9c31535bdc6e2d9b789 (patch)
treef767a1624a82953bdcfe97789b6bfd650e5cf58e /indra/newview
parentca5119d577c6b621fc4ca96f0e408953126036a7 (diff)
fix GL3 fallback on mac intel gpu systems. secondlife/viewer#3145 (#3159)
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfeaturemanager.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 7e52b4afc0..2ad1257695 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