From d0f57f0153de399e9e529b1e2dba4cc008dd862a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 12 Oct 2021 18:11:24 +0200 Subject: [PATCH] GL: actually, Mesa is detectable from the renderer string always. No need to fetch the version string then. --- src/Magnum/GL/Implementation/driverSpecific.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/Magnum/GL/Implementation/driverSpecific.cpp b/src/Magnum/GL/Implementation/driverSpecific.cpp index d0abeab2a..a158a0c60 100644 --- a/src/Magnum/GL/Implementation/driverSpecific.cpp +++ b/src/Magnum/GL/Implementation/driverSpecific.cpp @@ -438,9 +438,6 @@ auto Context::detectedDriver() -> DetectedDrivers { #endif ; #endif - #if !defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_WEBGL) - const Containers::StringView version = versionString(); - #endif #if !defined(CORRADE_TARGET_APPLE) || defined(MAGNUM_TARGET_GLES) const Containers::StringView vendor = #ifndef MAGNUM_TARGET_WEBGL @@ -468,13 +465,10 @@ auto Context::detectedDriver() -> DetectedDrivers { *_detectedDrivers |= DetectedDriver::IntelWindows; #endif - /* Mesa drivers */ - #ifndef MAGNUM_TARGET_WEBGL - if(version.contains("Mesa"_s)) - #else - if(renderer.contains("Mesa"_s)) - #endif - { + /* Mesa drivers. On desktop GL and GLES the version string contains Mesa + as well, but not on WebGL. Renderer contains it on all three, except + for Firefox for some reason. */ + if(renderer.contains("Mesa"_s)) { *_detectedDrivers |= DetectedDriver::Mesa; if(renderer.contains("SVGA3D"_s))