Add support for operator<

This commit is contained in:
Markus Tavenrath 2016-08-16 08:42:01 +02:00
parent 1b25982cc9
commit 820ec7097a
2 changed files with 218 additions and 62 deletions

View File

@ -2661,6 +2661,12 @@ void writeTypeHandle(std::ofstream & ofs, VkData const& vkData, DependencyData c
<< " {" << std::endl << " {" << std::endl
<< " return m_" << memberName << " != rhs.m_" << memberName << ";" << std::endl << " return m_" << memberName << " != rhs.m_" << memberName << ";" << std::endl
<< " }" << std::endl << " }" << std::endl
<< std::endl
// operator<
<< " bool operator<" << "(" << dependencyData.name << " const &rhs) const" << std::endl
<< " {" << std::endl
<< " return m_" << memberName << " < rhs.m_" << memberName << ";" << std::endl
<< " }" << std::endl
<< std::endl; << std::endl;
if (!handle.commands.empty()) if (!handle.commands.empty())

View File

@ -939,6 +939,11 @@ namespace vk
return m_deviceMemory != rhs.m_deviceMemory; return m_deviceMemory != rhs.m_deviceMemory;
} }
bool operator<(DeviceMemory const &rhs) const
{
return m_deviceMemory < rhs.m_deviceMemory;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -991,6 +996,11 @@ namespace vk
return m_commandPool != rhs.m_commandPool; return m_commandPool != rhs.m_commandPool;
} }
bool operator<(CommandPool const &rhs) const
{
return m_commandPool < rhs.m_commandPool;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -1043,6 +1053,11 @@ namespace vk
return m_buffer != rhs.m_buffer; return m_buffer != rhs.m_buffer;
} }
bool operator<(Buffer const &rhs) const
{
return m_buffer < rhs.m_buffer;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -1095,6 +1110,11 @@ namespace vk
return m_bufferView != rhs.m_bufferView; return m_bufferView != rhs.m_bufferView;
} }
bool operator<(BufferView const &rhs) const
{
return m_bufferView < rhs.m_bufferView;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -1147,6 +1167,11 @@ namespace vk
return m_image != rhs.m_image; return m_image != rhs.m_image;
} }
bool operator<(Image const &rhs) const
{
return m_image < rhs.m_image;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -1199,6 +1224,11 @@ namespace vk
return m_imageView != rhs.m_imageView; return m_imageView != rhs.m_imageView;
} }
bool operator<(ImageView const &rhs) const
{
return m_imageView < rhs.m_imageView;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -1251,6 +1281,11 @@ namespace vk
return m_shaderModule != rhs.m_shaderModule; return m_shaderModule != rhs.m_shaderModule;
} }
bool operator<(ShaderModule const &rhs) const
{
return m_shaderModule < rhs.m_shaderModule;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -1303,6 +1338,11 @@ namespace vk
return m_pipeline != rhs.m_pipeline; return m_pipeline != rhs.m_pipeline;
} }
bool operator<(Pipeline const &rhs) const
{
return m_pipeline < rhs.m_pipeline;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -1355,6 +1395,11 @@ namespace vk
return m_pipelineLayout != rhs.m_pipelineLayout; return m_pipelineLayout != rhs.m_pipelineLayout;
} }
bool operator<(PipelineLayout const &rhs) const
{
return m_pipelineLayout < rhs.m_pipelineLayout;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -1407,6 +1452,11 @@ namespace vk
return m_sampler != rhs.m_sampler; return m_sampler != rhs.m_sampler;
} }
bool operator<(Sampler const &rhs) const
{
return m_sampler < rhs.m_sampler;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -1459,6 +1509,11 @@ namespace vk
return m_descriptorSet != rhs.m_descriptorSet; return m_descriptorSet != rhs.m_descriptorSet;
} }
bool operator<(DescriptorSet const &rhs) const
{
return m_descriptorSet < rhs.m_descriptorSet;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -1511,6 +1566,11 @@ namespace vk
return m_descriptorSetLayout != rhs.m_descriptorSetLayout; return m_descriptorSetLayout != rhs.m_descriptorSetLayout;
} }
bool operator<(DescriptorSetLayout const &rhs) const
{
return m_descriptorSetLayout < rhs.m_descriptorSetLayout;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -1563,6 +1623,11 @@ namespace vk
return m_descriptorPool != rhs.m_descriptorPool; return m_descriptorPool != rhs.m_descriptorPool;
} }
bool operator<(DescriptorPool const &rhs) const
{
return m_descriptorPool < rhs.m_descriptorPool;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -1615,6 +1680,11 @@ namespace vk
return m_fence != rhs.m_fence; return m_fence != rhs.m_fence;
} }
bool operator<(Fence const &rhs) const
{
return m_fence < rhs.m_fence;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -1667,6 +1737,11 @@ namespace vk
return m_semaphore != rhs.m_semaphore; return m_semaphore != rhs.m_semaphore;
} }
bool operator<(Semaphore const &rhs) const
{
return m_semaphore < rhs.m_semaphore;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -1719,6 +1794,11 @@ namespace vk
return m_event != rhs.m_event; return m_event != rhs.m_event;
} }
bool operator<(Event const &rhs) const
{
return m_event < rhs.m_event;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -1771,6 +1851,11 @@ namespace vk
return m_queryPool != rhs.m_queryPool; return m_queryPool != rhs.m_queryPool;
} }
bool operator<(QueryPool const &rhs) const
{
return m_queryPool < rhs.m_queryPool;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -1823,6 +1908,11 @@ namespace vk
return m_framebuffer != rhs.m_framebuffer; return m_framebuffer != rhs.m_framebuffer;
} }
bool operator<(Framebuffer const &rhs) const
{
return m_framebuffer < rhs.m_framebuffer;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -1875,6 +1965,11 @@ namespace vk
return m_renderPass != rhs.m_renderPass; return m_renderPass != rhs.m_renderPass;
} }
bool operator<(RenderPass const &rhs) const
{
return m_renderPass < rhs.m_renderPass;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -1927,6 +2022,11 @@ namespace vk
return m_pipelineCache != rhs.m_pipelineCache; return m_pipelineCache != rhs.m_pipelineCache;
} }
bool operator<(PipelineCache const &rhs) const
{
return m_pipelineCache < rhs.m_pipelineCache;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -1979,6 +2079,11 @@ namespace vk
return m_displayKHR != rhs.m_displayKHR; return m_displayKHR != rhs.m_displayKHR;
} }
bool operator<(DisplayKHR const &rhs) const
{
return m_displayKHR < rhs.m_displayKHR;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -2031,6 +2136,11 @@ namespace vk
return m_displayModeKHR != rhs.m_displayModeKHR; return m_displayModeKHR != rhs.m_displayModeKHR;
} }
bool operator<(DisplayModeKHR const &rhs) const
{
return m_displayModeKHR < rhs.m_displayModeKHR;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -2083,6 +2193,11 @@ namespace vk
return m_surfaceKHR != rhs.m_surfaceKHR; return m_surfaceKHR != rhs.m_surfaceKHR;
} }
bool operator<(SurfaceKHR const &rhs) const
{
return m_surfaceKHR < rhs.m_surfaceKHR;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -2135,6 +2250,11 @@ namespace vk
return m_swapchainKHR != rhs.m_swapchainKHR; return m_swapchainKHR != rhs.m_swapchainKHR;
} }
bool operator<(SwapchainKHR const &rhs) const
{
return m_swapchainKHR < rhs.m_swapchainKHR;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -2187,6 +2307,11 @@ namespace vk
return m_debugReportCallbackEXT != rhs.m_debugReportCallbackEXT; return m_debugReportCallbackEXT != rhs.m_debugReportCallbackEXT;
} }
bool operator<(DebugReportCallbackEXT const &rhs) const
{
return m_debugReportCallbackEXT < rhs.m_debugReportCallbackEXT;
}
#if !defined(VULKAN_HPP_TYPESAFE_CONVERSION) #if !defined(VULKAN_HPP_TYPESAFE_CONVERSION)
explicit explicit
#endif #endif
@ -13294,6 +13419,11 @@ namespace vk
return m_commandBuffer != rhs.m_commandBuffer; return m_commandBuffer != rhs.m_commandBuffer;
} }
bool operator<(CommandBuffer const &rhs) const
{
return m_commandBuffer < rhs.m_commandBuffer;
}
Result begin( const CommandBufferBeginInfo* pBeginInfo ) const Result begin( const CommandBufferBeginInfo* pBeginInfo ) const
{ {
return static_cast<Result>( vkBeginCommandBuffer( m_commandBuffer, reinterpret_cast<const VkCommandBufferBeginInfo*>( pBeginInfo ) ) ); return static_cast<Result>( vkBeginCommandBuffer( m_commandBuffer, reinterpret_cast<const VkCommandBufferBeginInfo*>( pBeginInfo ) ) );
@ -14352,6 +14482,11 @@ namespace vk
return m_queue != rhs.m_queue; 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 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 ) ) ); return static_cast<Result>( vkQueueSubmit( m_queue, submitCount, reinterpret_cast<const VkSubmitInfo*>( pSubmits ), static_cast<VkFence>( fence ) ) );
@ -15548,6 +15683,11 @@ namespace vk
return m_device != rhs.m_device; 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 PFN_vkVoidFunction getProcAddr( const char* pName ) const
{ {
return vkGetDeviceProcAddr( m_device, pName ); return vkGetDeviceProcAddr( m_device, pName );
@ -16705,6 +16845,11 @@ namespace vk
return m_physicalDevice != rhs.m_physicalDevice; return m_physicalDevice != rhs.m_physicalDevice;
} }
bool operator<(PhysicalDevice const &rhs) const
{
return m_physicalDevice < rhs.m_physicalDevice;
}
void getProperties( PhysicalDeviceProperties* pProperties ) const void getProperties( PhysicalDeviceProperties* pProperties ) const
{ {
vkGetPhysicalDeviceProperties( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceProperties*>( pProperties ) ); vkGetPhysicalDeviceProperties( m_physicalDevice, reinterpret_cast<VkPhysicalDeviceProperties*>( pProperties ) );
@ -17231,6 +17376,11 @@ namespace vk
return m_instance != rhs.m_instance; return m_instance != rhs.m_instance;
} }
bool operator<(Instance const &rhs) const
{
return m_instance < rhs.m_instance;
}
void destroy( const AllocationCallbacks* pAllocator ) const void destroy( const AllocationCallbacks* pAllocator ) const
{ {
vkDestroyInstance( m_instance, reinterpret_cast<const VkAllocationCallbacks*>( pAllocator ) ); vkDestroyInstance( m_instance, reinterpret_cast<const VkAllocationCallbacks*>( pAllocator ) );