Fix VK_NULL_HANDLE comparison style (#5733)

jorgep31415 · facebook-github-bot · commit 8b5cf96ea08c · 2024-09-27T17:28:39.000-07:00
Summary: Pull Request resolved: #5733 `VK_NULL_HANDLE` is a constant and should hence be the right hand side of the expression. Fixing the expressions where it's on the left hand side. ghstack-source-id: 245169615 exported-using-ghexport Reviewed By: nathanaelsee Differential Revision: D63560116 fbshipit-source-id: a0b03202245988c7c072002c26e430f80436992b
diff --git a/backends/vulkan/runtime/vk_api/Command.cpp b/backends/vulkan/runtime/vk_api/Command.cpp
@@ -247,7 +247,7 @@ CommandPool::CommandPool(
 }
 
 CommandPool::~CommandPool() {
-  if (VK_NULL_HANDLE == pool_) {
+  if (pool_ == VK_NULL_HANDLE) {
     return;
   }
   vkDestroyCommandPool(device_, pool_, nullptr);
diff --git a/backends/vulkan/runtime/vk_api/Command.h b/backends/vulkan/runtime/vk_api/Command.h
@@ -99,7 +99,7 @@ class CommandBuffer final {
   VkCommandBuffer get_submit_handle(const bool final_use = false);
 
   inline operator bool() const {
-    return VK_NULL_HANDLE != handle_;
+    return handle_ != VK_NULL_HANDLE;
   }
 };
 
diff --git a/backends/vulkan/runtime/vk_api/Descriptor.cpp b/backends/vulkan/runtime/vk_api/Descriptor.cpp
@@ -261,7 +261,7 @@ DescriptorPool::DescriptorPool(
 }
 
 DescriptorPool::~DescriptorPool() {
-  if (VK_NULL_HANDLE == pool_) {
+  if (pool_ == VK_NULL_HANDLE) {
     return;
   }
   vkDestroyDescriptorPool(device_, pool_, nullptr);
diff --git a/backends/vulkan/runtime/vk_api/Device.cpp b/backends/vulkan/runtime/vk_api/Device.cpp
@@ -84,7 +84,7 @@ PhysicalDevice::PhysicalDevice(VkPhysicalDevice physical_device_handle)
 DeviceHandle::DeviceHandle(VkDevice device) : handle(device) {}
 
 DeviceHandle::~DeviceHandle() {
-  if (VK_NULL_HANDLE == handle) {
+  if (handle == VK_NULL_HANDLE) {
     return;
   }
   vkDestroyDevice(handle, nullptr);
diff --git a/backends/vulkan/runtime/vk_api/Fence.cpp b/backends/vulkan/runtime/vk_api/Fence.cpp
@@ -44,7 +44,7 @@ VulkanFence& VulkanFence::operator=(VulkanFence&& other) noexcept {
 }
 
 VulkanFence::~VulkanFence() {
-  if (VK_NULL_HANDLE == handle_) {
+  if (handle_ == VK_NULL_HANDLE) {
     return;
   }
   vkDestroyFence(device_, handle_, nullptr);
diff --git a/backends/vulkan/runtime/vk_api/Fence.h b/backends/vulkan/runtime/vk_api/Fence.h
@@ -62,7 +62,7 @@ class VulkanFence final {
   }
 
   operator bool() const {
-    return (VK_NULL_HANDLE != handle_);
+    return (handle_ != VK_NULL_HANDLE);
   }
 };
 
diff --git a/backends/vulkan/runtime/vk_api/Pipeline.cpp b/backends/vulkan/runtime/vk_api/Pipeline.cpp
@@ -228,7 +228,7 @@ PipelineLayout::PipelineLayout(PipelineLayout&& other) noexcept
 }
 
 PipelineLayout::~PipelineLayout() {
-  if (VK_NULL_HANDLE == handle_) {
+  if (handle_ == VK_NULL_HANDLE) {
     return;
   }
   vkDestroyPipelineLayout(device_, handle_, nullptr);
@@ -300,7 +300,7 @@ ComputePipeline::ComputePipeline(ComputePipeline&& other) noexcept
 }
 
 ComputePipeline::~ComputePipeline() {
-  if (VK_NULL_HANDLE == handle_) {
+  if (handle_ == VK_NULL_HANDLE) {
     return;
   }
   vkDestroyPipeline(device_, handle_, nullptr);
@@ -402,7 +402,7 @@ ComputePipelineCache::ComputePipelineCache(
 ComputePipelineCache::~ComputePipelineCache() {
   purge();
 
-  if (VK_NULL_HANDLE == pipeline_cache_) {
+  if (pipeline_cache_ == VK_NULL_HANDLE) {
     return;
   }
 
diff --git a/backends/vulkan/runtime/vk_api/QueryPool.cpp b/backends/vulkan/runtime/vk_api/QueryPool.cpp
@@ -30,7 +30,7 @@ constexpr int64_t kDefaultNsPerTick = 52; // lround(52.08f);
 } // namespace
 
 #define EARLY_RETURN_IF_UNINITIALIZED() \
-  if (VK_NULL_HANDLE == querypool_) {   \
+  if (querypool_ == VK_NULL_HANDLE) {   \
     return;                             \
   }
 
@@ -178,7 +178,7 @@ std::string stringize(const VkExtent3D& extents) {
 }
 std::vector<std::tuple<std::string, uint32_t, uint64_t, uint64_t>>
 QueryPool::get_shader_timestamp_data() {
-  if (VK_NULL_HANDLE == querypool_) {
+  if (querypool_ == VK_NULL_HANDLE) {
     return {};
   }
   std::lock_guard<std::mutex> lock(mutex_);
diff --git a/backends/vulkan/runtime/vk_api/Runtime.cpp b/backends/vulkan/runtime/vk_api/Runtime.cpp
@@ -134,7 +134,7 @@ VkInstance create_instance(const RuntimeConfig& config) {
 
 std::vector<Runtime::DeviceMapping> create_physical_devices(
     VkInstance instance) {
-  if (VK_NULL_HANDLE == instance) {
+  if (instance == VK_NULL_HANDLE) {
     return std::vector<Runtime::DeviceMapping>();
   }
 
@@ -176,7 +176,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL debug_report_callback_fn(
 VkDebugReportCallbackEXT create_debug_report_callback(
     VkInstance instance,
     const RuntimeConfig config) {
-  if (VK_NULL_HANDLE == instance || !config.enable_validation_messages) {
+  if (instance == VK_NULL_HANDLE || !config.enable_validation_messages) {
     return VkDebugReportCallbackEXT{};
   }
 
@@ -296,7 +296,7 @@ Runtime::Runtime(const RuntimeConfig config)
 }
 
 Runtime::~Runtime() {
-  if (VK_NULL_HANDLE == instance_) {
+  if (instance_ == VK_NULL_HANDLE) {
     return;
   }
 
diff --git a/backends/vulkan/runtime/vk_api/Shader.cpp b/backends/vulkan/runtime/vk_api/Shader.cpp
@@ -83,7 +83,7 @@ ShaderLayout::ShaderLayout(ShaderLayout&& other) noexcept
 }
 
 ShaderLayout::~ShaderLayout() {
-  if (VK_NULL_HANDLE == handle_) {
+  if (handle_ == VK_NULL_HANDLE) {
     return;
   }
   vkDestroyDescriptorSetLayout(device_, handle_, nullptr);
@@ -128,7 +128,7 @@ ShaderModule::ShaderModule(ShaderModule&& other) noexcept
 }
 
 ShaderModule::~ShaderModule() {
-  if (VK_NULL_HANDLE == handle_) {
+  if (handle_ == VK_NULL_HANDLE) {
     return;
   }
   vkDestroyShaderModule(device_, handle_, nullptr);
diff --git a/backends/vulkan/runtime/vk_api/memory/Allocation.cpp b/backends/vulkan/runtime/vk_api/memory/Allocation.cpp
@@ -65,7 +65,7 @@ Allocation::~Allocation() {
   // Do not destroy the VmaAllocation if this class instance is a copy of some
   // other class instance, since this means that this class instance does not
   // have ownership of the underlying resource.
-  if (VK_NULL_HANDLE != allocation && !is_copy_) {
+  if (allocation != VK_NULL_HANDLE && !is_copy_) {
     vmaFreeMemory(allocator, allocation);
   }
 }
diff --git a/backends/vulkan/runtime/vk_api/memory/Allocator.cpp b/backends/vulkan/runtime/vk_api/memory/Allocator.cpp
@@ -52,7 +52,7 @@ Allocator::Allocator(Allocator&& other) noexcept
 }
 
 Allocator::~Allocator() {
-  if (VK_NULL_HANDLE == allocator_) {
+  if (allocator_ == VK_NULL_HANDLE) {
     return;
   }
   vmaDestroyAllocator(allocator_);
diff --git a/backends/vulkan/runtime/vk_api/memory/Buffer.cpp b/backends/vulkan/runtime/vk_api/memory/Buffer.cpp
@@ -122,7 +122,7 @@ VulkanBuffer::~VulkanBuffer() {
   // Do not destroy the VkBuffer if this class instance is a copy of another
   // class instance, since this means that this class instance does not have
   // ownership of the underlying resource.
-  if (VK_NULL_HANDLE != handle_ && !is_copy_) {
+  if (handle_ != VK_NULL_HANDLE && !is_copy_) {
     if (owns_memory_) {
       vmaDestroyBuffer(allocator_, handle_, memory_.allocation);
     } else {
diff --git a/backends/vulkan/runtime/vk_api/memory/Image.cpp b/backends/vulkan/runtime/vk_api/memory/Image.cpp
@@ -57,7 +57,7 @@ ImageSampler::ImageSampler(ImageSampler&& other) noexcept
 }
 
 ImageSampler::~ImageSampler() {
-  if (VK_NULL_HANDLE == handle_) {
+  if (handle_ == VK_NULL_HANDLE) {
     return;
   }
   vkDestroySampler(device_, handle_, nullptr);
@@ -232,11 +232,11 @@ VulkanImage::~VulkanImage() {
     return;
   }
 
-  if (VK_NULL_HANDLE != handles_.image_view) {
+  if (handles_.image_view != VK_NULL_HANDLE) {
     vkDestroyImageView(this->device(), handles_.image_view, nullptr);
   }
 
-  if (VK_NULL_HANDLE != handles_.image) {
+  if (handles_.image != VK_NULL_HANDLE) {
     if (owns_memory_) {
       vmaDestroyImage(allocator_, handles_.image, memory_.allocation);
     } else {

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ CommandPool::CommandPool(`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`CommandPool::~CommandPool() {`
`250`		`- if (VK_NULL_HANDLE == pool_) {`
	`250`	`+ if (pool_ == VK_NULL_HANDLE) {`
`251`	`251`	`return;`
`252`	`252`	`}`
`253`	`253`	`vkDestroyCommandPool(device_, pool_, nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ class CommandBuffer final {`
`99`	`99`	`VkCommandBuffer get_submit_handle(const bool final_use = false);`
`100`	`100`
`101`	`101`	`inline operator bool() const {`
`102`		`- return VK_NULL_HANDLE != handle_;`
	`102`	`+ return handle_ != VK_NULL_HANDLE;`
`103`	`103`	`}`
`104`	`104`	`};`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ DescriptorPool::DescriptorPool(`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`DescriptorPool::~DescriptorPool() {`
`264`		`- if (VK_NULL_HANDLE == pool_) {`
	`264`	`+ if (pool_ == VK_NULL_HANDLE) {`
`265`	`265`	`return;`
`266`	`266`	`}`
`267`	`267`	`vkDestroyDescriptorPool(device_, pool_, nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ PhysicalDevice::PhysicalDevice(VkPhysicalDevice physical_device_handle)`
`84`	`84`	`DeviceHandle::DeviceHandle(VkDevice device) : handle(device) {}`
`85`	`85`
`86`	`86`	`DeviceHandle::~DeviceHandle() {`
`87`		`- if (VK_NULL_HANDLE == handle) {`
	`87`	`+ if (handle == VK_NULL_HANDLE) {`
`88`	`88`	`return;`
`89`	`89`	`}`
`90`	`90`	`vkDestroyDevice(handle, nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ VulkanFence& VulkanFence::operator=(VulkanFence&& other) noexcept {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`VulkanFence::~VulkanFence() {`
`47`		`- if (VK_NULL_HANDLE == handle_) {`
	`47`	`+ if (handle_ == VK_NULL_HANDLE) {`
`48`	`48`	`return;`
`49`	`49`	`}`
`50`	`50`	`vkDestroyFence(device_, handle_, nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class VulkanFence final {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`operator bool() const {`
`65`		`- return (VK_NULL_HANDLE != handle_);`
	`65`	`+ return (handle_ != VK_NULL_HANDLE);`
`66`	`66`	`}`
`67`	`67`	`};`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ PipelineLayout::PipelineLayout(PipelineLayout&& other) noexcept`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`PipelineLayout::~PipelineLayout() {`
`231`		`- if (VK_NULL_HANDLE == handle_) {`
	`231`	`+ if (handle_ == VK_NULL_HANDLE) {`
`232`	`232`	`return;`
`233`	`233`	`}`
`234`	`234`	`vkDestroyPipelineLayout(device_, handle_, nullptr);`
`@@ -300,7 +300,7 @@ ComputePipeline::ComputePipeline(ComputePipeline&& other) noexcept`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`ComputePipeline::~ComputePipeline() {`
`303`		`- if (VK_NULL_HANDLE == handle_) {`
	`303`	`+ if (handle_ == VK_NULL_HANDLE) {`
`304`	`304`	`return;`
`305`	`305`	`}`
`306`	`306`	`vkDestroyPipeline(device_, handle_, nullptr);`
`@@ -402,7 +402,7 @@ ComputePipelineCache::ComputePipelineCache(`
`402`	`402`	`ComputePipelineCache::~ComputePipelineCache() {`
`403`	`403`	`purge();`
`404`	`404`
`405`		`- if (VK_NULL_HANDLE == pipeline_cache_) {`
	`405`	`+ if (pipeline_cache_ == VK_NULL_HANDLE) {`
`406`	`406`	`return;`
`407`	`407`	`}`
`408`	`408`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ constexpr int64_t kDefaultNsPerTick = 52; // lround(52.08f);`
`30`	`30`	`} // namespace`
`31`	`31`
`32`	`32`	`#define EARLY_RETURN_IF_UNINITIALIZED() \`
`33`		`- if (VK_NULL_HANDLE == querypool_) { \`
	`33`	`+ if (querypool_ == VK_NULL_HANDLE) { \`
`34`	`34`	`return; \`
`35`	`35`	`}`
`36`	`36`
`@@ -178,7 +178,7 @@ std::string stringize(const VkExtent3D& extents) {`
`178`	`178`	`}`
`179`	`179`	`std::vector<std::tuple<std::string, uint32_t, uint64_t, uint64_t>>`
`180`	`180`	`QueryPool::get_shader_timestamp_data() {`
`181`		`- if (VK_NULL_HANDLE == querypool_) {`
	`181`	`+ if (querypool_ == VK_NULL_HANDLE) {`
`182`	`182`	`return {};`
`183`	`183`	`}`
`184`	`184`	`std::lock_guard<std::mutex> lock(mutex_);`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ VkInstance create_instance(const RuntimeConfig& config) {`
`134`	`134`
`135`	`135`	`std::vector<Runtime::DeviceMapping> create_physical_devices(`
`136`	`136`	`VkInstance instance) {`
`137`		`- if (VK_NULL_HANDLE == instance) {`
	`137`	`+ if (instance == VK_NULL_HANDLE) {`
`138`	`138`	`return std::vector<Runtime::DeviceMapping>();`
`139`	`139`	`}`
`140`	`140`
`@@ -176,7 +176,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL debug_report_callback_fn(`
`176`	`176`	`VkDebugReportCallbackEXT create_debug_report_callback(`
`177`	`177`	`VkInstance instance,`
`178`	`178`	`const RuntimeConfig config) {`
`179`		`- if (VK_NULL_HANDLE == instance \|\| !config.enable_validation_messages) {`
	`179`	`+ if (instance == VK_NULL_HANDLE \|\| !config.enable_validation_messages) {`
`180`	`180`	`return VkDebugReportCallbackEXT{};`
`181`	`181`	`}`
`182`	`182`
`@@ -296,7 +296,7 @@ Runtime::Runtime(const RuntimeConfig config)`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`Runtime::~Runtime() {`
`299`		`- if (VK_NULL_HANDLE == instance_) {`
	`299`	`+ if (instance_ == VK_NULL_HANDLE) {`
`300`	`300`	`return;`
`301`	`301`	`}`
`302`	`302`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ ShaderLayout::ShaderLayout(ShaderLayout&& other) noexcept`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`ShaderLayout::~ShaderLayout() {`
`86`		`- if (VK_NULL_HANDLE == handle_) {`
	`86`	`+ if (handle_ == VK_NULL_HANDLE) {`
`87`	`87`	`return;`
`88`	`88`	`}`
`89`	`89`	`vkDestroyDescriptorSetLayout(device_, handle_, nullptr);`
`@@ -128,7 +128,7 @@ ShaderModule::ShaderModule(ShaderModule&& other) noexcept`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`ShaderModule::~ShaderModule() {`
`131`		`- if (VK_NULL_HANDLE == handle_) {`
	`131`	`+ if (handle_ == VK_NULL_HANDLE) {`
`132`	`132`	`return;`
`133`	`133`	`}`
`134`	`134`	`vkDestroyShaderModule(device_, handle_, nullptr);`