From e8156c2b33be476631c9b2c5ea639adc0582f130 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Mon, 3 Oct 2016 08:31:34 -0600 Subject: [PATCH] Move vulkan.hpp to version 1.0.29 Change-Id: I52f48c40290ff56df98d9eae3dfc3fe8748b5008 --- include/vulkan/vulkan.hpp | 316 +--------------------------------------------- 1 file changed, 1 insertion(+), 315 deletions(-) diff --git a/include/vulkan/vulkan.hpp b/include/vulkan/vulkan.hpp index 3a4e7fe..b4fa8d3 100644 --- a/include/vulkan/vulkan.hpp +++ b/include/vulkan/vulkan.hpp @@ -40,7 +40,7 @@ # include #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ -static_assert( VK_HEADER_VERSION == 28 , "Wrong VK_HEADER_VERSION!" ); +static_assert( VK_HEADER_VERSION == 29 , "Wrong VK_HEADER_VERSION!" ); // 32-bit vulkan is not typesafe for handles, so don't allow copy constructors on this platform by default. // To enable this feature on 32-bit platforms please define VULKAN_HPP_TYPESAFE_CONVERSION @@ -4114,35 +4114,6 @@ namespace vk struct DisplayPlanePropertiesKHR { - DisplayPlanePropertiesKHR( DisplayKHR currentDisplay_ = DisplayKHR(), uint32_t currentStackIndex_ = 0 ) - : currentDisplay( currentDisplay_ ) - , currentStackIndex( currentStackIndex_ ) - { - } - - DisplayPlanePropertiesKHR( VkDisplayPlanePropertiesKHR const & rhs ) - { - memcpy( this, &rhs, sizeof(DisplayPlanePropertiesKHR) ); - } - - DisplayPlanePropertiesKHR& operator=( VkDisplayPlanePropertiesKHR const & rhs ) - { - memcpy( this, &rhs, sizeof(DisplayPlanePropertiesKHR) ); - return *this; - } - - DisplayPlanePropertiesKHR& setCurrentDisplay( DisplayKHR currentDisplay_ ) - { - currentDisplay = currentDisplay_; - return *this; - } - - DisplayPlanePropertiesKHR& setCurrentStackIndex( uint32_t currentStackIndex_ ) - { - currentStackIndex = currentStackIndex_; - return *this; - } - operator const VkDisplayPlanePropertiesKHR&() const { return *reinterpret_cast(this); @@ -4218,35 +4189,6 @@ namespace vk struct DisplayModePropertiesKHR { - DisplayModePropertiesKHR( DisplayModeKHR displayMode_ = DisplayModeKHR(), DisplayModeParametersKHR parameters_ = DisplayModeParametersKHR() ) - : displayMode( displayMode_ ) - , parameters( parameters_ ) - { - } - - DisplayModePropertiesKHR( VkDisplayModePropertiesKHR const & rhs ) - { - memcpy( this, &rhs, sizeof(DisplayModePropertiesKHR) ); - } - - DisplayModePropertiesKHR& operator=( VkDisplayModePropertiesKHR const & rhs ) - { - memcpy( this, &rhs, sizeof(DisplayModePropertiesKHR) ); - return *this; - } - - DisplayModePropertiesKHR& setDisplayMode( DisplayModeKHR displayMode_ ) - { - displayMode = displayMode_; - return *this; - } - - DisplayModePropertiesKHR& setParameters( DisplayModeParametersKHR parameters_ ) - { - parameters = parameters_; - return *this; - } - operator const VkDisplayModePropertiesKHR&() const { return *reinterpret_cast(this); @@ -14818,35 +14760,6 @@ namespace vk struct SurfaceFormatKHR { - SurfaceFormatKHR( Format format_ = Format::eUndefined, ColorSpaceKHR colorSpace_ = ColorSpaceKHR::eSrgbNonlinear ) - : format( format_ ) - , colorSpace( colorSpace_ ) - { - } - - SurfaceFormatKHR( VkSurfaceFormatKHR const & rhs ) - { - memcpy( this, &rhs, sizeof(SurfaceFormatKHR) ); - } - - SurfaceFormatKHR& operator=( VkSurfaceFormatKHR const & rhs ) - { - memcpy( this, &rhs, sizeof(SurfaceFormatKHR) ); - return *this; - } - - SurfaceFormatKHR& setFormat( Format format_ ) - { - format = format_; - return *this; - } - - SurfaceFormatKHR& setColorSpace( ColorSpaceKHR colorSpace_ ) - { - colorSpace = colorSpace_; - return *this; - } - operator const VkSurfaceFormatKHR&() const { return *reinterpret_cast(this); @@ -14885,84 +14798,6 @@ namespace vk struct DisplayPlaneCapabilitiesKHR { - DisplayPlaneCapabilitiesKHR( DisplayPlaneAlphaFlagsKHR supportedAlpha_ = DisplayPlaneAlphaFlagsKHR(), Offset2D minSrcPosition_ = Offset2D(), Offset2D maxSrcPosition_ = Offset2D(), Extent2D minSrcExtent_ = Extent2D(), Extent2D maxSrcExtent_ = Extent2D(), Offset2D minDstPosition_ = Offset2D(), Offset2D maxDstPosition_ = Offset2D(), Extent2D minDstExtent_ = Extent2D(), Extent2D maxDstExtent_ = Extent2D() ) - : supportedAlpha( supportedAlpha_ ) - , minSrcPosition( minSrcPosition_ ) - , maxSrcPosition( maxSrcPosition_ ) - , minSrcExtent( minSrcExtent_ ) - , maxSrcExtent( maxSrcExtent_ ) - , minDstPosition( minDstPosition_ ) - , maxDstPosition( maxDstPosition_ ) - , minDstExtent( minDstExtent_ ) - , maxDstExtent( maxDstExtent_ ) - { - } - - DisplayPlaneCapabilitiesKHR( VkDisplayPlaneCapabilitiesKHR const & rhs ) - { - memcpy( this, &rhs, sizeof(DisplayPlaneCapabilitiesKHR) ); - } - - DisplayPlaneCapabilitiesKHR& operator=( VkDisplayPlaneCapabilitiesKHR const & rhs ) - { - memcpy( this, &rhs, sizeof(DisplayPlaneCapabilitiesKHR) ); - return *this; - } - - DisplayPlaneCapabilitiesKHR& setSupportedAlpha( DisplayPlaneAlphaFlagsKHR supportedAlpha_ ) - { - supportedAlpha = supportedAlpha_; - return *this; - } - - DisplayPlaneCapabilitiesKHR& setMinSrcPosition( Offset2D minSrcPosition_ ) - { - minSrcPosition = minSrcPosition_; - return *this; - } - - DisplayPlaneCapabilitiesKHR& setMaxSrcPosition( Offset2D maxSrcPosition_ ) - { - maxSrcPosition = maxSrcPosition_; - return *this; - } - - DisplayPlaneCapabilitiesKHR& setMinSrcExtent( Extent2D minSrcExtent_ ) - { - minSrcExtent = minSrcExtent_; - return *this; - } - - DisplayPlaneCapabilitiesKHR& setMaxSrcExtent( Extent2D maxSrcExtent_ ) - { - maxSrcExtent = maxSrcExtent_; - return *this; - } - - DisplayPlaneCapabilitiesKHR& setMinDstPosition( Offset2D minDstPosition_ ) - { - minDstPosition = minDstPosition_; - return *this; - } - - DisplayPlaneCapabilitiesKHR& setMaxDstPosition( Offset2D maxDstPosition_ ) - { - maxDstPosition = maxDstPosition_; - return *this; - } - - DisplayPlaneCapabilitiesKHR& setMinDstExtent( Extent2D minDstExtent_ ) - { - minDstExtent = minDstExtent_; - return *this; - } - - DisplayPlaneCapabilitiesKHR& setMaxDstExtent( Extent2D maxDstExtent_ ) - { - maxDstExtent = maxDstExtent_; - return *this; - } - operator const VkDisplayPlaneCapabilitiesKHR&() const { return *reinterpret_cast(this); @@ -15035,70 +14870,6 @@ namespace vk struct DisplayPropertiesKHR { - DisplayPropertiesKHR( DisplayKHR display_ = DisplayKHR(), const char* displayName_ = nullptr, Extent2D physicalDimensions_ = Extent2D(), Extent2D physicalResolution_ = Extent2D(), SurfaceTransformFlagsKHR supportedTransforms_ = SurfaceTransformFlagsKHR(), Bool32 planeReorderPossible_ = 0, Bool32 persistentContent_ = 0 ) - : display( display_ ) - , displayName( displayName_ ) - , physicalDimensions( physicalDimensions_ ) - , physicalResolution( physicalResolution_ ) - , supportedTransforms( supportedTransforms_ ) - , planeReorderPossible( planeReorderPossible_ ) - , persistentContent( persistentContent_ ) - { - } - - DisplayPropertiesKHR( VkDisplayPropertiesKHR const & rhs ) - { - memcpy( this, &rhs, sizeof(DisplayPropertiesKHR) ); - } - - DisplayPropertiesKHR& operator=( VkDisplayPropertiesKHR const & rhs ) - { - memcpy( this, &rhs, sizeof(DisplayPropertiesKHR) ); - return *this; - } - - DisplayPropertiesKHR& setDisplay( DisplayKHR display_ ) - { - display = display_; - return *this; - } - - DisplayPropertiesKHR& setDisplayName( const char* displayName_ ) - { - displayName = displayName_; - return *this; - } - - DisplayPropertiesKHR& setPhysicalDimensions( Extent2D physicalDimensions_ ) - { - physicalDimensions = physicalDimensions_; - return *this; - } - - DisplayPropertiesKHR& setPhysicalResolution( Extent2D physicalResolution_ ) - { - physicalResolution = physicalResolution_; - return *this; - } - - DisplayPropertiesKHR& setSupportedTransforms( SurfaceTransformFlagsKHR supportedTransforms_ ) - { - supportedTransforms = supportedTransforms_; - return *this; - } - - DisplayPropertiesKHR& setPlaneReorderPossible( Bool32 planeReorderPossible_ ) - { - planeReorderPossible = planeReorderPossible_; - return *this; - } - - DisplayPropertiesKHR& setPersistentContent( Bool32 persistentContent_ ) - { - persistentContent = persistentContent_; - return *this; - } - operator const VkDisplayPropertiesKHR&() const { return *reinterpret_cast(this); @@ -15259,91 +15030,6 @@ namespace vk struct SurfaceCapabilitiesKHR { - SurfaceCapabilitiesKHR( uint32_t minImageCount_ = 0, uint32_t maxImageCount_ = 0, Extent2D currentExtent_ = Extent2D(), Extent2D minImageExtent_ = Extent2D(), Extent2D maxImageExtent_ = Extent2D(), uint32_t maxImageArrayLayers_ = 0, SurfaceTransformFlagsKHR supportedTransforms_ = SurfaceTransformFlagsKHR(), SurfaceTransformFlagBitsKHR currentTransform_ = SurfaceTransformFlagBitsKHR::eIdentity, CompositeAlphaFlagsKHR supportedCompositeAlpha_ = CompositeAlphaFlagsKHR(), ImageUsageFlags supportedUsageFlags_ = ImageUsageFlags() ) - : minImageCount( minImageCount_ ) - , maxImageCount( maxImageCount_ ) - , currentExtent( currentExtent_ ) - , minImageExtent( minImageExtent_ ) - , maxImageExtent( maxImageExtent_ ) - , maxImageArrayLayers( maxImageArrayLayers_ ) - , supportedTransforms( supportedTransforms_ ) - , currentTransform( currentTransform_ ) - , supportedCompositeAlpha( supportedCompositeAlpha_ ) - , supportedUsageFlags( supportedUsageFlags_ ) - { - } - - SurfaceCapabilitiesKHR( VkSurfaceCapabilitiesKHR const & rhs ) - { - memcpy( this, &rhs, sizeof(SurfaceCapabilitiesKHR) ); - } - - SurfaceCapabilitiesKHR& operator=( VkSurfaceCapabilitiesKHR const & rhs ) - { - memcpy( this, &rhs, sizeof(SurfaceCapabilitiesKHR) ); - return *this; - } - - SurfaceCapabilitiesKHR& setMinImageCount( uint32_t minImageCount_ ) - { - minImageCount = minImageCount_; - return *this; - } - - SurfaceCapabilitiesKHR& setMaxImageCount( uint32_t maxImageCount_ ) - { - maxImageCount = maxImageCount_; - return *this; - } - - SurfaceCapabilitiesKHR& setCurrentExtent( Extent2D currentExtent_ ) - { - currentExtent = currentExtent_; - return *this; - } - - SurfaceCapabilitiesKHR& setMinImageExtent( Extent2D minImageExtent_ ) - { - minImageExtent = minImageExtent_; - return *this; - } - - SurfaceCapabilitiesKHR& setMaxImageExtent( Extent2D maxImageExtent_ ) - { - maxImageExtent = maxImageExtent_; - return *this; - } - - SurfaceCapabilitiesKHR& setMaxImageArrayLayers( uint32_t maxImageArrayLayers_ ) - { - maxImageArrayLayers = maxImageArrayLayers_; - return *this; - } - - SurfaceCapabilitiesKHR& setSupportedTransforms( SurfaceTransformFlagsKHR supportedTransforms_ ) - { - supportedTransforms = supportedTransforms_; - return *this; - } - - SurfaceCapabilitiesKHR& setCurrentTransform( SurfaceTransformFlagBitsKHR currentTransform_ ) - { - currentTransform = currentTransform_; - return *this; - } - - SurfaceCapabilitiesKHR& setSupportedCompositeAlpha( CompositeAlphaFlagsKHR supportedCompositeAlpha_ ) - { - supportedCompositeAlpha = supportedCompositeAlpha_; - return *this; - } - - SurfaceCapabilitiesKHR& setSupportedUsageFlags( ImageUsageFlags supportedUsageFlags_ ) - { - supportedUsageFlags = supportedUsageFlags_; - return *this; - } - operator const VkSurfaceCapabilitiesKHR&() const { return *reinterpret_cast(this); -- 2.7.4