nerdcruft/libcruft-vk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

traits: use wrapper_traits for wrapper create/destroy indirection

Browse Source
This commit is contained in:
Danny Robson 2017-09-13 16:50:23 +10:00
parent 4ecac0648b
commit 0ccbfc1cbe
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
object.hpp
View File

@ -58,7 +58,7 @@ namespace cruft::vk {
root (Args &&...args): root (Args &&...args):
object<SelfT> ( object<SelfT> (
cruft::vk::error::try_query ( cruft::vk::error::try_query (
life_traits<native_t<SelfT>>::create, wrapper_traits<SelfT>::create,
std::forward<Args> (args)... std::forward<Args> (args)...
) )
) )
@ -66,7 +66,7 @@ namespace cruft::vk {
~root () ~root ()
{ {
life_traits<native_t<SelfT>>::destroy (this->native (), nullptr); wrapper_traits<SelfT>::destroy (this->native (), nullptr);
} }
}; };
@ -81,7 +81,7 @@ namespace cruft::vk {
descendant (ParentT &parent, Args &&...args): descendant (ParentT &parent, Args &&...args):
object<SelfT> ( object<SelfT> (
cruft::vk::error::try_query( cruft::vk::error::try_query(
life_traits<native_t<SelfT>>::create, wrapper_traits<SelfT>::create,
parent.native (), parent.native (),
std::forward<Args> (args)... std::forward<Args> (args)...
) )
@ -92,7 +92,7 @@ namespace cruft::vk {
//--------------------------------------------------------------------- //---------------------------------------------------------------------
~descendant () ~descendant ()
{ {
life_traits<native_t<SelfT>>::destroy (this->native (), nullptr); wrapper_traits<SelfT>::destroy (this->native (), nullptr);
} }
}; };
@ -129,7 +129,7 @@ namespace cruft::vk {
owned (OwnerT &owner, Args &&...args): owned (OwnerT &owner, Args &&...args):
object<SelfT> ( object<SelfT> (
error::try_query ( error::try_query (
life_traits<native_t<SelfT>>::create, wrapper_traits<SelfT>::create,
owner.native (), owner.native (),
std::forward<Args> (args)... std::forward<Args> (args)...
) )
@ -154,7 +154,7 @@ namespace cruft::vk {
void void
destroy (OwnerT &owner) destroy (OwnerT &owner)
{ {
life_traits<native_t<SelfT>>::destroy (owner.native (), this->native (), nullptr); wrapper_traits<SelfT>::destroy (owner.native (), this->native (), nullptr);
this->m_native = VK_NULL_HANDLE; this->m_native = VK_NULL_HANDLE;
} }
}; };

12
traits.hpp
View File

@ -170,6 +170,8 @@ namespace cruft::vk {
template <> struct owner_traits<shader_module> { using type = device; }; template <> struct owner_traits<shader_module> { using type = device; };
template <> struct owner_traits<surface> { using type = instance; }; template <> struct owner_traits<surface> { using type = instance; };
template <> struct owner_traits<swapchain> { using type = device; }; template <> struct owner_traits<swapchain> { using type = device; };
template <> struct owner_traits<pipeline<bindpoint::GRAPHICS>> { using type = device; };
template <> struct owner_traits<pipeline<bindpoint::COMPUTE>> { using type = device; };
template <typename T> template <typename T>
using owner_t = typename owner_traits<T>::type; using owner_t = typename owner_traits<T>::type;
@ -314,16 +316,22 @@ namespace cruft::vk {
}; };
///////////////////////////////////////////////////////////////////////////
template <typename T>
struct wrapper_traits : public life_traits<native_t<T>> { };
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
template <> template <>
struct life_traits<pipeline<bindpoint::GRAPHICS>> { struct wrapper_traits<pipeline<bindpoint::GRAPHICS>> {
static constexpr auto &create = vkCreateGraphicsPipelines; static constexpr auto &create = vkCreateGraphicsPipelines;
static constexpr auto &destroy = vkDestroyPipeline; static constexpr auto &destroy = vkDestroyPipeline;
}; };
//-------------------------------------------------------------------------
template <> template <>
struct life_traits<pipeline<bindpoint::COMPUTE>> { struct wrapper_traits<pipeline<bindpoint::COMPUTE>> {
static constexpr auto &create = vkCreateComputePipelines; static constexpr auto &create = vkCreateComputePipelines;
static constexpr auto &destroy = vkDestroyPipeline; static constexpr auto &destroy = vkDestroyPipeline;
}; };