Refactor Semaphore related functions

Summary: To match up with how we setup VulkanFence functions in the previous diff Reviewed By: corporateshark Differential Revision: D50044925 fbshipit-source-id: 0edba6c723cc5ff5804ab864333efc03aab1946f
facebook · Oct 7, 2023 · 67dd794 · 67dd794
1 parent 613b8e4
commit 67dd794
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/src/igl/vulkan/VulkanHelpers.c b/src/igl/vulkan/VulkanHelpers.c
@@ -260,8 +260,8 @@ uint32_t ivkFindMemoryType(const struct VulkanFunctionTable* vt,
 
 VkResult ivkCreateSemaphore(const struct VulkanFunctionTable* vt,
                             VkDevice device,
-                            VkSemaphore* outSemaphore,
-                            bool exportable) {
+                            bool exportable,
+                            VkSemaphore* outSemaphore) {
   const VkExportSemaphoreCreateInfo exportInfo = {
       .sType = VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO,
       .pNext = NULL,

diff --git a/src/igl/vulkan/VulkanHelpers.h b/src/igl/vulkan/VulkanHelpers.h
@@ -48,8 +48,8 @@ VkResult ivkCreateDebugReportMessenger(const struct VulkanFunctionTable* vt,
 
 VkResult ivkCreateSemaphore(const struct VulkanFunctionTable* vt,
                             VkDevice device,
-                            VkSemaphore* outSemaphore,
-                            bool exportable);
+                            bool exportable,
+                            VkSemaphore* outSemaphore);
 
 VkResult ivkCreateFence(const struct VulkanFunctionTable* vt,
                         VkDevice device,

diff --git a/src/igl/vulkan/VulkanImmediateCommands.cpp b/src/igl/vulkan/VulkanImmediateCommands.cpp
@@ -40,7 +40,8 @@ VulkanImmediateCommands::VulkanImmediateCommands(const VulkanFunctionTable& vf,
                     VkFenceCreateFlagBits{},
                     exportableFences,
                     IGL_FORMAT("Fence: commandBuffer #{}", i).c_str()),
-        VulkanSemaphore(vf_, device, IGL_FORMAT("Semaphore: {} ({})", debugName, i).c_str()));
+        VulkanSemaphore(
+            vf_, device, false, IGL_FORMAT("Semaphore: {} ({})", debugName, i).c_str()));
     VK_ASSERT(ivkAllocateCommandBuffer(
         &vf_, device_, commandPool_.getVkCommandPool(), &buffers_[i].cmdBufAllocated_));
     buffers_[i].handle_.bufferIndex_ = i;

diff --git a/src/igl/vulkan/VulkanSemaphore.cpp b/src/igl/vulkan/VulkanSemaphore.cpp
@@ -13,12 +13,12 @@ namespace igl::vulkan {
 
 VulkanSemaphore::VulkanSemaphore(const VulkanFunctionTable& vf,
                                  VkDevice device,
-                                 const char* debugName,
-                                 bool exportable) :
+                                 bool exportable,
+                                 const char* debugName) :
   vf_(&vf), device_(device) {
   IGL_PROFILER_FUNCTION_COLOR(IGL_PROFILER_COLOR_CREATE);
 
-  VK_ASSERT(ivkCreateSemaphore(vf_, device_, &vkSemaphore_, exportable));
+  VK_ASSERT(ivkCreateSemaphore(vf_, device_, exportable, &vkSemaphore_));
   VK_ASSERT(ivkSetDebugObjectName(
       vf_, device_, VK_OBJECT_TYPE_SEMAPHORE, (uint64_t)vkSemaphore_, debugName));
 }

diff --git a/src/igl/vulkan/VulkanSemaphore.h b/src/igl/vulkan/VulkanSemaphore.h
@@ -25,8 +25,8 @@ class VulkanSemaphore final {
  public:
   explicit VulkanSemaphore(const VulkanFunctionTable& vf,
                            VkDevice device,
-                           const char* debugName = nullptr,
-                           bool exportable = false);
+                           bool exportable = false,
+                           const char* debugName = nullptr);
   ~VulkanSemaphore();
 
   VulkanSemaphore(VulkanSemaphore&& other) noexcept;