From 5a7460f570b818d643c05a04edbbba255779e797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 16 Dec 2015 17:18:10 +0100 Subject: [PATCH] Platform: added `--short` option to magnum-info. Also updated the documentation. --- src/Magnum/Platform/magnum-info.cpp | 92 +++++++++++++++-------------- 1 file changed, 48 insertions(+), 44 deletions(-) diff --git a/src/Magnum/Platform/magnum-info.cpp b/src/Magnum/Platform/magnum-info.cpp index 13fd977a5..04063e78e 100644 --- a/src/Magnum/Platform/magnum-info.cpp +++ b/src/Magnum/Platform/magnum-info.cpp @@ -79,53 +79,53 @@ namespace Magnum { @section magnum-info-usage Usage - magnum-info [-h|--help] [--all-extensions] [--limits] + magnum-info [--magnum-...] [-h|--help] [-s|--short] [--all-extensions] [--limits] Arguments: - -- ` -h`, `--help` -- display this help message and exit -- `--all-extensions` -- show extensions also for fully supported versions +- `-h`, `--help` -- display this help message and exit +- `-s`, `--short` -- display just essential info and exit +- `--all-extensions` -- display extensions also for fully supported versions - `--limits` -- display also limits and implementation-defined values +- `--magnum-...` -- engine-specific options (see @ref Context for details) @section magnum-info-example Example output - +---------------------------------------------------------+ - | Information about Magnum engine and OpenGL capabilities | - +---------------------------------------------------------+ - - Used application: Platform::WindowlessGlxApplication - Compilation flags: - CORRADE_BUILD_DEPRECATED - MAGNUM_BUILD_DEPRECATED - - Vendor: NVIDIA Corporation - Renderer: GeForce GT 740M/PCIe/SSE2 - OpenGL version: OpenGL 4.4 (4.4.0 NVIDIA 337.25) - Context flags: - Supported GLSL versions: - 440 core - 430 core - 420 core - 410 core - 400 core - 330 core - 310 es - 300 es - 100 - - Vendor extension support: - GL_AMD_vertex_shader_layer - - GL_AMD_shader_trinary_minmax - - GL_ARB_robustness SUPPORTED - GL_ATI_texture_mirror_once SUPPORTED - GL_EXT_texture_filter_anisotropic SUPPORTED - GL_EXT_texture_mirror_clamp SUPPORTED - GL_EXT_direct_state_access SUPPORTED - GL_EXT_texture_sRGB_decode SUPPORTED - GL_EXT_shader_integer_mix SUPPORTED - GL_EXT_debug_label - - GL_EXT_debug_marker - - GL_GREMEDY_string_marker - +``` + +---------------------------------------------------------+ + | Information about Magnum engine and OpenGL capabilities | + +---------------------------------------------------------+ + +Used application: Platform::WindowlessGlxApplication +Compilation flags: + CORRADE_BUILD_DEPRECATED + CORRADE_TARGET_UNIX + MAGNUM_BUILD_DEPRECATED + +Renderer: AMD Radeon R7 M260 Series by ATI Technologies Inc. +OpenGL version: 4.5.13399 Compatibility Profile Context 15.201.1151 +Using optional features: + GL_ARB_ES2_compatibility + GL_ARB_direct_state_access + GL_ARB_get_texture_sub_image + GL_ARB_invalidate_subdata + ... +Using driver workarounds: + amd-nv-no-forward-compatible-core-context + no-layout-qualifiers-on-old-glsl +Context flags: +Supported GLSL versions: + 430 core + 430 compatibility + 420 core + ... + +Vendor extension support: + GL_AMD_vertex_shader_layer SUPPORTED + GL_AMD_shader_trinary_minmax SUPPORTED + GL_ARB_robustness - + GL_ARB_robustness_isolation - + ... +``` */ @@ -138,11 +138,13 @@ class MagnumInfo: public Platform::WindowlessApplication { MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplication(arguments, nullptr) { Utility::Arguments args; - args.addBooleanOption("all-extensions") - .setHelp("all-extensions", "show extensions also for fully supported versions") + args.addBooleanOption('s', "short") + .setHelp("short", "display just essential info and exit") + .addBooleanOption("all-extensions") + .setHelp("all-extensions", "display extensions also for fully supported versions") .addBooleanOption("limits") - .addSkippedPrefix("magnum", "engine-specific options") .setHelp("limits", "display also limits and implementation-defined values") + .addSkippedPrefix("magnum", "engine-specific options") .setHelp("Displays information about Magnum engine and OpenGL capabilities."); /** @@ -249,6 +251,8 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat for(const auto& version: shadingLanguageVersions) Debug() << " " << version; + if(args.isSet("short")) return; + Debug() << ""; /* Get first future (not supported) version */