Skip to content

Commit 86b7cfe

Browse files
committed
Minor cleanups and logging/ViewerStats improvements for GL3 fallback trigger for intel HD 4X00 gpus
1 parent 3d33326 commit 86b7cfe

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

indra/newview/llfeaturemanager.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,8 @@ void LLFeatureManager::applyBaseMasks()
655655
if (gGLManager.mIsIntel)
656656
{
657657
maskFeatures("Intel");
658-
if (gGLManager.mGLVersion < 4.59f)
658+
// check against 3.33 to avoid applying this fallback twice
659+
if (gGLManager.mGLVersion < 4.59f && gGLManager.mGLVersion > 3.33f)
659660
{
660661
// if we don't have OpenGL 4.6 on intel, set it to OpenGL 3.3
661662
// we also want to trigger the GL3 fallbacks on these chipsets
@@ -665,10 +666,12 @@ void LLFeatureManager::applyBaseMasks()
665666
// https://docs.blender.org/manual/en/latest/troubleshooting/gpu/windows/intel.html#legacy-intel-hd-4000-5000
666667
// https://www.intel.com/content/www/us/en/support/articles/000005524/graphics.html
667668
// this will disable things like reflection probes, HDR, FXAA and SMAA
669+
LL_INFOS("RenderInit") << "Applying Intel integrated pre-Haswell fallback. Downgrading feature usage to OpenGL 3.3" << LL_ENDL;
668670
gGLManager.mGLVersion = llmin(gGLManager.mGLVersion, 3.33f);
669-
// and select GLSL version for OpenGL 3.3
671+
gGLManager.mGLVersionString += " 3.3 fallback"; // for ViewerStats reporting
672+
// and select GLSL version for OpenGL 3.2
670673
gGLManager.mGLSLVersionMajor = 3;
671-
gGLManager.mGLSLVersionMinor = 30;
674+
gGLManager.mGLSLVersionMinor = 20;
672675
}
673676
}
674677
if (gGLManager.mIsApple)

0 commit comments

Comments
 (0)