From 71bf77a33ae65bc437b1aeb77b0229cf25de1404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Tue, 8 Feb 2022 11:44:42 +0100
Subject: [PATCH] gl-info,vk-info: make instruction set lists more compact.

---
 src/Magnum/Platform/gl-info.cpp | 75 ++++++++++++++++++---------------
 src/Magnum/Vk/vk-info.cpp       | 75 ++++++++++++++++++---------------
 2 files changed, 84 insertions(+), 66 deletions(-)

diff --git a/src/Magnum/Platform/gl-info.cpp b/src/Magnum/Platform/gl-info.cpp
index de65fd1e3..725536a63 100644
--- a/src/Magnum/Platform/gl-info.cpp
+++ b/src/Magnum/Platform/gl-info.cpp
@@ -320,43 +320,52 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat
     Debug{} << "    CORRADE_TARGET_DINKUMWARE";
     #endif
     #ifdef CORRADE_TARGET_SSE2
-    Debug{} << "    CORRADE_TARGET_SSE2";
-    #endif
-    #ifdef CORRADE_TARGET_SSE3
-    Debug{} << "    CORRADE_TARGET_SSE3";
-    #endif
-    #ifdef CORRADE_TARGET_SSSE3
-    Debug{} << "    CORRADE_TARGET_SSSE3";
-    #endif
-    #ifdef CORRADE_TARGET_SSE41
-    Debug{} << "    CORRADE_TARGET_SSE41";
-    #endif
-    #ifdef CORRADE_TARGET_SSE42
-    Debug{} << "    CORRADE_TARGET_SSE42";
+    {
+        Debug d;
+        d << "    CORRADE_TARGET_SSE2";
+        #ifdef CORRADE_TARGET_SSE3
+        d << Debug::nospace << ",SSE3";
+        #endif
+        #ifdef CORRADE_TARGET_SSSE3
+        d << Debug::nospace << ",SSSE3";
+        #endif
+        #ifdef CORRADE_TARGET_SSE41
+        d << Debug::nospace << ",SSE41";
+        #endif
+        #ifdef CORRADE_TARGET_SSE42
+        d << Debug::nospace << ",SSE42";
+        #endif
+    }
     #endif
     #ifdef CORRADE_TARGET_AVX
-    Debug{} << "    CORRADE_TARGET_AVX";
-    #endif
-    #ifdef CORRADE_TARGET_AVX_F16C
-    Debug{} << "    CORRADE_TARGET_AVX_F16C";
-    #endif
-    #ifdef CORRADE_TARGET_AVX_FMA
-    Debug{} << "    CORRADE_TARGET_AVX_FMA";
-    #endif
-    #ifdef CORRADE_TARGET_AVX2
-    Debug{} << "    CORRADE_TARGET_AVX2";
-    #endif
-    #ifdef CORRADE_TARGET_AVX512F
-    Debug{} << "    CORRADE_TARGET_AVX512F";
+    {
+        Debug d;
+        d << "    CORRADE_TARGET_AVX";
+        #ifdef CORRADE_TARGET_AVX_F16C
+        d << Debug::nospace << ",AVX_F16C";
+        #endif
+        #ifdef CORRADE_TARGET_AVX_FMA
+        d << Debug::nospace << ",AVX_FMA";
+        #endif
+        #ifdef CORRADE_TARGET_AVX2
+        d << Debug::nospace << ",AVX2";
+        #endif
+        #ifdef CORRADE_TARGET_AVX512F
+        d << Debug::nospace << ",AVX512F";
+        #endif
+    }
     #endif
     #ifdef CORRADE_TARGET_NEON
-    Debug{} << "    CORRADE_TARGET_NEON";
-    #endif
-    #ifdef CORRADE_TARGET_NEON_FP16
-    Debug{} << "    CORRADE_TARGET_NEON_FP16";
-    #endif
-    #ifdef CORRADE_TARGET_NEON_FMA
-    Debug{} << "    CORRADE_TARGET_NEON_FMA";
+    {
+        Debug d;
+        d << "    CORRADE_TARGET_NEON";
+        #ifdef CORRADE_TARGET_NEON_FP16
+        d << Debug::nospace << ",NEON_FP16";
+        #endif
+        #ifdef CORRADE_TARGET_NEON_FMA
+        d << Debug::nospace << ",NEON_FMA";
+        #endif
+    }
     #endif
     #ifdef CORRADE_TARGET_SIMD128
     Debug{} << "    CORRADE_TARGET_SIMD128";
