From a01329f307fa6067da824de9f587f292d761680b Mon Sep 17 00:00:00 2001 From: Jon Leech Date: Mon, 4 Aug 2025 16:46:03 +0100 Subject: [PATCH] Further update after fix in Vulkan-Hpp repository --- include/vulkan/vulkan_structs.hpp | 42 +++++++++---------------------- 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/include/vulkan/vulkan_structs.hpp b/include/vulkan/vulkan_structs.hpp index 13b00ba..d4bd82e 100644 --- a/include/vulkan/vulkan_structs.hpp +++ b/include/vulkan/vulkan_structs.hpp @@ -36158,15 +36158,18 @@ namespace VULKAN_HPP_NAMESPACE #if !defined( VULKAN_HPP_NO_CONSTRUCTORS ) && !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS ) # if defined( _MSC_VER ) -// no need to ignore this warning with MSVC +# pragma warning( push ) +# pragma warning( disable : 4996 ) // 'function': was declared deprecated # elif defined( __clang__ ) -// no need to ignore this warning with clang +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wdeprecated-declarations" # elif defined( __GNUC__ ) # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wdeprecated-declarations" # else // unknown compiler... just ignore the warnings for yourselves ;) # endif + VULKAN_HPP_CONSTEXPR_17 DeviceCreateInfo( DeviceCreateFlags flags_ = {}, uint32_t queueCreateInfoCount_ = {}, const DeviceQueueCreateInfo * pQueueCreateInfos_ = {}, @@ -36180,24 +36183,15 @@ namespace VULKAN_HPP_NAMESPACE , flags{ flags_ } , queueCreateInfoCount{ queueCreateInfoCount_ } , pQueueCreateInfos{ pQueueCreateInfos_ } + , enabledLayerCount{ enabledLayerCount_ } + , ppEnabledLayerNames{ ppEnabledLayerNames_ } , enabledExtensionCount{ enabledExtensionCount_ } , ppEnabledExtensionNames{ ppEnabledExtensionNames_ } , pEnabledFeatures{ pEnabledFeatures_ } { - detail::ignore( enabledLayerCount_ ); - detail::ignore( ppEnabledLayerNames_ ); } - VULKAN_HPP_CONSTEXPR_17 DeviceCreateInfo( DeviceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT - : pNext{ rhs.pNext } - , flags{ rhs.flags } - , queueCreateInfoCount{ rhs.queueCreateInfoCount } - , pQueueCreateInfos{ rhs.pQueueCreateInfos } - , enabledExtensionCount{ rhs.enabledExtensionCount } - , ppEnabledExtensionNames{ rhs.ppEnabledExtensionNames } - , pEnabledFeatures{ rhs.pEnabledFeatures } - { - } + VULKAN_HPP_CONSTEXPR_17 DeviceCreateInfo( DeviceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default; DeviceCreateInfo( VkDeviceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT : DeviceCreateInfo( *reinterpret_cast( &rhs ) ) {} @@ -36220,30 +36214,18 @@ namespace VULKAN_HPP_NAMESPACE } # endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ + DeviceCreateInfo & operator=( DeviceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT = default; + # if defined( _MSC_VER ) -// no need to ignore this warning with MSVC +# pragma warning( pop ) # elif defined( __clang__ ) -// no need to ignore this warning with clang +# pragma clang diagnostic pop # elif defined( __GNUC__ ) # pragma GCC diagnostic pop # else // unknown compiler... just ignore the warnings for yourselves ;) # endif - DeviceCreateInfo & operator=( DeviceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT - { - if ( this != &rhs ) - { - pNext = rhs.pNext; - flags = rhs.flags; - queueCreateInfoCount = rhs.queueCreateInfoCount; - pQueueCreateInfos = rhs.pQueueCreateInfos; - enabledExtensionCount = rhs.enabledExtensionCount; - ppEnabledExtensionNames = rhs.ppEnabledExtensionNames; - pEnabledFeatures = rhs.pEnabledFeatures; - } - return *this; - } #endif /*VULKAN_HPP_NO_CONSTRUCTORS*/ DeviceCreateInfo & operator=( VkDeviceCreateInfo const & rhs ) VULKAN_HPP_NOEXCEPT