From 86b7cfe93a7d528993c19833df1d744c6f7c2dde Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Wed, 20 Nov 2024 15:52:57 -0800 Subject: Minor cleanups and logging/ViewerStats improvements for GL3 fallback trigger for intel HD 4X00 gpus --- indra/newview/llfeaturemanager.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'indra/newview/llfeaturemanager.cpp') diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index c5d074a5e8..ae520ca5cd 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -655,7 +655,8 @@ void LLFeatureManager::applyBaseMasks() if (gGLManager.mIsIntel) { maskFeatures("Intel"); - if (gGLManager.mGLVersion < 4.59f) + // check against 3.33 to avoid applying this fallback twice + if (gGLManager.mGLVersion < 4.59f && 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 @@ -665,10 +666,12 @@ void LLFeatureManager::applyBaseMasks() // https://docs.blender.org/manual/en/latest/troubleshooting/gpu/windows/intel.html#legacy-intel-hd-4000-5000 // https://www.intel.com/content/www/us/en/support/articles/000005524/graphics.html // this will disable things like reflection probes, HDR, FXAA and SMAA + LL_INFOS("RenderInit") << "Applying Intel integrated pre-Haswell fallback. Downgrading feature usage to OpenGL 3.3" << LL_ENDL; gGLManager.mGLVersion = llmin(gGLManager.mGLVersion, 3.33f); - // and select GLSL version for OpenGL 3.3 + gGLManager.mGLVersionString += " 3.3 fallback"; // for ViewerStats reporting + // and select GLSL version for OpenGL 3.2 gGLManager.mGLSLVersionMajor = 3; - gGLManager.mGLSLVersionMinor = 30; + gGLManager.mGLSLVersionMinor = 20; } } if (gGLManager.mIsApple) -- cgit v1.2.3 From d65fb7cec8ce36ce7f6ff082f8d04bdd8bc0208c Mon Sep 17 00:00:00 2001 From: "Jonathan \"Geenz\" Goodman" Date: Mon, 25 Nov 2024 20:56:03 -0500 Subject: Drop emissive on old Intel GPUs (#3110) * #3103 Add the ability to disable the emissive buffer for older GPUs with low memory bandwidth. * #3135 Add a "vintage" mode for slower GPUs * #2719 Fix for skies being overbrightened * #2632 Do not apply tonemapping on legacy skies --- indra/newview/llfeaturemanager.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llfeaturemanager.cpp') diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index ae520ca5cd..7e52b4afc0 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -705,6 +705,10 @@ void LLFeatureManager::applyBaseMasks() if (gGLManager.mGLVersion < 3.99f) { maskFeatures("GL3"); + + // make sure to disable background context activity in GL3 mode + LLImageGLThread::sEnabledMedia = false; + LLImageGLThread::sEnabledTextures = false; } // now mask by gpu string -- cgit v1.2.3