mewin/vulkan-hpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed type of m_dispatch member from const& to const* in ObjectDestroy, ObjectFree and PoolFree (fixes #233) (#236)

Browse Source
This commit is contained in:
Florian Oetke 2018-08-13 09:55:02 +02:00 committed by Markus Tavenrath
parent 7d264c7c10
commit 198bba07ad
2 changed files with 213 additions and 1021 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
VulkanHppGenerator.cpp
View File

@ -742,7 +742,7 @@ const std::string deleterClassString = R"(
ObjectDestroy( OwnerType owner = OwnerType(), Optional<const AllocationCallbacks> allocator = nullptr, Dispatch const &dispatch = Dispatch() ) ObjectDestroy( OwnerType owner = OwnerType(), Optional<const AllocationCallbacks> allocator = nullptr, Dispatch const &dispatch = Dispatch() )
: m_owner( owner ) : m_owner( owner )
, m_allocator( allocator ) , m_allocator( allocator )
, m_dispatch( dispatch ) , m_dispatch( &dispatch )
{} {}
OwnerType getOwner() const { return m_owner; } OwnerType getOwner() const { return m_owner; }
@ -752,13 +752,13 @@ const std::string deleterClassString = R"(
template <typename T> template <typename T>
void destroy(T t) void destroy(T t)
{ {
m_owner.destroy( t, m_allocator, m_dispatch ); m_owner.destroy( t, m_allocator, *m_dispatch );
} }
private: private:
OwnerType m_owner; OwnerType m_owner;
Optional<const AllocationCallbacks> m_allocator; Optional<const AllocationCallbacks> m_allocator;
Dispatch const& m_dispatch; Dispatch const* m_dispatch;
}; };
class NoParent; class NoParent;
@ -769,7 +769,7 @@ const std::string deleterClassString = R"(
public: public:
ObjectDestroy( Optional<const AllocationCallbacks> allocator = nullptr, Dispatch const &dispatch = Dispatch() ) ObjectDestroy( Optional<const AllocationCallbacks> allocator = nullptr, Dispatch const &dispatch = Dispatch() )
: m_allocator( allocator ) : m_allocator( allocator )
, m_dispatch( dispatch ) , m_dispatch( &dispatch )
{} {}
Optional<const AllocationCallbacks> getAllocator() const { return m_allocator; } Optional<const AllocationCallbacks> getAllocator() const { return m_allocator; }
@ -778,12 +778,12 @@ const std::string deleterClassString = R"(
template <typename T> template <typename T>
void destroy(T t) void destroy(T t)
{ {
t.destroy( m_allocator, m_dispatch ); t.destroy( m_allocator, *m_dispatch );
} }
private: private:
Optional<const AllocationCallbacks> m_allocator; Optional<const AllocationCallbacks> m_allocator;
Dispatch const& m_dispatch; Dispatch const* m_dispatch;
}; };
template <typename OwnerType, typename Dispatch> template <typename OwnerType, typename Dispatch>
@ -793,7 +793,7 @@ const std::string deleterClassString = R"(
ObjectFree( OwnerType owner = OwnerType(), Optional<const AllocationCallbacks> allocator = nullptr, Dispatch const &dispatch = Dispatch() ) ObjectFree( OwnerType owner = OwnerType(), Optional<const AllocationCallbacks> allocator = nullptr, Dispatch const &dispatch = Dispatch() )
: m_owner( owner ) : m_owner( owner )
, m_allocator( allocator ) , m_allocator( allocator )
, m_dispatch( dispatch ) , m_dispatch( &dispatch )
{} {}
OwnerType getOwner() const { return m_owner; } OwnerType getOwner() const { return m_owner; }
@ -803,13 +803,13 @@ const std::string deleterClassString = R"(
template <typename T> template <typename T>
void destroy(T t) void destroy(T t)
{ {
m_owner.free( t, m_allocator, m_dispatch ); m_owner.free( t, m_allocator, *m_dispatch );
} }
private: private:
OwnerType m_owner; OwnerType m_owner;
Optional<const AllocationCallbacks> m_allocator; Optional<const AllocationCallbacks> m_allocator;
Dispatch const& m_dispatch; Dispatch const* m_dispatch;
}; };
template <typename OwnerType, typename PoolType, typename Dispatch> template <typename OwnerType, typename PoolType, typename Dispatch>
@ -819,7 +819,7 @@ const std::string deleterClassString = R"(
PoolFree( OwnerType owner = OwnerType(), PoolType pool = PoolType(), Dispatch const &dispatch = Dispatch() ) PoolFree( OwnerType owner = OwnerType(), PoolType pool = PoolType(), Dispatch const &dispatch = Dispatch() )
: m_owner( owner ) : m_owner( owner )
, m_pool( pool ) , m_pool( pool )
, m_dispatch( dispatch ) , m_dispatch( &dispatch )
{} {}
OwnerType getOwner() const { return m_owner; } OwnerType getOwner() const { return m_owner; }
@ -829,13 +829,13 @@ const std::string deleterClassString = R"(
template <typename T> template <typename T>
void destroy(T t) void destroy(T t)
{ {
m_owner.free( m_pool, t, m_dispatch ); m_owner.free( m_pool, t, *m_dispatch );
} }
private: private:
OwnerType m_owner; OwnerType m_owner;
PoolType m_pool; PoolType m_pool;
Dispatch const& m_dispatch; Dispatch const* m_dispatch;
}; };
)"; )";

1210
vulkan/vulkan.hpp
View File

File diff suppressed because it is too large Load Diff