From b533599dd9ef703e0daddbe70c6a528f8225811b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 13 Mar 2021 09:38:47 +0100 Subject: [PATCH] Vk: add debug output for DescriptorType. Will need it in one assert. --- src/Magnum/Vk/CMakeLists.txt | 1 + src/Magnum/Vk/DescriptorType.cpp | 58 +++++++++++++++++++++++ src/Magnum/Vk/DescriptorType.h | 7 +++ src/Magnum/Vk/Test/CMakeLists.txt | 2 + src/Magnum/Vk/Test/DescriptorTypeTest.cpp | 52 ++++++++++++++++++++ 5 files changed, 120 insertions(+) create mode 100644 src/Magnum/Vk/DescriptorType.cpp create mode 100644 src/Magnum/Vk/Test/DescriptorTypeTest.cpp diff --git a/src/Magnum/Vk/CMakeLists.txt b/src/Magnum/Vk/CMakeLists.txt index 5335d956b..95abbc271 100644 --- a/src/Magnum/Vk/CMakeLists.txt +++ b/src/Magnum/Vk/CMakeLists.txt @@ -30,6 +30,7 @@ set(MagnumVk_SRCS CommandBuffer.cpp CommandPool.cpp DescriptorSetLayout.cpp + DescriptorType.cpp Extensions.cpp Fence.cpp Framebuffer.cpp diff --git a/src/Magnum/Vk/DescriptorType.cpp b/src/Magnum/Vk/DescriptorType.cpp new file mode 100644 index 000000000..5b0080792 --- /dev/null +++ b/src/Magnum/Vk/DescriptorType.cpp @@ -0,0 +1,58 @@ +/* + This file is part of Magnum. + + Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, + 2020, 2021 Vladimír Vondruš + + 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 "DescriptorType.h" + +#include + +namespace Magnum { namespace Vk { + +Debug& operator<<(Debug& debug, const DescriptorType value) { + debug << "Vk::DescriptorType" << Debug::nospace; + + switch(value) { + /* LCOV_EXCL_START */ + #define _c(value) case Vk::DescriptorType::value: return debug << "::" << Debug::nospace << #value; + _c(Sampler) + _c(CombinedImageSampler) + _c(SampledImage) + _c(StorageImage) + _c(UniformTexelBuffer) + _c(StorageTexelBuffer) + _c(UniformBuffer) + _c(StorageBuffer) + _c(UniformBufferDynamic) + _c(StorageBufferDynamic) + _c(InputAttachment) + _c(AccelerationStructure) + #undef _c + /* LCOV_EXCL_STOP */ + } + + /* Vulkan docs have the values in decimal, so not converting to hex */ + return debug << "(" << Debug::nospace << Int(value) << Debug::nospace << ")"; +} + +}} diff --git a/src/Magnum/Vk/DescriptorType.h b/src/Magnum/Vk/DescriptorType.h index 9022eff01..494fe641e 100644 --- a/src/Magnum/Vk/DescriptorType.h +++ b/src/Magnum/Vk/DescriptorType.h @@ -30,6 +30,7 @@ * @m_since_latest */ +#include "Magnum/Vk/visibility.h" #include "Magnum/Vk/Vk.h" #include "Magnum/Vk/Vulkan.h" @@ -149,6 +150,12 @@ enum class DescriptorType: Int { AccelerationStructure = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR }; +/** +@debugoperatorenum{DescriptorType} +@m_since_latest +*/ +MAGNUM_VK_EXPORT Debug& operator<<(Debug& debug, DescriptorType value); + }} #endif diff --git a/src/Magnum/Vk/Test/CMakeLists.txt b/src/Magnum/Vk/Test/CMakeLists.txt index 04ca80668..5c40346b3 100644 --- a/src/Magnum/Vk/Test/CMakeLists.txt +++ b/src/Magnum/Vk/Test/CMakeLists.txt @@ -28,6 +28,7 @@ corrade_add_test(VkBufferTest BufferTest.cpp LIBRARIES MagnumVkTestLib) corrade_add_test(VkCommandBufferTest CommandBufferTest.cpp LIBRARIES MagnumVk) corrade_add_test(VkCommandPoolTest CommandPoolTest.cpp LIBRARIES MagnumVk) corrade_add_test(VkDescriptorSetLayoutTest DescriptorSetLayoutTest.cpp LIBRARIES MagnumVk) +corrade_add_test(VkDescriptorTypeTest DescriptorTypeTest.cpp LIBRARIES MagnumVk) corrade_add_test(VkDeviceTest DeviceTest.cpp LIBRARIES MagnumVk) corrade_add_test(VkDevicePropertiesTest DevicePropertiesTest.cpp LIBRARIES MagnumVk) corrade_add_test(VkDeviceFeaturesTest DeviceFeaturesTest.cpp LIBRARIES MagnumVk) @@ -131,6 +132,7 @@ set_target_properties( VkCommandBufferTest VkCommandPoolTest VkDescriptorSetLayoutTest + VkDescriptorTypeTest VkDeviceTest VkDeviceFeaturesTest VkDevicePropertiesTest diff --git a/src/Magnum/Vk/Test/DescriptorTypeTest.cpp b/src/Magnum/Vk/Test/DescriptorTypeTest.cpp new file mode 100644 index 000000000..4b1f89f8e --- /dev/null +++ b/src/Magnum/Vk/Test/DescriptorTypeTest.cpp @@ -0,0 +1,52 @@ +/* + This file is part of Magnum. + + Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, + 2020, 2021 Vladimír Vondruš + + 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 +#include +#include + +#include "Magnum/Vk/DescriptorType.h" + +namespace Magnum { namespace Vk { namespace Test { namespace { + +struct DescriptorTypeTest: TestSuite::Tester { + explicit DescriptorTypeTest(); + + void debug(); +}; + +DescriptorTypeTest::DescriptorTypeTest() { + addTests({&DescriptorTypeTest::debug}); +} + +void DescriptorTypeTest::debug() { + std::ostringstream out; + Debug{&out} << DescriptorType::InputAttachment << DescriptorType(-10007655); + CORRADE_COMPARE(out.str(), "Vk::DescriptorType::InputAttachment Vk::DescriptorType(-10007655)\n"); +} + +}}}} + +CORRADE_TEST_MAIN(Magnum::Vk::Test::DescriptorTypeTest)