From 30fab6e90868d9cb3d60f2983a291950f760cc13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 25 Jul 2023 13:00:01 +0200 Subject: [PATCH] GL: fix Context::DetectedDrivers printing. It was missing the ArmMali value, and the defines were out of sync. That it actually showed the right value in magnum-gl-info was just an accident. --- src/Magnum/GL/Context.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Magnum/GL/Context.cpp b/src/Magnum/GL/Context.cpp index 237e90f27..98fa7848d 100644 --- a/src/Magnum/GL/Context.cpp +++ b/src/Magnum/GL/Context.cpp @@ -1357,20 +1357,19 @@ Debug& operator<<(Debug& debug, const Context::DetectedDriver value) { Debug& operator<<(Debug& debug, const Context::DetectedDrivers value) { return Containers::enumSetDebugOutput(debug, value, debug.immediateFlags() >= Debug::Flag::Packed ? "{}" : "GL::Context::DetectedDrivers{}", { - #ifndef MAGNUM_TARGET_WEBGL Context::DetectedDriver::Amd, - #endif #ifdef MAGNUM_TARGET_GLES Context::DetectedDriver::Angle, #endif - #ifndef MAGNUM_TARGET_WEBGL Context::DetectedDriver::IntelWindows, Context::DetectedDriver::Mesa, Context::DetectedDriver::NVidia, Context::DetectedDriver::Svga3D, #ifdef MAGNUM_TARGET_GLES - Context::DetectedDriver::SwiftShader + Context::DetectedDriver::SwiftShader, #endif + #ifdef CORRADE_TARGET_ANDROID + Context::DetectedDriver::ArmMali, #endif }); }