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

Remove redundant occurrences of VULKAN_HPP_NAMESPACE:: in vulkan_shared.hpp (#2207)

Browse Source
This commit is contained in:
Andreas Süßenbach 2025-07-03 10:29:37 +02:00 committed by GitHub
parent de8730fd22
commit 2010d85fb4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 73 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
snippets/SharedHandleSpecializations.hpp
View File

@ -5,12 +5,12 @@ enum class SwapchainOwns
yes, yes,
}; };
struct ImageHeader : SharedHeader<DestructorTypeOf<VULKAN_HPP_NAMESPACE::Image>, typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter> struct ImageHeader : SharedHeader<DestructorTypeOf<Image>, typename SharedHandleTraits<Image>::deleter>
{ {
ImageHeader( SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::Image>> parent, ImageHeader( SharedHandle<DestructorTypeOf<Image>> parent,
typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter deleter = typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter(), typename SharedHandleTraits<Image>::deleter deleter = typename SharedHandleTraits<Image>::deleter(),
SwapchainOwns swapchainOwned = SwapchainOwns::no ) VULKAN_HPP_NOEXCEPT SwapchainOwns swapchainOwned = SwapchainOwns::no ) VULKAN_HPP_NOEXCEPT
: SharedHeader<DestructorTypeOf<VULKAN_HPP_NAMESPACE::Image>, typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter>( std::move( parent ), : SharedHeader<DestructorTypeOf<Image>, typename SharedHandleTraits<Image>::deleter>( std::move( parent ),
std::move( deleter ) ) std::move( deleter ) )
, swapchainOwned( swapchainOwned ) , swapchainOwned( swapchainOwned )
{ {
@ -20,25 +20,25 @@ struct ImageHeader : SharedHeader<DestructorTypeOf<VULKAN_HPP_NAMESPACE::Image>,
}; };
template <> template <>
class SharedHandle<VULKAN_HPP_NAMESPACE::Image> : public SharedHandleBase<VULKAN_HPP_NAMESPACE::Image, ImageHeader> class SharedHandle<Image> : public SharedHandleBase<Image, ImageHeader>
{ {
using BaseType = SharedHandleBase<VULKAN_HPP_NAMESPACE::Image, ImageHeader>; using BaseType = SharedHandleBase<Image, ImageHeader>;
using DeleterType = typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter; using DeleterType = typename SharedHandleTraits<Image>::deleter;
friend BaseType; friend BaseType;
public: public:
SharedHandle() = default; SharedHandle() = default;
explicit SharedHandle( VULKAN_HPP_NAMESPACE::Image handle, explicit SharedHandle( Image handle,
SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::Image>> parent, SharedHandle<DestructorTypeOf<Image>> parent,
SwapchainOwns swapchain_owned = SwapchainOwns::no, SwapchainOwns swapchain_owned = SwapchainOwns::no,
DeleterType deleter = DeleterType() ) VULKAN_HPP_NOEXCEPT DeleterType deleter = DeleterType() ) VULKAN_HPP_NOEXCEPT
: BaseType( handle, std::move( parent ), std::move( deleter ), swapchain_owned ) : BaseType( handle, std::move( parent ), std::move( deleter ), swapchain_owned )
{ {
} }
protected: protected:
static void internalDestroy( const ImageHeader & control, VULKAN_HPP_NAMESPACE::Image handle ) VULKAN_HPP_NOEXCEPT static void internalDestroy( const ImageHeader & control, Image handle ) VULKAN_HPP_NOEXCEPT
{ {
if ( control.swapchainOwned == SwapchainOwns::no ) if ( control.swapchainOwned == SwapchainOwns::no )
{ {
@ -49,41 +49,41 @@ protected:
struct SwapchainHeader struct SwapchainHeader
{ {
SwapchainHeader( SharedHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR> surface, SwapchainHeader( SharedHandle<SurfaceKHR> surface,
SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::SwapchainKHR>> parent, SharedHandle<DestructorTypeOf<SwapchainKHR>> parent,
typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::SwapchainKHR>::deleter deleter = typename SharedHandleTraits<SwapchainKHR>::deleter deleter =
typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::SwapchainKHR>::deleter() ) VULKAN_HPP_NOEXCEPT typename SharedHandleTraits<SwapchainKHR>::deleter() ) VULKAN_HPP_NOEXCEPT
: surface( std::move( surface ) ) : surface( std::move( surface ) )
, parent( std::move( parent ) ) , parent( std::move( parent ) )
, deleter( std::move( deleter ) ) , deleter( std::move( deleter ) )
{ {
} }
SharedHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR> surface{}; SharedHandle<SurfaceKHR> surface{};
SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::SwapchainKHR>> parent{}; SharedHandle<DestructorTypeOf<SwapchainKHR>> parent{};
typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::SwapchainKHR>::deleter deleter{}; typename SharedHandleTraits<SwapchainKHR>::deleter deleter{};
}; };
template <> template <>
class SharedHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR> : public SharedHandleBase<VULKAN_HPP_NAMESPACE::SwapchainKHR, SwapchainHeader> class SharedHandle<SwapchainKHR> : public SharedHandleBase<SwapchainKHR, SwapchainHeader>
{ {
using BaseType = SharedHandleBase<VULKAN_HPP_NAMESPACE::SwapchainKHR, SwapchainHeader>; using BaseType = SharedHandleBase<SwapchainKHR, SwapchainHeader>;
using DeleterType = typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::SwapchainKHR>::deleter; using DeleterType = typename SharedHandleTraits<SwapchainKHR>::deleter;
friend BaseType; friend BaseType;
public: public:
SharedHandle() = default; SharedHandle() = default;
explicit SharedHandle( VULKAN_HPP_NAMESPACE::SwapchainKHR handle, explicit SharedHandle( SwapchainKHR handle,
SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::SwapchainKHR>> parent, SharedHandle<DestructorTypeOf<SwapchainKHR>> parent,
SharedHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR> surface, SharedHandle<SurfaceKHR> surface,
DeleterType deleter = DeleterType() ) VULKAN_HPP_NOEXCEPT DeleterType deleter = DeleterType() ) VULKAN_HPP_NOEXCEPT
: BaseType( handle, std::move( surface ), std::move( parent ), std::move( deleter ) ) : BaseType( handle, std::move( surface ), std::move( parent ), std::move( deleter ) )
{ {
} }
public: public:
const SharedHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR> & getSurface() const VULKAN_HPP_NOEXCEPT const SharedHandle<SurfaceKHR> & getSurface() const VULKAN_HPP_NOEXCEPT
{ {
return getHeader().surface; return getHeader().surface;
} }

21
vulkan/vulkan_raii.hpp
View File

@ -8830,11 +8830,16 @@ namespace VULKAN_HPP_NAMESPACE
return *this; return *this;
} }
VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM const & operator*() const VULKAN_HPP_NOEXCEPT VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM const & operator*() const & VULKAN_HPP_NOEXCEPT
{ {
return m_dataGraphPipelineSessionARM; return m_dataGraphPipelineSessionARM;
} }
VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM const && operator*() const && VULKAN_HPP_NOEXCEPT
{
return std::move( m_dataGraphPipelineSessionARM );
}
operator VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM() const VULKAN_HPP_NOEXCEPT operator VULKAN_HPP_NAMESPACE::DataGraphPipelineSessionARM() const VULKAN_HPP_NOEXCEPT
{ {
return m_dataGraphPipelineSessionARM; return m_dataGraphPipelineSessionARM;
@ -14749,11 +14754,16 @@ namespace VULKAN_HPP_NAMESPACE
return *this; return *this;
} }
VULKAN_HPP_NAMESPACE::TensorARM const & operator*() const VULKAN_HPP_NOEXCEPT VULKAN_HPP_NAMESPACE::TensorARM const & operator*() const & VULKAN_HPP_NOEXCEPT
{ {
return m_tensorARM; return m_tensorARM;
} }
VULKAN_HPP_NAMESPACE::TensorARM const && operator*() const && VULKAN_HPP_NOEXCEPT
{
return std::move( m_tensorARM );
}
operator VULKAN_HPP_NAMESPACE::TensorARM() const VULKAN_HPP_NOEXCEPT operator VULKAN_HPP_NAMESPACE::TensorARM() const VULKAN_HPP_NOEXCEPT
{ {
return m_tensorARM; return m_tensorARM;
@ -14875,11 +14885,16 @@ namespace VULKAN_HPP_NAMESPACE
return *this; return *this;
} }
VULKAN_HPP_NAMESPACE::TensorViewARM const & operator*() const VULKAN_HPP_NOEXCEPT VULKAN_HPP_NAMESPACE::TensorViewARM const & operator*() const & VULKAN_HPP_NOEXCEPT
{ {
return m_tensorViewARM; return m_tensorViewARM;
} }
VULKAN_HPP_NAMESPACE::TensorViewARM const && operator*() const && VULKAN_HPP_NOEXCEPT
{
return std::move( m_tensorViewARM );
}
operator VULKAN_HPP_NAMESPACE::TensorViewARM() const VULKAN_HPP_NOEXCEPT operator VULKAN_HPP_NAMESPACE::TensorViewARM() const VULKAN_HPP_NOEXCEPT
{ {
return m_tensorViewARM; return m_tensorViewARM;

57
vulkan/vulkan_shared.hpp
View File

@ -1051,14 +1051,12 @@ namespace VULKAN_HPP_NAMESPACE
yes, yes,
}; };
struct ImageHeader : SharedHeader<DestructorTypeOf<VULKAN_HPP_NAMESPACE::Image>, typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter> struct ImageHeader : SharedHeader<DestructorTypeOf<Image>, typename SharedHandleTraits<Image>::deleter>
{ {
ImageHeader( ImageHeader( SharedHandle<DestructorTypeOf<Image>> parent,
SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::Image>> parent, typename SharedHandleTraits<Image>::deleter deleter = typename SharedHandleTraits<Image>::deleter(),
typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter deleter = typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter(), SwapchainOwns swapchainOwned = SwapchainOwns::no ) VULKAN_HPP_NOEXCEPT
SwapchainOwns swapchainOwned = SwapchainOwns::no ) VULKAN_HPP_NOEXCEPT : SharedHeader<DestructorTypeOf<Image>, typename SharedHandleTraits<Image>::deleter>( std::move( parent ), std::move( deleter ) )
: SharedHeader<DestructorTypeOf<VULKAN_HPP_NAMESPACE::Image>, typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter>( std::move( parent ),
std::move( deleter ) )
, swapchainOwned( swapchainOwned ) , swapchainOwned( swapchainOwned )
{ {
} }
@ -1067,25 +1065,25 @@ namespace VULKAN_HPP_NAMESPACE
}; };
template <> template <>
class SharedHandle<VULKAN_HPP_NAMESPACE::Image> : public SharedHandleBase<VULKAN_HPP_NAMESPACE::Image, ImageHeader> class SharedHandle<Image> : public SharedHandleBase<Image, ImageHeader>
{ {
using BaseType = SharedHandleBase<VULKAN_HPP_NAMESPACE::Image, ImageHeader>; using BaseType = SharedHandleBase<Image, ImageHeader>;
using DeleterType = typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::Image>::deleter; using DeleterType = typename SharedHandleTraits<Image>::deleter;
friend BaseType; friend BaseType;
public: public:
SharedHandle() = default; SharedHandle() = default;
explicit SharedHandle( VULKAN_HPP_NAMESPACE::Image handle, explicit SharedHandle( Image handle,
SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::Image>> parent, SharedHandle<DestructorTypeOf<Image>> parent,
SwapchainOwns swapchain_owned = SwapchainOwns::no, SwapchainOwns swapchain_owned = SwapchainOwns::no,
DeleterType deleter = DeleterType() ) VULKAN_HPP_NOEXCEPT DeleterType deleter = DeleterType() ) VULKAN_HPP_NOEXCEPT
: BaseType( handle, std::move( parent ), std::move( deleter ), swapchain_owned ) : BaseType( handle, std::move( parent ), std::move( deleter ), swapchain_owned )
{ {
} }
protected: protected:
static void internalDestroy( const ImageHeader & control, VULKAN_HPP_NAMESPACE::Image handle ) VULKAN_HPP_NOEXCEPT static void internalDestroy( const ImageHeader & control, Image handle ) VULKAN_HPP_NOEXCEPT
{ {
if ( control.swapchainOwned == SwapchainOwns::no ) if ( control.swapchainOwned == SwapchainOwns::no )
{ {
@ -1096,41 +1094,40 @@ namespace VULKAN_HPP_NAMESPACE
struct SwapchainHeader struct SwapchainHeader
{ {
SwapchainHeader( SharedHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR> surface, SwapchainHeader( SharedHandle<SurfaceKHR> surface,
SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::SwapchainKHR>> parent, SharedHandle<DestructorTypeOf<SwapchainKHR>> parent,
typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::SwapchainKHR>::deleter deleter = typename SharedHandleTraits<SwapchainKHR>::deleter deleter = typename SharedHandleTraits<SwapchainKHR>::deleter() ) VULKAN_HPP_NOEXCEPT
typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::SwapchainKHR>::deleter() ) VULKAN_HPP_NOEXCEPT
: surface( std::move( surface ) ) : surface( std::move( surface ) )
, parent( std::move( parent ) ) , parent( std::move( parent ) )
, deleter( std::move( deleter ) ) , deleter( std::move( deleter ) )
{ {
} }
SharedHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR> surface{}; SharedHandle<SurfaceKHR> surface{};
SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::SwapchainKHR>> parent{}; SharedHandle<DestructorTypeOf<SwapchainKHR>> parent{};
typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::SwapchainKHR>::deleter deleter{}; typename SharedHandleTraits<SwapchainKHR>::deleter deleter{};
}; };
template <> template <>
class SharedHandle<VULKAN_HPP_NAMESPACE::SwapchainKHR> : public SharedHandleBase<VULKAN_HPP_NAMESPACE::SwapchainKHR, SwapchainHeader> class SharedHandle<SwapchainKHR> : public SharedHandleBase<SwapchainKHR, SwapchainHeader>
{ {
using BaseType = SharedHandleBase<VULKAN_HPP_NAMESPACE::SwapchainKHR, SwapchainHeader>; using BaseType = SharedHandleBase<SwapchainKHR, SwapchainHeader>;
using DeleterType = typename SharedHandleTraits<VULKAN_HPP_NAMESPACE::SwapchainKHR>::deleter; using DeleterType = typename SharedHandleTraits<SwapchainKHR>::deleter;
friend BaseType; friend BaseType;
public: public:
SharedHandle() = default; SharedHandle() = default;
explicit SharedHandle( VULKAN_HPP_NAMESPACE::SwapchainKHR handle, explicit SharedHandle( SwapchainKHR handle,
SharedHandle<DestructorTypeOf<VULKAN_HPP_NAMESPACE::SwapchainKHR>> parent, SharedHandle<DestructorTypeOf<SwapchainKHR>> parent,
SharedHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR> surface, SharedHandle<SurfaceKHR> surface,
DeleterType deleter = DeleterType() ) VULKAN_HPP_NOEXCEPT DeleterType deleter = DeleterType() ) VULKAN_HPP_NOEXCEPT
: BaseType( handle, std::move( surface ), std::move( parent ), std::move( deleter ) ) : BaseType( handle, std::move( surface ), std::move( parent ), std::move( deleter ) )
{ {
} }
public: public:
const SharedHandle<VULKAN_HPP_NAMESPACE::SurfaceKHR> & getSurface() const VULKAN_HPP_NOEXCEPT const SharedHandle<SurfaceKHR> & getSurface() const VULKAN_HPP_NOEXCEPT
{ {
return getHeader().surface; return getHeader().surface;
} }