Merge pull request #3141 from secondlife/brad/2744-cleanups

secondlife/viewer#2744 intel fallback cleanups

1 files changed, 6 insertions, 3 deletions

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)