TheCloud/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2025-09-12 13:27:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #717 from asuessenbach/cleanup

Browse Source 
Cleanup on helper classes ObjectDestroy and ObjectFree
This commit is contained in:
Andreas Süßenbach 2020-08-17 16:45:00 +02:00 committed by GitHub
commit 654a6b4e09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
VulkanHppGenerator.cpp
View File

@ -7923,17 +7923,16 @@ int main( int argc, char ** argv )
class ObjectDestroy class ObjectDestroy
{ {
public: public:
ObjectDestroy() ObjectDestroy() = default;
: m_owner()
, m_allocationCallbacks( nullptr )
, m_dispatch( nullptr )
{}
ObjectDestroy( OwnerType owner, Optional<const AllocationCallbacks> allocationCallbacks VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT, Dispatch const &dispatch VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT ObjectDestroy( OwnerType owner,
: m_owner( owner ) Optional<const AllocationCallbacks> allocationCallbacks
, m_allocationCallbacks( allocationCallbacks ) VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT,
, m_dispatch( &dispatch ) 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; } OwnerType getOwner() const VULKAN_HPP_NOEXCEPT { return m_owner; }
Optional<const AllocationCallbacks> getAllocator() const VULKAN_HPP_NOEXCEPT { return m_allocationCallbacks; } Optional<const AllocationCallbacks> getAllocator() const VULKAN_HPP_NOEXCEPT { return m_allocationCallbacks; }
@ -7947,9 +7946,9 @@ int main( int argc, char ** argv )
} }
private: private:
OwnerType m_owner; OwnerType m_owner = {};
Optional<const AllocationCallbacks> m_allocationCallbacks; Optional<const AllocationCallbacks> m_allocationCallbacks = nullptr;
Dispatch const* m_dispatch; Dispatch const * m_dispatch = nullptr;
}; };
class NoParent; class NoParent;
@ -7958,15 +7957,13 @@ int main( int argc, char ** argv )
class ObjectDestroy<NoParent,Dispatch> class ObjectDestroy<NoParent,Dispatch>
{ {
public: public:
ObjectDestroy() ObjectDestroy() = default;
: m_allocationCallbacks( nullptr )
, m_dispatch( nullptr )
{}
ObjectDestroy( Optional<const AllocationCallbacks> allocationCallbacks, Dispatch const &dispatch VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT ObjectDestroy( Optional<const AllocationCallbacks> allocationCallbacks,
: m_allocationCallbacks( allocationCallbacks ) Dispatch const & dispatch = VULKAN_HPP_DEFAULT_DISPATCHER ) VULKAN_HPP_NOEXCEPT
, m_dispatch( &dispatch ) : m_allocationCallbacks( allocationCallbacks )
{} , m_dispatch( &dispatch )
{}
Optional<const AllocationCallbacks> getAllocator() const VULKAN_HPP_NOEXCEPT { return m_allocationCallbacks; } Optional<const AllocationCallbacks> getAllocator() const VULKAN_HPP_NOEXCEPT { return m_allocationCallbacks; }
@ -7979,8 +7976,8 @@ int main( int argc, char ** argv )
} }
private: private:
Optional<const AllocationCallbacks> m_allocationCallbacks; Optional<const AllocationCallbacks> m_allocationCallbacks = nullptr;
Dispatch const* m_dispatch; Dispatch const * m_dispatch = nullptr;
}; };
)"; )";
@ -7989,11 +7986,11 @@ int main( int argc, char ** argv )
class ObjectFree class ObjectFree
{ {
public: public:
ObjectFree() : m_owner(), m_allocationCallbacks( nullptr ), m_dispatch( nullptr ) {} ObjectFree() = default;
ObjectFree( OwnerType owner, ObjectFree( OwnerType owner,
Optional<const AllocationCallbacks> allocationCallbacks VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT, Optional<const AllocationCallbacks> 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_owner( owner )
, m_allocationCallbacks( allocationCallbacks ) , m_allocationCallbacks( allocationCallbacks )
, m_dispatch( &dispatch ) , m_dispatch( &dispatch )
@ -8018,9 +8015,9 @@ int main( int argc, char ** argv )
} }
private: private:
OwnerType m_owner; OwnerType m_owner = {};
Optional<const AllocationCallbacks> m_allocationCallbacks; Optional<const AllocationCallbacks> m_allocationCallbacks = nullptr;
Dispatch const * m_dispatch; Dispatch const * m_dispatch = nullptr;
}; };
)"; )";

