diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-11-26 12:05:25 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-26 12:05:25 +0800 |
| commit | a40795bd6ffcfff71bead4869d79cf5a73d5a7af (patch) | |
| tree | 6c4c1fbb421f737c0b62fcda51ca7ca0ce8294f4 /indra/newview/llfeaturemanager.cpp | |
| parent | 30842e230e2b3d365e8415f0350f8d10ce8b0637 (diff) | |
| parent | d65fb7cec8ce36ce7f6ff082f8d04bdd8bc0208c (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 | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 7a99702e27..b25ef02e13 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) @@ -702,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 |