From 7beac182b2974b406d6fd7e72053deca488f2707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= Date: Mon, 11 Aug 2025 13:37:09 +0200 Subject: [PATCH] Remove the superfluous operator<=> for handles. (#2247) --- VulkanHppGenerator.cpp | 4 - snippets/HandlesTemplate.hpp | 2 - vulkan/vulkan_handles.hpp | 230 ----------------------------------- 3 files changed, 236 deletions(-) diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp index 9d0ce93..e495bc4 100644 --- a/VulkanHppGenerator.cpp +++ b/VulkanHppGenerator.cpp @@ -8250,10 +8250,6 @@ ${typesafeConversionConditionalEnd} return m_${memberName} == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( ${className} const & ) const = default; -#endif - private: Vk${className} m_${memberName} = {}; }; diff --git a/snippets/HandlesTemplate.hpp b/snippets/HandlesTemplate.hpp index 5570bce..2b211e9 100644 --- a/snippets/HandlesTemplate.hpp +++ b/snippets/HandlesTemplate.hpp @@ -14,7 +14,6 @@ namespace VULKAN_HPP_NAMESPACE ${handles} // operators to compare VULKAN_HPP_NAMESPACE::-handles -#if !defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) template ::value, int>::type = 0> bool operator==( T const & lhs, T const & rhs ) { @@ -50,7 +49,6 @@ namespace VULKAN_HPP_NAMESPACE { return static_cast( lhs ) >= static_cast( rhs ); } -#endif template ::value, int>::type = 0> bool operator==( T const & v, std::nullptr_t ) diff --git a/vulkan/vulkan_handles.hpp b/vulkan/vulkan_handles.hpp index 45b3e12..5da99fb 100644 --- a/vulkan/vulkan_handles.hpp +++ b/vulkan/vulkan_handles.hpp @@ -2917,10 +2917,6 @@ namespace VULKAN_HPP_NAMESPACE return m_surfaceKHR == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( SurfaceKHR const & ) const = default; -#endif - private: VkSurfaceKHR m_surfaceKHR = {}; }; @@ -3016,10 +3012,6 @@ namespace VULKAN_HPP_NAMESPACE return m_debugReportCallbackEXT == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( DebugReportCallbackEXT const & ) const = default; -#endif - private: VkDebugReportCallbackEXT m_debugReportCallbackEXT = {}; }; @@ -3115,10 +3107,6 @@ namespace VULKAN_HPP_NAMESPACE return m_debugUtilsMessengerEXT == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( DebugUtilsMessengerEXT const & ) const = default; -#endif - private: VkDebugUtilsMessengerEXT m_debugUtilsMessengerEXT = {}; }; @@ -3205,10 +3193,6 @@ namespace VULKAN_HPP_NAMESPACE return m_displayKHR == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( DisplayKHR const & ) const = default; -#endif - private: VkDisplayKHR m_displayKHR = {}; }; @@ -3301,10 +3285,6 @@ namespace VULKAN_HPP_NAMESPACE return m_swapchainKHR == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( SwapchainKHR const & ) const = default; -#endif - private: VkSwapchainKHR m_swapchainKHR = {}; }; @@ -3397,10 +3377,6 @@ namespace VULKAN_HPP_NAMESPACE return m_semaphore == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( Semaphore const & ) const = default; -#endif - private: VkSemaphore m_semaphore = {}; }; @@ -3493,10 +3469,6 @@ namespace VULKAN_HPP_NAMESPACE return m_fence == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( Fence const & ) const = default; -#endif - private: VkFence m_fence = {}; }; @@ -3596,10 +3568,6 @@ namespace VULKAN_HPP_NAMESPACE return m_performanceConfigurationINTEL == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( PerformanceConfigurationINTEL const & ) const = default; -#endif - private: VkPerformanceConfigurationINTEL m_performanceConfigurationINTEL = {}; }; @@ -3686,10 +3654,6 @@ namespace VULKAN_HPP_NAMESPACE return m_queryPool == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( QueryPool const & ) const = default; -#endif - private: VkQueryPool m_queryPool = {}; }; @@ -3782,10 +3746,6 @@ namespace VULKAN_HPP_NAMESPACE return m_buffer == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( Buffer const & ) const = default; -#endif - private: VkBuffer m_buffer = {}; }; @@ -3878,10 +3838,6 @@ namespace VULKAN_HPP_NAMESPACE return m_pipelineLayout == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( PipelineLayout const & ) const = default; -#endif - private: VkPipelineLayout m_pipelineLayout = {}; }; @@ -3974,10 +3930,6 @@ namespace VULKAN_HPP_NAMESPACE return m_descriptorSet == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( DescriptorSet const & ) const = default; -#endif - private: VkDescriptorSet m_descriptorSet = {}; }; @@ -4070,10 +4022,6 @@ namespace VULKAN_HPP_NAMESPACE return m_imageView == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( ImageView const & ) const = default; -#endif - private: VkImageView m_imageView = {}; }; @@ -4166,10 +4114,6 @@ namespace VULKAN_HPP_NAMESPACE return m_pipeline == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( Pipeline const & ) const = default; -#endif - private: VkPipeline m_pipeline = {}; }; @@ -4262,10 +4206,6 @@ namespace VULKAN_HPP_NAMESPACE return m_shaderEXT == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( ShaderEXT const & ) const = default; -#endif - private: VkShaderEXT m_shaderEXT = {}; }; @@ -4352,10 +4292,6 @@ namespace VULKAN_HPP_NAMESPACE return m_image == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( Image const & ) const = default; -#endif - private: VkImage m_image = {}; }; @@ -4453,10 +4389,6 @@ namespace VULKAN_HPP_NAMESPACE return m_accelerationStructureNV == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( AccelerationStructureNV const & ) const = default; -#endif - private: VkAccelerationStructureNV m_accelerationStructureNV = {}; }; @@ -4555,10 +4487,6 @@ namespace VULKAN_HPP_NAMESPACE return m_dataGraphPipelineSessionARM == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( DataGraphPipelineSessionARM const & ) const = default; -#endif - private: VkDataGraphPipelineSessionARM m_dataGraphPipelineSessionARM = {}; }; @@ -4648,10 +4576,6 @@ namespace VULKAN_HPP_NAMESPACE return m_opticalFlowSessionNV == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( OpticalFlowSessionNV const & ) const = default; -#endif - private: VkOpticalFlowSessionNV m_opticalFlowSessionNV = {}; }; @@ -4744,10 +4668,6 @@ namespace VULKAN_HPP_NAMESPACE return m_descriptorUpdateTemplate == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( DescriptorUpdateTemplate const & ) const = default; -#endif - private: VkDescriptorUpdateTemplate m_descriptorUpdateTemplate = {}; }; @@ -4842,10 +4762,6 @@ namespace VULKAN_HPP_NAMESPACE return m_event == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( Event const & ) const = default; -#endif - private: VkEvent m_event = {}; }; @@ -4944,10 +4860,6 @@ namespace VULKAN_HPP_NAMESPACE return m_accelerationStructureKHR == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( AccelerationStructureKHR const & ) const = default; -#endif - private: VkAccelerationStructureKHR m_accelerationStructureKHR = {}; }; @@ -5040,10 +4952,6 @@ namespace VULKAN_HPP_NAMESPACE return m_micromapEXT == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( MicromapEXT const & ) const = default; -#endif - private: VkMicromapEXT m_micromapEXT = {}; }; @@ -8140,10 +8048,6 @@ namespace VULKAN_HPP_NAMESPACE return m_commandBuffer == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( CommandBuffer const & ) const = default; -#endif - private: VkCommandBuffer m_commandBuffer = {}; }; @@ -8236,10 +8140,6 @@ namespace VULKAN_HPP_NAMESPACE return m_deviceMemory == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( DeviceMemory const & ) const = default; -#endif - private: VkDeviceMemory m_deviceMemory = {}; }; @@ -8332,10 +8232,6 @@ namespace VULKAN_HPP_NAMESPACE return m_videoSessionKHR == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( VideoSessionKHR const & ) const = default; -#endif - private: VkVideoSessionKHR m_videoSessionKHR = {}; }; @@ -8425,10 +8321,6 @@ namespace VULKAN_HPP_NAMESPACE return m_deferredOperationKHR == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( DeferredOperationKHR const & ) const = default; -#endif - private: VkDeferredOperationKHR m_deferredOperationKHR = {}; }; @@ -8521,10 +8413,6 @@ namespace VULKAN_HPP_NAMESPACE return m_bufferCollectionFUCHSIA == VK_NULL_HANDLE; } -# if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( BufferCollectionFUCHSIA const & ) const = default; -# endif - private: VkBufferCollectionFUCHSIA m_bufferCollectionFUCHSIA = {}; }; @@ -8618,10 +8506,6 @@ namespace VULKAN_HPP_NAMESPACE return m_bufferView == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( BufferView const & ) const = default; -#endif - private: VkBufferView m_bufferView = {}; }; @@ -8714,10 +8598,6 @@ namespace VULKAN_HPP_NAMESPACE return m_commandPool == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( CommandPool const & ) const = default; -#endif - private: VkCommandPool m_commandPool = {}; }; @@ -8810,10 +8690,6 @@ namespace VULKAN_HPP_NAMESPACE return m_pipelineCache == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( PipelineCache const & ) const = default; -#endif - private: VkPipelineCache m_pipelineCache = {}; }; @@ -8906,10 +8782,6 @@ namespace VULKAN_HPP_NAMESPACE return m_cuFunctionNVX == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( CuFunctionNVX const & ) const = default; -#endif - private: VkCuFunctionNVX m_cuFunctionNVX = {}; }; @@ -9002,10 +8874,6 @@ namespace VULKAN_HPP_NAMESPACE return m_cuModuleNVX == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( CuModuleNVX const & ) const = default; -#endif - private: VkCuModuleNVX m_cuModuleNVX = {}; }; @@ -9099,10 +8967,6 @@ namespace VULKAN_HPP_NAMESPACE return m_cudaFunctionNV == VK_NULL_HANDLE; } -# if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( CudaFunctionNV const & ) const = default; -# endif - private: VkCudaFunctionNV m_cudaFunctionNV = {}; }; @@ -9197,10 +9061,6 @@ namespace VULKAN_HPP_NAMESPACE return m_cudaModuleNV == VK_NULL_HANDLE; } -# if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( CudaModuleNV const & ) const = default; -# endif - private: VkCudaModuleNV m_cudaModuleNV = {}; }; @@ -9294,10 +9154,6 @@ namespace VULKAN_HPP_NAMESPACE return m_descriptorPool == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( DescriptorPool const & ) const = default; -#endif - private: VkDescriptorPool m_descriptorPool = {}; }; @@ -9393,10 +9249,6 @@ namespace VULKAN_HPP_NAMESPACE return m_descriptorSetLayout == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( DescriptorSetLayout const & ) const = default; -#endif - private: VkDescriptorSetLayout m_descriptorSetLayout = {}; }; @@ -9502,10 +9354,6 @@ namespace VULKAN_HPP_NAMESPACE return m_externalComputeQueueNV == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( ExternalComputeQueueNV const & ) const = default; -#endif - private: VkExternalComputeQueueNV m_externalComputeQueueNV = {}; }; @@ -9592,10 +9440,6 @@ namespace VULKAN_HPP_NAMESPACE return m_framebuffer == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( Framebuffer const & ) const = default; -#endif - private: VkFramebuffer m_framebuffer = {}; }; @@ -9694,10 +9538,6 @@ namespace VULKAN_HPP_NAMESPACE return m_indirectCommandsLayoutEXT == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( IndirectCommandsLayoutEXT const & ) const = default; -#endif - private: VkIndirectCommandsLayoutEXT m_indirectCommandsLayoutEXT = {}; }; @@ -9790,10 +9630,6 @@ namespace VULKAN_HPP_NAMESPACE return m_indirectCommandsLayoutNV == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( IndirectCommandsLayoutNV const & ) const = default; -#endif - private: VkIndirectCommandsLayoutNV m_indirectCommandsLayoutNV = {}; }; @@ -9885,10 +9721,6 @@ namespace VULKAN_HPP_NAMESPACE return m_indirectExecutionSetEXT == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( IndirectExecutionSetEXT const & ) const = default; -#endif - private: VkIndirectExecutionSetEXT m_indirectExecutionSetEXT = {}; }; @@ -9975,10 +9807,6 @@ namespace VULKAN_HPP_NAMESPACE return m_privateDataSlot == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( PrivateDataSlot const & ) const = default; -#endif - private: VkPrivateDataSlot m_privateDataSlot = {}; }; @@ -10067,10 +9895,6 @@ namespace VULKAN_HPP_NAMESPACE return m_renderPass == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( RenderPass const & ) const = default; -#endif - private: VkRenderPass m_renderPass = {}; }; @@ -10163,10 +9987,6 @@ namespace VULKAN_HPP_NAMESPACE return m_sampler == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( Sampler const & ) const = default; -#endif - private: VkSampler m_sampler = {}; }; @@ -10262,10 +10082,6 @@ namespace VULKAN_HPP_NAMESPACE return m_samplerYcbcrConversion == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( SamplerYcbcrConversion const & ) const = default; -#endif - private: VkSamplerYcbcrConversion m_samplerYcbcrConversion = {}; }; @@ -10360,10 +10176,6 @@ namespace VULKAN_HPP_NAMESPACE return m_shaderModule == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( ShaderModule const & ) const = default; -#endif - private: VkShaderModule m_shaderModule = {}; }; @@ -10456,10 +10268,6 @@ namespace VULKAN_HPP_NAMESPACE return m_tensorARM == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( TensorARM const & ) const = default; -#endif - private: VkTensorARM m_tensorARM = {}; }; @@ -10546,10 +10354,6 @@ namespace VULKAN_HPP_NAMESPACE return m_tensorViewARM == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( TensorViewARM const & ) const = default; -#endif - private: VkTensorViewARM m_tensorViewARM = {}; }; @@ -10638,10 +10442,6 @@ namespace VULKAN_HPP_NAMESPACE return m_validationCacheEXT == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( ValidationCacheEXT const & ) const = default; -#endif - private: VkValidationCacheEXT m_validationCacheEXT = {}; }; @@ -10740,10 +10540,6 @@ namespace VULKAN_HPP_NAMESPACE return m_videoSessionParametersKHR == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( VideoSessionParametersKHR const & ) const = default; -#endif - private: VkVideoSessionParametersKHR m_videoSessionParametersKHR = {}; }; @@ -10830,10 +10626,6 @@ namespace VULKAN_HPP_NAMESPACE return m_pipelineBinaryKHR == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( PipelineBinaryKHR const & ) const = default; -#endif - private: VkPipelineBinaryKHR m_pipelineBinaryKHR = {}; }; @@ -11107,10 +10899,6 @@ namespace VULKAN_HPP_NAMESPACE return m_queue == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( Queue const & ) const = default; -#endif - private: VkQueue m_queue = {}; }; @@ -18361,10 +18149,6 @@ namespace VULKAN_HPP_NAMESPACE return m_device == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( Device const & ) const = default; -#endif - private: VkDevice m_device = {}; }; @@ -18457,10 +18241,6 @@ namespace VULKAN_HPP_NAMESPACE return m_displayModeKHR == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( DisplayModeKHR const & ) const = default; -#endif - private: VkDisplayModeKHR m_displayModeKHR = {}; }; @@ -20420,10 +20200,6 @@ namespace VULKAN_HPP_NAMESPACE return m_physicalDevice == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( PhysicalDevice const & ) const = default; -#endif - private: VkPhysicalDevice m_physicalDevice = {}; }; @@ -21232,10 +21008,6 @@ namespace VULKAN_HPP_NAMESPACE return m_instance == VK_NULL_HANDLE; } -#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) - auto operator<=>( Instance const & ) const = default; -#endif - private: VkInstance m_instance = {}; }; @@ -21354,7 +21126,6 @@ namespace VULKAN_HPP_NAMESPACE #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */ // operators to compare VULKAN_HPP_NAMESPACE::-handles -#if !defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) template ::value, int>::type = 0> bool operator==( T const & lhs, T const & rhs ) { @@ -21390,7 +21161,6 @@ namespace VULKAN_HPP_NAMESPACE { return static_cast( lhs ) >= static_cast( rhs ); } -#endif template ::value, int>::type = 0> bool operator==( T const & v, std::nullptr_t )