mirror of
https://github.com/KhronosGroup/Vulkan-Hpp.git
synced 2024-10-14 16:32:17 +00:00
Cleanup on helper classes ObjectDestroy and ObjectFree
This commit is contained in:
parent
987fbd8ee1
commit
b9a1af5aa1
@ -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<const AllocationCallbacks> 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<const AllocationCallbacks> 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<const AllocationCallbacks> getAllocator() const VULKAN_HPP_NOEXCEPT { return m_allocationCallbacks; }
|
||||
@ -7947,9 +7946,9 @@ int main( int argc, char ** argv )
|
||||
}
|
||||
|
||||
private:
|
||||
OwnerType m_owner;
|
||||
Optional<const AllocationCallbacks> m_allocationCallbacks;
|
||||
Dispatch const* m_dispatch;
|
||||
OwnerType m_owner = {};
|
||||
Optional<const AllocationCallbacks> m_allocationCallbacks = nullptr;
|
||||
Dispatch const * m_dispatch = nullptr;
|
||||
};
|
||||
|
||||
class NoParent;
|
||||
@ -7958,15 +7957,13 @@ int main( int argc, char ** argv )
|
||||
class ObjectDestroy<NoParent,Dispatch>
|
||||
{
|
||||
public:
|
||||
ObjectDestroy()
|
||||
: m_allocationCallbacks( nullptr )
|
||||
, m_dispatch( nullptr )
|
||||
{}
|
||||
ObjectDestroy() = default;
|
||||
|
||||
ObjectDestroy( Optional<const AllocationCallbacks> allocationCallbacks, Dispatch const &dispatch VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ) VULKAN_HPP_NOEXCEPT
|
||||
: m_allocationCallbacks( allocationCallbacks )
|
||||
, m_dispatch( &dispatch )
|
||||
{}
|
||||
ObjectDestroy( Optional<const AllocationCallbacks> allocationCallbacks,
|
||||
Dispatch const & dispatch = VULKAN_HPP_DEFAULT_DISPATCHER ) VULKAN_HPP_NOEXCEPT
|
||||
: m_allocationCallbacks( allocationCallbacks )
|
||||
, m_dispatch( &dispatch )
|
||||
{}
|
||||
|
||||
Optional<const AllocationCallbacks> getAllocator() const VULKAN_HPP_NOEXCEPT { return m_allocationCallbacks; }
|
||||
|
||||
@ -7979,8 +7976,8 @@ int main( int argc, char ** argv )
|
||||
}
|
||||
|
||||
private:
|
||||
Optional<const AllocationCallbacks> m_allocationCallbacks;
|
||||
Dispatch const* m_dispatch;
|
||||
Optional<const AllocationCallbacks> 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<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_allocationCallbacks( allocationCallbacks )
|
||||
, m_dispatch( &dispatch )
|
||||
@ -8018,9 +8015,9 @@ int main( int argc, char ** argv )
|
||||
}
|
||||
|
||||
private:
|
||||
OwnerType m_owner;
|
||||
Optional<const AllocationCallbacks> m_allocationCallbacks;
|
||||
Dispatch const * m_dispatch;
|
||||
OwnerType m_owner = {};
|
||||
Optional<const AllocationCallbacks> m_allocationCallbacks = nullptr;
|
||||
Dispatch const * m_dispatch = nullptr;
|
||||
};
|
||||
)";
|
||||
|
||||
|
@ -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<const AllocationCallbacks> 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<const AllocationCallbacks> m_allocationCallbacks;
|
||||
Dispatch const * m_dispatch;
|
||||
OwnerType m_owner = {};
|
||||
Optional<const AllocationCallbacks> m_allocationCallbacks = nullptr;
|
||||
Dispatch const * m_dispatch = nullptr;
|
||||
};
|
||||
|
||||
class NoParent;
|
||||
@ -4889,10 +4889,10 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
class ObjectDestroy<NoParent, Dispatch>
|
||||
{
|
||||
public:
|
||||
ObjectDestroy() : m_allocationCallbacks( nullptr ), m_dispatch( nullptr ) {}
|
||||
ObjectDestroy() = default;
|
||||
|
||||
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_dispatch( &dispatch )
|
||||
{}
|
||||
@ -4911,19 +4911,19 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
}
|
||||
|
||||
private:
|
||||
Optional<const AllocationCallbacks> m_allocationCallbacks;
|
||||
Dispatch const * m_dispatch;
|
||||
Optional<const AllocationCallbacks> m_allocationCallbacks = nullptr;
|
||||
Dispatch const * m_dispatch = nullptr;
|
||||
};
|
||||
|
||||
template <typename OwnerType, typename Dispatch>
|
||||
class ObjectFree
|
||||
{
|
||||
public:
|
||||
ObjectFree() : m_owner(), m_allocationCallbacks( nullptr ), m_dispatch( nullptr ) {}
|
||||
ObjectFree() = default;
|
||||
|
||||
ObjectFree( OwnerType owner,
|
||||
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_allocationCallbacks( allocationCallbacks )
|
||||
, m_dispatch( &dispatch )
|
||||
@ -4948,9 +4948,9 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
}
|
||||
|
||||
private:
|
||||
OwnerType m_owner;
|
||||
Optional<const AllocationCallbacks> m_allocationCallbacks;
|
||||
Dispatch const * m_dispatch;
|
||||
OwnerType m_owner = {};
|
||||
Optional<const AllocationCallbacks> m_allocationCallbacks = nullptr;
|
||||
Dispatch const * m_dispatch = nullptr;
|
||||
};
|
||||
|
||||
template <typename OwnerType, typename PoolType, typename Dispatch>
|
||||
|
Loading…
Reference in New Issue
Block a user