From 3d9ee4072dd829350c60c9c31535bdc6e2d9b789 Mon Sep 17 00:00:00 2001 From: Brad Linden <46733234+brad-linden@users.noreply.github.com> Date: Tue, 26 Nov 2024 13:33:44 -0800 Subject: [PATCH] fix GL3 fallback on mac intel gpu systems. secondlife/viewer#3145 (#3159) --- indra/newview/llfeaturemanager.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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