From deec214ad95008182769e3cdf9c7e64e3c1ae734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 12 Apr 2023 18:56:42 +0200 Subject: [PATCH] Use the new EnumSet-from-underlying-type constructor for less confusion. --- src/Magnum/Shaders/MeshVisualizerGL.h | 4 ++-- src/Magnum/Vk/DeviceProperties.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Magnum/Shaders/MeshVisualizerGL.h b/src/Magnum/Shaders/MeshVisualizerGL.h index cd479e49b..27b13877c 100644 --- a/src/Magnum/Shaders/MeshVisualizerGL.h +++ b/src/Magnum/Shaders/MeshVisualizerGL.h @@ -683,7 +683,7 @@ class MAGNUM_SHADERS_EXPORT MeshVisualizerGL2D: public Implementation::MeshVisua * @see @ref Configuration::setFlags() */ Flags flags() const { - return Flag(UnsignedInt(Implementation::MeshVisualizerGLBase::_flags)); + return Flags(UnsignedInt(Implementation::MeshVisualizerGLBase::_flags)); } #ifndef MAGNUM_TARGET_GLES2 @@ -2419,7 +2419,7 @@ class MAGNUM_SHADERS_EXPORT MeshVisualizerGL3D: public Implementation::MeshVisua * @see @ref Configuration::setFlags() */ Flags flags() const { - return Flag(UnsignedInt(Implementation::MeshVisualizerGLBase::_flags)); + return Flags(UnsignedInt(Implementation::MeshVisualizerGLBase::_flags)); } #ifndef MAGNUM_TARGET_GLES2 diff --git a/src/Magnum/Vk/DeviceProperties.cpp b/src/Magnum/Vk/DeviceProperties.cpp index c19982175..b4b44a1bf 100644 --- a/src/Magnum/Vk/DeviceProperties.cpp +++ b/src/Magnum/Vk/DeviceProperties.cpp @@ -432,7 +432,7 @@ QueueFlags DeviceProperties::queueFamilyFlags(const UnsignedInt id) { const Containers::ArrayView properties = queueFamilyProperties(); CORRADE_ASSERT(id < properties.size(), "Vk::DeviceProperties::queueFamilyFlags(): index" << id << "out of range for" << properties.size() << "entries", {}); - return QueueFlag(properties[id].queueFamilyProperties.queueFlags); + return QueueFlags(properties[id].queueFamilyProperties.queueFlags); } UnsignedInt DeviceProperties::pickQueueFamily(const QueueFlags flags) { @@ -488,7 +488,7 @@ MemoryHeapFlags DeviceProperties::memoryHeapFlags(const UnsignedInt heap) { const VkPhysicalDeviceMemoryProperties& properties = memoryProperties().memoryProperties; CORRADE_ASSERT(heap < properties.memoryHeapCount, "Vk::DeviceProperties::memoryHeapFlags(): index" << heap << "out of range for" << properties.memoryHeapCount << "memory heaps", {}); - return MemoryHeapFlag(properties.memoryHeaps[heap].flags); + return MemoryHeapFlags(properties.memoryHeaps[heap].flags); } UnsignedInt DeviceProperties::memoryCount() { @@ -499,7 +499,7 @@ MemoryFlags DeviceProperties::memoryFlags(const UnsignedInt memory) { const VkPhysicalDeviceMemoryProperties& properties = memoryProperties().memoryProperties; CORRADE_ASSERT(memory < properties.memoryTypeCount, "Vk::DeviceProperties::memoryFlags(): index" << memory << "out of range for" << properties.memoryTypeCount << "memory types", {}); - return MemoryFlag(properties.memoryTypes[memory].propertyFlags); + return MemoryFlags(properties.memoryTypes[memory].propertyFlags); } UnsignedInt DeviceProperties::memoryHeapIndex(const UnsignedInt memory) {