From 71b2fca3d82b8a551ac2f19be0d9ade28c23cf01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 13 Dec 2020 23:00:12 +0100 Subject: [PATCH] Vk: rename private Device member for clarity. --- src/Magnum/Vk/Device.cpp | 8 ++++---- src/Magnum/Vk/Device.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Magnum/Vk/Device.cpp b/src/Magnum/Vk/Device.cpp index 12e56ef04..483f00642 100644 --- a/src/Magnum/Vk/Device.cpp +++ b/src/Magnum/Vk/Device.cpp @@ -423,7 +423,7 @@ Device::Device(NoCreateT): _handle{}, _functionPointers{} {} Device::Device(Device&& other) noexcept: _handle{other._handle}, _flags{other._flags}, _version{other._version}, - _extensionStatus{other._extensionStatus}, _properties{std::move(other._properties)}, _state{std::move(other._state)}, + _enabledExtensions{other._enabledExtensions}, _properties{std::move(other._properties)}, _state{std::move(other._state)}, /* Can't use {} with GCC 4.8 here because it tries to initialize the first member instead of doing a copy */ _functionPointers(other._functionPointers) @@ -442,7 +442,7 @@ Device& Device::operator=(Device&& other) noexcept { swap(other._handle, _handle); swap(other._flags, _flags); swap(other._version, _version); - swap(other._extensionStatus, _extensionStatus); + swap(other._enabledExtensions, _enabledExtensions); swap(other._properties, _properties); swap(other._state, _state); swap(other._functionPointers, _functionPointers); @@ -462,7 +462,7 @@ template void Device::initializeExtensions(const Containers::ArrayView< return a.string() < static_cast(b); }); if(found->string() != extension) continue; - _extensionStatus.set(found->index(), true); + _enabledExtensions.set(found->index(), true); } } } @@ -477,7 +477,7 @@ void Device::initialize(Instance& instance, const Version version) { } bool Device::isExtensionEnabled(const Extension& extension) const { - return _extensionStatus[extension.index()]; + return _enabledExtensions[extension.index()]; } VkDevice Device::release() { diff --git a/src/Magnum/Vk/Device.h b/src/Magnum/Vk/Device.h index 6f3bc6e76..a35af001b 100644 --- a/src/Magnum/Vk/Device.h +++ b/src/Magnum/Vk/Device.h @@ -289,7 +289,7 @@ class MAGNUM_VK_EXPORT Device { */ template bool isExtensionEnabled() const { static_assert(Implementation::IsExtension::value, "expected a Vulkan device extension"); - return _extensionStatus[E::Index]; + return _enabledExtensions[E::Index]; } /** @overload */ @@ -352,7 +352,7 @@ class MAGNUM_VK_EXPORT Device { VkDevice _handle; HandleFlags _flags; Version _version; - Math::BoolVector _extensionStatus; + Math::BoolVector _enabledExtensions; Containers::Pointer _properties; Containers::Pointer _state;