From ce53cb5060fe366692e6936365c8f02fbdf57c28 Mon Sep 17 00:00:00 2001 From: Daniel Scharrer Date: Thu, 12 Aug 2021 22:14:18 +0200 Subject: [PATCH] OpenGLUtil: Extend Intel GL_ARB_sample_shading blacklist Relax render string match to cover all "Intel(R) HD Graphics" devices with driver version 10.18.10.*. Fixes: issue #1568 (hopefully) (cherry picked from commit 76969902fd05a169402308428e0b69f85fbe7ac2) --- src/graphics/opengl/OpenGLUtil.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/graphics/opengl/OpenGLUtil.cpp b/src/graphics/opengl/OpenGLUtil.cpp index 1f52f4a472..5afb06e369 100644 --- a/src/graphics/opengl/OpenGLUtil.cpp +++ b/src/graphics/opengl/OpenGLUtil.cpp @@ -101,14 +101,14 @@ OpenGLInfo::OpenGLInfo() // with device "Intel(R) HD Graphics 4000" and versions "4.0.0 - Build 10.18.10.4276" and …".4252". // Other build numbers in similar-looking but unconfirmed crashes are 4358, 4653, 4885, 5059, 5069, 5129 // and 5146 and for some of them the renderer does not have the " 4000" suffix. + // There are also undiagnosed crash reports with device "Intel(R) HD Graphics 2500" and build number 5161. // // Note that there are also (other) crashes (most on shutdown) with matching driver versions seen in // http://arx.vg/645 and duplicates, before Crisp Alpha Cutout AA was added so other functionality may // also be buggy with this driver. #if ARX_PLATFORM == ARX_PLATFORM_WIN32 if(!isES() && boost::equals(vendor(), "Intel") - && (boost::equals(renderer(), "Intel(R) HD Graphics") - || boost::equals(renderer(), "Intel(R) HD Graphics 4000")) + && boost::starts_with(renderer(), "Intel(R) HD Graphics") && boost::contains(versionString(), "Build 10.18.10.")) { m_extensionOverrides.push_back("-GL_ARB_sample_shading"); }