From b9a1af5aa1e502d7a10dc93f204b56e75f09c627 Mon Sep 17 00:00:00 2001 From: asuessenbach Date: Mon, 17 Aug 2020 14:26:25 +0200 Subject: [PATCH] Cleanup on helper classes ObjectDestroy and ObjectFree --- VulkanHppGenerator.cpp | 55 ++++++++++++++++++++---------------------- vulkan/vulkan.hpp | 30 +++++++++++------------ 2 files changed, 41 insertions(+), 44 deletions(-) diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index f849407..2056e3e 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -7923,17 +7923,16 @@ int main( int argc, char ** argv ) class ObjectDestroy { public: - ObjectDestroy() - : m_owner() - , m_allocationCallbacks( nullptr ) - , m_dispatch( nullptr ) - {} + ObjectDestroy() = default; - ObjectDestroy( OwnerType owner, Optional allocationCallbacks VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT, Dispatch const &dispatch VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT - : m_owner( owner ) - , m_allocationCallbacks( allocationCallbacks ) - , m_dispatch( &dispatch ) - {} + ObjectDestroy( OwnerType owner, + Optional allocationCallbacks + VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT, + Dispatch const & dispatch = VULKAN_HPP_DEFAULT_DISPATCHER ) VULKAN_HPP_NOEXCEPT + : m_owner( owner ) + , m_allocationCallbacks( allocationCallbacks ) + , m_dispatch( &dispatch ) + {} OwnerType getOwner() const VULKAN_HPP_NOEXCEPT { return m_owner; } Optional getAllocator() const VULKAN_HPP_NOEXCEPT { return m_allocationCallbacks; } @@ -7947,9 +7946,9 @@ int main( int argc, char ** argv ) } private: - OwnerType m_owner; - Optional m_allocationCallbacks; - Dispatch const* m_dispatch; + OwnerType m_owner = {}; + Optional m_allocationCallbacks = nullptr; + Dispatch const * m_dispatch = nullptr; }; class NoParent; @@ -7958,15 +7957,13 @@ int main( int argc, char ** argv ) class ObjectDestroy { public: - ObjectDestroy() - : m_allocationCallbacks( nullptr ) - , m_dispatch( nullptr ) - {} + ObjectDestroy() = default; - ObjectDestroy( Optional allocationCallbacks, Dispatch const &dispatch VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT - : m_allocationCallbacks( allocationCallbacks ) - , m_dispatch( &dispatch ) - {} + ObjectDestroy( Optional allocationCallbacks, + Dispatch const & dispatch = VULKAN_HPP_DEFAULT_DISPATCHER ) VULKAN_HPP_NOEXCEPT + : m_allocationCallbacks( allocationCallbacks ) + , m_dispatch( &dispatch ) + {} Optional getAllocator() const VULKAN_HPP_NOEXCEPT { return m_allocationCallbacks; } @@ -7979,8 +7976,8 @@ int main( int argc, char ** argv ) } private: - Optional m_allocationCallbacks; - Dispatch const* m_dispatch; + Optional m_allocationCallbacks = nullptr; + Dispatch const * m_dispatch = nullptr; }; )"; @@ -7989,11 +7986,11 @@ int main( int argc, char ** argv ) class ObjectFree { public: - ObjectFree() : m_owner(), m_allocationCallbacks( nullptr ), m_dispatch( nullptr ) {} + ObjectFree() = default; - ObjectFree( OwnerType owner, + ObjectFree( OwnerType owner, Optional allocationCallbacks VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT, - Dispatch const & dispatch VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT + Dispatch const & dispatch = VULKAN_HPP_DEFAULT_DISPATCHER ) VULKAN_HPP_NOEXCEPT : m_owner( owner ) , m_allocationCallbacks( allocationCallbacks ) , m_dispatch( &dispatch ) @@ -8018,9 +8015,9 @@ int main( int argc, char ** argv ) } private: - OwnerType m_owner; - Optional m_allocationCallbacks; - Dispatch const * m_dispatch; + OwnerType m_owner = {}; + Optional m_allocationCallbacks = nullptr; + Dispatch const * m_dispatch = nullptr; }; )"; diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index efc62e4..cb0d88d 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -4849,12 +4849,12 @@ namespace VULKAN_HPP_NAMESPACE class ObjectDestroy { public: - ObjectDestroy() : m_owner(), m_allocationCallbacks( nullptr ), m_dispatch( nullptr ) {} + ObjectDestroy() = default; ObjectDestroy( OwnerType owner, Optional allocationCallbacks - VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT, - Dispatch const & dispatch VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT + VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT, + Dispatch const & dispatch = VULKAN_HPP_DEFAULT_DISPATCHER ) VULKAN_HPP_NOEXCEPT : m_owner( owner ) , m_allocationCallbacks( allocationCallbacks ) , m_dispatch( &dispatch ) @@ -4878,9 +4878,9 @@ namespace VULKAN_HPP_NAMESPACE } private: - OwnerType m_owner; - Optional m_allocationCallbacks; - Dispatch const * m_dispatch; + OwnerType m_owner = {}; + Optional m_allocationCallbacks = nullptr; + Dispatch const * m_dispatch = nullptr; }; class NoParent; @@ -4889,10 +4889,10 @@ namespace VULKAN_HPP_NAMESPACE class ObjectDestroy { public: - ObjectDestroy() : m_allocationCallbacks( nullptr ), m_dispatch( nullptr ) {} + ObjectDestroy() = default; ObjectDestroy( Optional allocationCallbacks, - Dispatch const & dispatch VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT + Dispatch const & dispatch = VULKAN_HPP_DEFAULT_DISPATCHER ) VULKAN_HPP_NOEXCEPT : m_allocationCallbacks( allocationCallbacks ) , m_dispatch( &dispatch ) {} @@ -4911,19 +4911,19 @@ namespace VULKAN_HPP_NAMESPACE } private: - Optional m_allocationCallbacks; - Dispatch const * m_dispatch; + Optional m_allocationCallbacks = nullptr; + Dispatch const * m_dispatch = nullptr; }; template class ObjectFree { public: - ObjectFree() : m_owner(), m_allocationCallbacks( nullptr ), m_dispatch( nullptr ) {} + ObjectFree() = default; ObjectFree( OwnerType owner, Optional allocationCallbacks VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT, - Dispatch const & dispatch VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT + Dispatch const & dispatch = VULKAN_HPP_DEFAULT_DISPATCHER ) VULKAN_HPP_NOEXCEPT : m_owner( owner ) , m_allocationCallbacks( allocationCallbacks ) , m_dispatch( &dispatch ) @@ -4948,9 +4948,9 @@ namespace VULKAN_HPP_NAMESPACE } private: - OwnerType m_owner; - Optional m_allocationCallbacks; - Dispatch const * m_dispatch; + OwnerType m_owner = {}; + Optional m_allocationCallbacks = nullptr; + Dispatch const * m_dispatch = nullptr; }; template