30
vulkan/vulkan.hpp
View File

@ -4849,12 +4849,12 @@ namespace VULKAN_HPP_NAMESPACE
class ObjectDestroy class ObjectDestroy
{ {
public: public:
ObjectDestroy() : m_owner(), m_allocationCallbacks( nullptr ), m_dispatch( nullptr ) {} ObjectDestroy() = default;
ObjectDestroy( OwnerType owner, ObjectDestroy( OwnerType owner,
Optional<const AllocationCallbacks> allocationCallbacks Optional<const AllocationCallbacks> allocationCallbacks
VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT, 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_owner( owner )
, m_allocationCallbacks( allocationCallbacks ) , m_allocationCallbacks( allocationCallbacks )
, m_dispatch( &dispatch ) , m_dispatch( &dispatch )
@ -4878,9 +4878,9 @@ namespace VULKAN_HPP_NAMESPACE
} }
private: private:
OwnerType m_owner; OwnerType m_owner = {};
Optional<const AllocationCallbacks> m_allocationCallbacks; Optional<const AllocationCallbacks> m_allocationCallbacks = nullptr;
Dispatch const * m_dispatch; Dispatch const * m_dispatch = nullptr;
}; };
class NoParent; class NoParent;
@ -4889,10 +4889,10 @@ namespace VULKAN_HPP_NAMESPACE
class ObjectDestroy<NoParent, Dispatch> class ObjectDestroy<NoParent, Dispatch>
{ {
public: public:
ObjectDestroy() : m_allocationCallbacks( nullptr ), m_dispatch( nullptr ) {} ObjectDestroy() = default;
ObjectDestroy( Optional<const AllocationCallbacks> allocationCallbacks, ObjectDestroy( Optional<const AllocationCallbacks> 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_allocationCallbacks( allocationCallbacks )
, m_dispatch( &dispatch ) , m_dispatch( &dispatch )
{} {}
@ -4911,19 +4911,19 @@ namespace VULKAN_HPP_NAMESPACE
} }
private: private:
Optional<const AllocationCallbacks> m_allocationCallbacks; Optional<const AllocationCallbacks> m_allocationCallbacks = nullptr;
Dispatch const * m_dispatch; Dispatch const * m_dispatch = nullptr;
}; };
template <typename OwnerType, typename Dispatch> template <typename OwnerType, typename Dispatch>
class ObjectFree class ObjectFree
{ {
public: public:
ObjectFree() : m_owner(), m_allocationCallbacks( nullptr ), m_dispatch( nullptr ) {} ObjectFree() = default;
ObjectFree( OwnerType owner, ObjectFree( OwnerType owner,
Optional<const AllocationCallbacks> allocationCallbacks VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT, Optional<const AllocationCallbacks> 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_owner( owner )
, m_allocationCallbacks( allocationCallbacks ) , m_allocationCallbacks( allocationCallbacks )
, m_dispatch( &dispatch ) , m_dispatch( &dispatch )
@ -4948,9 +4948,9 @@ namespace VULKAN_HPP_NAMESPACE
} }
private: private:
OwnerType m_owner; OwnerType m_owner = {};
Optional<const AllocationCallbacks> m_allocationCallbacks; Optional<const AllocationCallbacks> m_allocationCallbacks = nullptr;
Dispatch const * m_dispatch; Dispatch const * m_dispatch = nullptr;
}; };
template <typename OwnerType, typename PoolType, typename Dispatch> template <typename OwnerType, typename PoolType, typename Dispatch>