diff --git a/src/Magnum/Vk/vk-info.cpp b/src/Magnum/Vk/vk-info.cpp
index 966887c30..950a76373 100644
--- a/src/Magnum/Vk/vk-info.cpp
+++ b/src/Magnum/Vk/vk-info.cpp
@@ -160,43 +160,52 @@ int main(int argc, char** argv) {
     Debug{} << "    CORRADE_TARGET_DINKUMWARE";
     #endif
     #ifdef CORRADE_TARGET_SSE2
-    Debug{} << "    CORRADE_TARGET_SSE2";
-    #endif
-    #ifdef CORRADE_TARGET_SSE3
-    Debug{} << "    CORRADE_TARGET_SSE3";
-    #endif
-    #ifdef CORRADE_TARGET_SSSE3
-    Debug{} << "    CORRADE_TARGET_SSSE3";
-    #endif
-    #ifdef CORRADE_TARGET_SSE41
-    Debug{} << "    CORRADE_TARGET_SSE41";
-    #endif
-    #ifdef CORRADE_TARGET_SSE42
-    Debug{} << "    CORRADE_TARGET_SSE42";
+    {
+        Debug d;
+        d << "    CORRADE_TARGET_SSE2";
+        #ifdef CORRADE_TARGET_SSE3
+        d << Debug::nospace << ",SSE3";
+        #endif
+        #ifdef CORRADE_TARGET_SSSE3
+        d << Debug::nospace << ",SSSE3";
+        #endif
+        #ifdef CORRADE_TARGET_SSE41
+        d << Debug::nospace << ",SSE41";
+        #endif
+        #ifdef CORRADE_TARGET_SSE42
+        d << Debug::nospace << ",SSE42";
+        #endif
+    }
     #endif
     #ifdef CORRADE_TARGET_AVX
-    Debug{} << "    CORRADE_TARGET_AVX";
-    #endif
-    #ifdef CORRADE_TARGET_AVX_F16C
-    Debug{} << "    CORRADE_TARGET_AVX_F16C";
-    #endif
-    #ifdef CORRADE_TARGET_AVX_FMA
-    Debug{} << "    CORRADE_TARGET_AVX_FMA";
-    #endif
-    #ifdef CORRADE_TARGET_AVX2
-    Debug{} << "    CORRADE_TARGET_AVX2";
-    #endif
-    #ifdef CORRADE_TARGET_AVX512F
-    Debug{} << "    CORRADE_TARGET_AVX512F";
+    {
+        Debug d;
+        d << "    CORRADE_TARGET_AVX";
+        #ifdef CORRADE_TARGET_AVX_F16C
+        d << Debug::nospace << ",AVX_F16C";
+        #endif
+        #ifdef CORRADE_TARGET_AVX_FMA
+        d << Debug::nospace << ",AVX_FMA";
+        #endif
+        #ifdef CORRADE_TARGET_AVX2
+        d << Debug::nospace << ",AVX2";
+        #endif
+        #ifdef CORRADE_TARGET_AVX512F
+        d << Debug::nospace << ",AVX512F";
+        #endif
+    }
     #endif
     #ifdef CORRADE_TARGET_NEON
-    Debug{} << "    CORRADE_TARGET_NEON";
-    #endif
-    #ifdef CORRADE_TARGET_NEON_FP16
-    Debug{} << "    CORRADE_TARGET_NEON_FP16";
-    #endif
-    #ifdef CORRADE_TARGET_NEON_FMA
-    Debug{} << "    CORRADE_TARGET_NEON_FMA";
+    {
+        Debug d;
+        d << "    CORRADE_TARGET_NEON";
+        #ifdef CORRADE_TARGET_NEON_FP16
+        d << Debug::nospace << ",NEON_FP16";
+        #endif
+        #ifdef CORRADE_TARGET_NEON_FMA
+        d << Debug::nospace << ",NEON_FMA";
+        #endif
+    }
     #endif
     /* CORRADE_TARGET_SIMD128 omitted */
     #ifdef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT