Vk: retrieving instance version.

doc/vulkan-mapping.dox

@@ -168,7 +168,7 @@ Vulkan function                         | Matching API
 @fn_vk{EnumerateDeviceExtensionProperties} | |
 @fn_vk{EnumerateInstanceExtensionProperties} | |
 @fn_vk{EnumerateInstanceLayerProperties} | |
-@fn_vk{EnumerateInstanceVersion} @m_class{m-label m-flat m-success} **1.1** | |
+@fn_vk{EnumerateInstanceVersion} @m_class{m-label m-flat m-success} **1.1** | @ref enumerateInstanceVersion()
 @fn_vk{EnumeratePhysicalDevices}        | |
 @fn_vk{EnumeratePhysicalDeviceGroups} @m_class{m-label m-flat m-success} **KHR, 1.1** | |
 

src/Magnum/Vk/Test/CMakeLists.txt

@@ -29,3 +29,7 @@ corrade_add_test(VkExtensionsTest ExtensionsTest.cpp LIBRARIES MagnumVk)
 corrade_add_test(VkIntegrationTest IntegrationTest.cpp LIBRARIES MagnumVk)
 corrade_add_test(VkResultTest ResultTest.cpp LIBRARIES MagnumVk)
 corrade_add_test(VkVersionTest VersionTest.cpp LIBRARIES MagnumVk)
+
+if(BUILD_VK_TESTS)
+    corrade_add_test(VkVersionVkTest VersionVkTest.cpp LIBRARIES MagnumVk)
+endif()

src/Magnum/Vk/Test/VersionVkTest.cpp

@@ -0,0 +1,51 @@
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
+                2020 Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+#include <Corrade/TestSuite/Tester.h>
+#include <Corrade/TestSuite/Compare/Numeric.h>
+
+#include "Magnum/Vk/Version.h"
+
+namespace Magnum { namespace Vk { namespace Test { namespace {
+
+struct VersionVkTest: TestSuite::Tester {
+    explicit VersionVkTest();
+
+    void enumerate();
+};
+
+VersionVkTest::VersionVkTest() {
+    addTests({&VersionVkTest::enumerate});
+}
+
+void VersionVkTest::enumerate() {
+    Version version = enumerateInstanceVersion();
+    Debug{} << "Available version:" << version;
+    CORRADE_COMPARE_AS(version, Version::Vk10, TestSuite::Compare::GreaterOrEqual);
+}
+
+}}}}
+
+CORRADE_TEST_MAIN(Magnum::Vk::Test::VersionVkTest)

src/Magnum/Vk/Version.cpp

@@ -27,6 +27,8 @@
 
 #include <Corrade/Utility/Debug.h>
 
+#include "Magnum/Vk/Result.h"
+
 namespace Magnum { namespace Vk {
 
 Debug& operator<<(Debug& debug, const Version value) {
@@ -38,4 +40,12 @@ Debug& operator<<(Debug& debug, const Version value) {
     return debug;
 }
 
+Version enumerateInstanceVersion() {
+    if(!vkEnumerateInstanceVersion) return Version::Vk10;
+
+    UnsignedInt version;
+    MAGNUM_VK_INTERNAL_ASSERT_RESULT(vkEnumerateInstanceVersion(&version));
+    return Version(version);
+}
+
 }}

src/Magnum/Vk/Version.h

@@ -131,6 +131,20 @@ as @cb{.shell-session} <major>.<minor> @ce if patch is zero.
 */
 MAGNUM_VK_EXPORT Debug& operator<<(Debug& debug, Version value);
 
+/**
+@brief Enumerate instance version
+@m_since_latest
+
+Note that the @fn_vk{EnumerateInstanceVersion} function isn't available in
+Vulkan 1.0 and thus is fetched at runtime via @fn_vk{GetInstanceProcAddr}
+called in a static constructor. On Vulkan 1.0 always returns
+@ref Version::Vk10, in newer versions the returned version number contains also
+patch information.
+@see @ref versionMajor(), @ref versionMinor(), @ref versionPatch(),
+    @fn_vk_keyword{EnumerateInstanceVersion}
+*/
+MAGNUM_VK_EXPORT Version enumerateInstanceVersion();
+
 }}
 
 #endif