summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLenny Komow <lenny@lunarg.com>2016-08-26 14:10:08 -0600
committerMark Lobodzinski <mark@lunarg.com>2016-08-26 15:02:53 -0600
commit339ffcd8c81b8df33a98bd674789fe588761ec4a (patch)
tree6bee8d493bf507b00bc23921a87eff0987b64874 /include
parent8da14049d1d3ca7ddb71c447d18eff06d262644a (diff)
header: Update vulkan.hpp to 1.0.24
Diffstat (limited to 'include')
-rw-r--r--include/vulkan/vulkan.hpp474
1 files changed, 471 insertions, 3 deletions
diff --git a/include/vulkan/vulkan.hpp b/include/vulkan/vulkan.hpp
index fcabd189..b0332cca 100644
--- a/include/vulkan/vulkan.hpp
+++ b/include/vulkan/vulkan.hpp
@@ -40,11 +40,11 @@
# include <vector>
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-static_assert( VK_HEADER_VERSION == 21 , "Wrong VK_HEADER_VERSION!" );
+static_assert( VK_HEADER_VERSION == 24 , "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
-#if defined(__LP64__) || defined(_WIN64) || defined(__x86_64__) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__)
+#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__)
#define VULKAN_HPP_TYPESAFE_CONVERSION 1
#endif
@@ -304,6 +304,7 @@ namespace vk
eErrorIncompatibleDriver = VK_ERROR_INCOMPATIBLE_DRIVER,
eErrorTooManyObjects = VK_ERROR_TOO_MANY_OBJECTS,
eErrorFormatNotSupported = VK_ERROR_FORMAT_NOT_SUPPORTED,
+ eErrorFragmentedPool = VK_ERROR_FRAGMENTED_POOL,
eErrorSurfaceLostKHR = VK_ERROR_SURFACE_LOST_KHR,
eErrorNativeWindowInUseKHR = VK_ERROR_NATIVE_WINDOW_IN_USE_KHR,
eSuboptimalKHR = VK_SUBOPTIMAL_KHR,
@@ -334,6 +335,7 @@ namespace vk
case Result::eErrorIncompatibleDriver: return "ErrorIncompatibleDriver";
case Result::eErrorTooManyObjects: return "ErrorTooManyObjects";
case Result::eErrorFormatNotSupported: return "ErrorFormatNotSupported";
+ case Result::eErrorFragmentedPool: return "ErrorFragmentedPool";
case Result::eErrorSurfaceLostKHR: return "ErrorSurfaceLostKHR";
case Result::eErrorNativeWindowInUseKHR: return "ErrorNativeWindowInUseKHR";
case Result::eSuboptimalKHR: return "SuboptimalKHR";
@@ -929,6 +931,21 @@ namespace vk
}
#endif
+ bool operator==(DeviceMemory const &rhs) const
+ {
+ return m_deviceMemory == rhs.m_deviceMemory;
+ }
+
+ bool operator!=(DeviceMemory const &rhs) const
+ {
+ return m_deviceMemory != rhs.m_deviceMemory;
+ }
+
+ bool operator<(DeviceMemory const &rhs) const
+ {
+ return m_deviceMemory < rhs.m_deviceMemory;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -971,6 +988,21 @@ namespace vk
}
#endif
+ bool operator==(CommandPool const &rhs) const
+ {
+ return m_commandPool == rhs.m_commandPool;
+ }
+
+ bool operator!=(CommandPool const &rhs) const
+ {
+ return m_commandPool != rhs.m_commandPool;
+ }
+
+ bool operator<(CommandPool const &rhs) const
+ {
+ return m_commandPool < rhs.m_commandPool;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1013,6 +1045,21 @@ namespace vk
}
#endif
+ bool operator==(Buffer const &rhs) const
+ {
+ return m_buffer == rhs.m_buffer;
+ }
+
+ bool operator!=(Buffer const &rhs) const
+ {
+ return m_buffer != rhs.m_buffer;
+ }
+
+ bool operator<(Buffer const &rhs) const
+ {
+ return m_buffer < rhs.m_buffer;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1055,6 +1102,21 @@ namespace vk
}
#endif
+ bool operator==(BufferView const &rhs) const
+ {
+ return m_bufferView == rhs.m_bufferView;
+ }
+
+ bool operator!=(BufferView const &rhs) const
+ {
+ return m_bufferView != rhs.m_bufferView;
+ }
+
+ bool operator<(BufferView const &rhs) const
+ {
+ return m_bufferView < rhs.m_bufferView;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1097,6 +1159,21 @@ namespace vk
}
#endif
+ bool operator==(Image const &rhs) const
+ {
+ return m_image == rhs.m_image;
+ }
+
+ bool operator!=(Image const &rhs) const
+ {
+ return m_image != rhs.m_image;
+ }
+
+ bool operator<(Image const &rhs) const
+ {
+ return m_image < rhs.m_image;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1139,6 +1216,21 @@ namespace vk
}
#endif
+ bool operator==(ImageView const &rhs) const
+ {
+ return m_imageView == rhs.m_imageView;
+ }
+
+ bool operator!=(ImageView const &rhs) const
+ {
+ return m_imageView != rhs.m_imageView;
+ }
+
+ bool operator<(ImageView const &rhs) const
+ {
+ return m_imageView < rhs.m_imageView;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1181,6 +1273,21 @@ namespace vk
}
#endif
+ bool operator==(ShaderModule const &rhs) const
+ {
+ return m_shaderModule == rhs.m_shaderModule;
+ }
+
+ bool operator!=(ShaderModule const &rhs) const
+ {
+ return m_shaderModule != rhs.m_shaderModule;
+ }
+
+ bool operator<(ShaderModule const &rhs) const
+ {
+ return m_shaderModule < rhs.m_shaderModule;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1223,6 +1330,21 @@ namespace vk
}
#endif
+ bool operator==(Pipeline const &rhs) const
+ {
+ return m_pipeline == rhs.m_pipeline;
+ }
+
+ bool operator!=(Pipeline const &rhs) const
+ {
+ return m_pipeline != rhs.m_pipeline;
+ }
+
+ bool operator<(Pipeline const &rhs) const
+ {
+ return m_pipeline < rhs.m_pipeline;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1265,6 +1387,21 @@ namespace vk
}
#endif
+ bool operator==(PipelineLayout const &rhs) const
+ {
+ return m_pipelineLayout == rhs.m_pipelineLayout;
+ }
+
+ bool operator!=(PipelineLayout const &rhs) const
+ {
+ return m_pipelineLayout != rhs.m_pipelineLayout;
+ }
+
+ bool operator<(PipelineLayout const &rhs) const
+ {
+ return m_pipelineLayout < rhs.m_pipelineLayout;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1307,6 +1444,21 @@ namespace vk
}
#endif
+ bool operator==(Sampler const &rhs) const
+ {
+ return m_sampler == rhs.m_sampler;
+ }
+
+ bool operator!=(Sampler const &rhs) const
+ {
+ return m_sampler != rhs.m_sampler;
+ }
+
+ bool operator<(Sampler const &rhs) const
+ {
+ return m_sampler < rhs.m_sampler;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1349,6 +1501,21 @@ namespace vk
}
#endif
+ bool operator==(DescriptorSet const &rhs) const
+ {
+ return m_descriptorSet == rhs.m_descriptorSet;
+ }
+
+ bool operator!=(DescriptorSet const &rhs) const
+ {
+ return m_descriptorSet != rhs.m_descriptorSet;
+ }
+
+ bool operator<(DescriptorSet const &rhs) const
+ {
+ return m_descriptorSet < rhs.m_descriptorSet;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1391,6 +1558,21 @@ namespace vk
}
#endif
+ bool operator==(DescriptorSetLayout const &rhs) const
+ {
+ return m_descriptorSetLayout == rhs.m_descriptorSetLayout;
+ }
+
+ bool operator!=(DescriptorSetLayout const &rhs) const
+ {
+ return m_descriptorSetLayout != rhs.m_descriptorSetLayout;
+ }
+
+ bool operator<(DescriptorSetLayout const &rhs) const
+ {
+ return m_descriptorSetLayout < rhs.m_descriptorSetLayout;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1433,6 +1615,21 @@ namespace vk
}
#endif
+ bool operator==(DescriptorPool const &rhs) const
+ {
+ return m_descriptorPool == rhs.m_descriptorPool;
+ }
+
+ bool operator!=(DescriptorPool const &rhs) const
+ {
+ return m_descriptorPool != rhs.m_descriptorPool;
+ }
+
+ bool operator<(DescriptorPool const &rhs) const
+ {
+ return m_descriptorPool < rhs.m_descriptorPool;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1475,6 +1672,21 @@ namespace vk
}
#endif
+ bool operator==(Fence const &rhs) const
+ {
+ return m_fence == rhs.m_fence;
+ }
+
+ bool operator!=(Fence const &rhs) const
+ {
+ return m_fence != rhs.m_fence;
+ }
+
+ bool operator<(Fence const &rhs) const
+ {
+ return m_fence < rhs.m_fence;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1517,6 +1729,21 @@ namespace vk
}
#endif
+ bool operator==(Semaphore const &rhs) const
+ {
+ return m_semaphore == rhs.m_semaphore;
+ }
+
+ bool operator!=(Semaphore const &rhs) const
+ {
+ return m_semaphore != rhs.m_semaphore;
+ }
+
+ bool operator<(Semaphore const &rhs) const
+ {
+ return m_semaphore < rhs.m_semaphore;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1559,6 +1786,21 @@ namespace vk
}
#endif
+ bool operator==(Event const &rhs) const
+ {
+ return m_event == rhs.m_event;
+ }
+
+ bool operator!=(Event const &rhs) const
+ {
+ return m_event != rhs.m_event;
+ }
+
+ bool operator<(Event const &rhs) const
+ {
+ return m_event < rhs.m_event;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1601,6 +1843,21 @@ namespace vk
}
#endif
+ bool operator==(QueryPool const &rhs) const
+ {
+ return m_queryPool == rhs.m_queryPool;
+ }
+
+ bool operator!=(QueryPool const &rhs) const
+ {
+ return m_queryPool != rhs.m_queryPool;
+ }
+
+ bool operator<(QueryPool const &rhs) const
+ {
+ return m_queryPool < rhs.m_queryPool;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1643,6 +1900,21 @@ namespace vk
}
#endif
+ bool operator==(Framebuffer const &rhs) const
+ {
+ return m_framebuffer == rhs.m_framebuffer;
+ }
+
+ bool operator!=(Framebuffer const &rhs) const
+ {
+ return m_framebuffer != rhs.m_framebuffer;
+ }
+
+ bool operator<(Framebuffer const &rhs) const
+ {
+ return m_framebuffer < rhs.m_framebuffer;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1685,6 +1957,21 @@ namespace vk
}
#endif
+ bool operator==(RenderPass const &rhs) const
+ {
+ return m_renderPass == rhs.m_renderPass;
+ }
+
+ bool operator!=(RenderPass const &rhs) const
+ {
+ return m_renderPass != rhs.m_renderPass;
+ }
+
+ bool operator<(RenderPass const &rhs) const
+ {
+ return m_renderPass < rhs.m_renderPass;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1727,6 +2014,21 @@ namespace vk
}
#endif
+ bool operator==(PipelineCache const &rhs) const
+ {
+ return m_pipelineCache == rhs.m_pipelineCache;
+ }
+
+ bool operator!=(PipelineCache const &rhs) const
+ {
+ return m_pipelineCache != rhs.m_pipelineCache;
+ }
+
+ bool operator<(PipelineCache const &rhs) const
+ {
+ return m_pipelineCache < rhs.m_pipelineCache;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1769,6 +2071,21 @@ namespace vk
}
#endif
+ bool operator==(DisplayKHR const &rhs) const
+ {
+ return m_displayKHR == rhs.m_displayKHR;
+ }
+
+ bool operator!=(DisplayKHR const &rhs) const
+ {
+ return m_displayKHR != rhs.m_displayKHR;
+ }
+
+ bool operator<(DisplayKHR const &rhs) const
+ {
+ return m_displayKHR < rhs.m_displayKHR;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1811,6 +2128,21 @@ namespace vk
}
#endif
+ bool operator==(DisplayModeKHR const &rhs) const
+ {
+ return m_displayModeKHR == rhs.m_displayModeKHR;
+ }
+
+ bool operator!=(DisplayModeKHR const &rhs) const
+ {
+ return m_displayModeKHR != rhs.m_displayModeKHR;
+ }
+
+ bool operator<(DisplayModeKHR const &rhs) const
+ {
+ return m_displayModeKHR < rhs.m_displayModeKHR;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1853,6 +2185,21 @@ namespace vk
}
#endif
+ bool operator==(SurfaceKHR const &rhs) const
+ {
+ return m_surfaceKHR == rhs.m_surfaceKHR;
+ }
+
+ bool operator!=(SurfaceKHR const &rhs) const
+ {
+ return m_surfaceKHR != rhs.m_surfaceKHR;
+ }
+
+ bool operator<(SurfaceKHR const &rhs) const
+ {
+ return m_surfaceKHR < rhs.m_surfaceKHR;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1895,6 +2242,21 @@ namespace vk
}
#endif
+ bool operator==(SwapchainKHR const &rhs) const
+ {
+ return m_swapchainKHR == rhs.m_swapchainKHR;
+ }
+
+ bool operator!=(SwapchainKHR const &rhs) const
+ {
+ return m_swapchainKHR != rhs.m_swapchainKHR;
+ }
+
+ bool operator<(SwapchainKHR const &rhs) const
+ {
+ return m_swapchainKHR < rhs.m_swapchainKHR;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -1937,6 +2299,21 @@ namespace vk
}
#endif
+ bool operator==(DebugReportCallbackEXT const &rhs) const
+ {
+ return m_debugReportCallbackEXT == rhs.m_debugReportCallbackEXT;
+ }
+
+ bool operator!=(DebugReportCallbackEXT const &rhs) const
+ {
+ return m_debugReportCallbackEXT != rhs.m_debugReportCallbackEXT;
+ }
+
+ bool operator<(DebugReportCallbackEXT const &rhs) const
+ {
+ return m_debugReportCallbackEXT < rhs.m_debugReportCallbackEXT;
+ }
+
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit
#endif
@@ -4887,7 +5264,15 @@ namespace vk
eAstc12x10UnormBlock = VK_FORMAT_ASTC_12x10_UNORM_BLOCK,
eAstc12x10SrgbBlock = VK_FORMAT_ASTC_12x10_SRGB_BLOCK,
eAstc12x12UnormBlock = VK_FORMAT_ASTC_12x12_UNORM_BLOCK,
- eAstc12x12SrgbBlock = VK_FORMAT_ASTC_12x12_SRGB_BLOCK
+ eAstc12x12SrgbBlock = VK_FORMAT_ASTC_12x12_SRGB_BLOCK,
+ ePvrtc12BppUnormBlockIMG = VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG,
+ ePvrtc14BppUnormBlockIMG = VK_FORMAT_PVRTC1_4BPP_UNORM_BLOCK_IMG,
+ ePvrtc22BppUnormBlockIMG = VK_FORMAT_PVRTC2_2BPP_UNORM_BLOCK_IMG,
+ ePvrtc24BppUnormBlockIMG = VK_FORMAT_PVRTC2_4BPP_UNORM_BLOCK_IMG,
+ ePvrtc12BppSrgbBlockIMG = VK_FORMAT_PVRTC1_2BPP_SRGB_BLOCK_IMG,
+ ePvrtc14BppSrgbBlockIMG = VK_FORMAT_PVRTC1_4BPP_SRGB_BLOCK_IMG,
+ ePvrtc22BppSrgbBlockIMG = VK_FORMAT_PVRTC2_2BPP_SRGB_BLOCK_IMG,
+ ePvrtc24BppSrgbBlockIMG = VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG
};
struct VertexInputAttributeDescription
@@ -13034,6 +13419,21 @@ namespace vk
}
#endif
+ bool operator==(CommandBuffer const &rhs) const
+ {
+ return m_commandBuffer == rhs.m_commandBuffer;
+ }
+
+ bool operator!=(CommandBuffer const &rhs) const
+ {
+ return m_commandBuffer != rhs.m_commandBuffer;
+ }
+
+ bool operator<(CommandBuffer const &rhs) const
+ {
+ return m_commandBuffer < rhs.m_commandBuffer;
+ }
+
Result begin( const CommandBufferBeginInfo* pBeginInfo ) const
{
return static_cast<Result>( vkBeginCommandBuffer( m_commandBuffer, reinterpret_cast<const VkCommandBufferBeginInfo*>( pBeginInfo ) ) );
@@ -14082,6 +14482,21 @@ namespace vk
}
#endif
+ bool operator==(Queue const &rhs) const
+ {
+ return m_queue == rhs.m_queue;
+ }
+
+ bool operator!=(Queue const &rhs) const
+ {
+ return m_queue != rhs.m_queue;
+ }
+
+ bool operator<(Queue const &rhs) const
+ {
+ return m_queue < rhs.m_queue;
+ }
+
Result submit( uint32_t submitCount, const SubmitInfo* pSubmits, Fence fence ) const
{
return static_cast<Result>( vkQueueSubmit( m_queue, submitCount, reinterpret_cast<const VkSubmitInfo*>( pSubmits ), static_cast<VkFence>( fence ) ) );
@@ -15268,6 +15683,21 @@ namespace vk
}
#endif
+ bool operator==(Device const &rhs) const
+ {
+ return m_device == rhs.m_device;
+ }
+
+ bool operator!=(Device const &rhs) const
+ {
+ return m_device != rhs.m_device;
+ }
+
+ bool operator<(Device const &rhs) const
+ {
+ return m_device < rhs.m_device;
+ }
+
PFN_vkVoidFunction getProcAddr( const char* pName ) const
{
return vkGetDeviceProcAddr( m_device, pName );
@@ -16415,6 +16845,21 @@ namespace vk
}
#endif
+ bool operator==(PhysicalDevice const &rhs) const
+ {
+ return m_physicalDevice == rhs.m_physicalDevice;
+ }
+
+ bool operator!=(PhysicalDevice const &rhs) const
+ {
+ return m_physicalDevice != rhs.m_physicalDevice;
+ }
+
+ bool operator<(PhysicalDevice const &rhs) const
+ {
+ return m_physicalDevice < rhs.m_physicalDevice;
+ }
+
void getProperties( PhysicalDeviceProperties* pProperties ) const
{
vkGetPhysicalDeviceProperties( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceProperties*>( pProperties ) );
@@ -16931,6 +17376,21 @@ namespace vk
}
#endif
+ bool operator==(Instance const &rhs) const
+ {
+ return m_instance == rhs.m_instance;
+ }
+
+ bool operator!=(Instance const &rhs) const
+ {
+ return m_instance != rhs.m_instance;
+ }
+
+ bool operator<(Instance const &rhs) const
+ {
+ return m_instance < rhs.m_instance;
+ }
+
void destroy( const AllocationCallbacks* pAllocator ) const
{
vkDestroyInstance( m_instance, reinterpret_cast<const VkAllocationCallbacks*>( pAllocator ) );
@@ -18325,6 +18785,14 @@ namespace vk
case Format::eAstc12x10SrgbBlock: return "Astc12x10SrgbBlock";
case Format::eAstc12x12UnormBlock: return "Astc12x12UnormBlock";
case Format::eAstc12x12SrgbBlock: return "Astc12x12SrgbBlock";
+ case Format::ePvrtc12BppUnormBlockIMG: return "Pvrtc12BppUnormBlockIMG";
+ case Format::ePvrtc14BppUnormBlockIMG: return "Pvrtc14BppUnormBlockIMG";
+ case Format::ePvrtc22BppUnormBlockIMG: return "Pvrtc22BppUnormBlockIMG";
+ case Format::ePvrtc24BppUnormBlockIMG: return "Pvrtc24BppUnormBlockIMG";
+ case Format::ePvrtc12BppSrgbBlockIMG: return "Pvrtc12BppSrgbBlockIMG";
+ case Format::ePvrtc14BppSrgbBlockIMG: return "Pvrtc14BppSrgbBlockIMG";
+ case Format::ePvrtc22BppSrgbBlockIMG: return "Pvrtc22BppSrgbBlockIMG";
+ case Format::ePvrtc24BppSrgbBlockIMG: return "Pvrtc24BppSrgbBlockIMG";
default: return "invalid";
}
}