Browse Source

GL: actually, Mesa is detectable from the renderer string always.

No need to fetch the version string then.
pull/240/head
Vladimír Vondruš 5 years ago
parent
commit
d0f57f0153
  1. 14
      src/Magnum/GL/Implementation/driverSpecific.cpp

14
src/Magnum/GL/Implementation/driverSpecific.cpp

@ -438,9 +438,6 @@ auto Context::detectedDriver() -> DetectedDrivers {
#endif #endif
; ;
#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) #if !defined(CORRADE_TARGET_APPLE) || defined(MAGNUM_TARGET_GLES)
const Containers::StringView vendor = const Containers::StringView vendor =
#ifndef MAGNUM_TARGET_WEBGL #ifndef MAGNUM_TARGET_WEBGL
@ -468,13 +465,10 @@ auto Context::detectedDriver() -> DetectedDrivers {
*_detectedDrivers |= DetectedDriver::IntelWindows; *_detectedDrivers |= DetectedDriver::IntelWindows;
#endif #endif
/* Mesa drivers */ /* Mesa drivers. On desktop GL and GLES the version string contains Mesa
#ifndef MAGNUM_TARGET_WEBGL as well, but not on WebGL. Renderer contains it on all three, except
if(version.contains("Mesa"_s)) for Firefox for some reason. */
#else if(renderer.contains("Mesa"_s)) {
if(renderer.contains("Mesa"_s))
#endif
{
*_detectedDrivers |= DetectedDriver::Mesa; *_detectedDrivers |= DetectedDriver::Mesa;
if(renderer.contains("SVGA3D"_s)) if(renderer.contains("SVGA3D"_s))

Loading…
Cancel
Save