From 11ef1084d026aac075851a57eb26e0bee74d5b12 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Mon, 22 Aug 2022 00:08:42 +0200
Subject: [PATCH] [dxvk] Rename semaphore stuff in command list code

---
 src/dxvk/dxvk_cmdlist.cpp | 20 ++++++++++----------
 src/dxvk/dxvk_cmdlist.h   |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/dxvk/dxvk_cmdlist.cpp b/src/dxvk/dxvk_cmdlist.cpp
index e24c4ea03..756a53cfd 100644
--- a/src/dxvk/dxvk_cmdlist.cpp
+++ b/src/dxvk/dxvk_cmdlist.cpp
@@ -93,7 +93,7 @@ namespace dxvk {
         VkSemaphoreSubmitInfo signalInfo = { VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO };
         signalInfo.semaphore = m_sdmaSemaphore;
         signalInfo.stageMask = VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT;
-        m_submission.wakeSync.push_back(signalInfo);
+        m_submission.signalInfos.push_back(signalInfo);
 
         VkResult status = submitToQueue(transfer.queueHandle, VK_NULL_HANDLE, m_submission);
 
@@ -105,7 +105,7 @@ namespace dxvk {
         VkSemaphoreSubmitInfo waitInfo = { VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO };
         waitInfo.semaphore = m_sdmaSemaphore;
         waitInfo.stageMask = VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT;
-        m_submission.waitSync.push_back(waitInfo);
+        m_submission.waitInfos.push_back(waitInfo);
       }
     }
 
@@ -125,14 +125,14 @@ namespace dxvk {
       VkSemaphoreSubmitInfo waitInfo = { VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO };
       waitInfo.semaphore = m_wsiSemaphores.acquire;
       waitInfo.stageMask = VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT;
-      m_submission.waitSync.push_back(waitInfo);
+      m_submission.waitInfos.push_back(waitInfo);
     }
 
     if (m_wsiSemaphores.present) {
       VkSemaphoreSubmitInfo signalInfo = { VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO };
       signalInfo.semaphore = m_wsiSemaphores.present;
       signalInfo.stageMask = VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT;
-      m_submission.wakeSync.push_back(signalInfo);
+      m_submission.signalInfos.push_back(signalInfo);
     }
     
     for (const auto& entry : m_waitSemaphores) {
@@ -140,7 +140,7 @@ namespace dxvk {
       waitInfo.semaphore = entry.fence->handle();
       waitInfo.value = entry.value;
       waitInfo.stageMask = VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT;
-      m_submission.waitSync.push_back(waitInfo);
+      m_submission.waitInfos.push_back(waitInfo);
     }
 
     for (const auto& entry : m_signalSemaphores) {
@@ -148,7 +148,7 @@ namespace dxvk {
       signalInfo.semaphore = entry.fence->handle();
       signalInfo.value = entry.value;
       signalInfo.stageMask = VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT;
-      m_submission.wakeSync.push_back(signalInfo);
+      m_submission.signalInfos.push_back(signalInfo);
     }
 
     return submitToQueue(graphics.queueHandle, m_fence, m_submission);
@@ -241,12 +241,12 @@ namespace dxvk {
           VkFence               fence,
     const DxvkQueueSubmission&  info) {
     VkSubmitInfo2 submitInfo = { VK_STRUCTURE_TYPE_SUBMIT_INFO_2 };
-    submitInfo.waitSemaphoreInfoCount   = info.waitSync.size();
-    submitInfo.pWaitSemaphoreInfos      = info.waitSync.data();
+    submitInfo.waitSemaphoreInfoCount   = info.waitInfos.size();
+    submitInfo.pWaitSemaphoreInfos      = info.waitInfos.data();
     submitInfo.commandBufferInfoCount   = info.cmdBuffers.size();
     submitInfo.pCommandBufferInfos      = info.cmdBuffers.data();
-    submitInfo.signalSemaphoreInfoCount = info.wakeSync.size();
-    submitInfo.pSignalSemaphoreInfos    = info.wakeSync.data();
+    submitInfo.signalSemaphoreInfoCount = info.signalInfos.size();
+    submitInfo.pSignalSemaphoreInfos    = info.signalInfos.data();
     
     return m_vkd->vkQueueSubmit2(queue, 1, &submitInfo, fence);
   }
diff --git a/src/dxvk/dxvk_cmdlist.h b/src/dxvk/dxvk_cmdlist.h
index 366bac3fe..96edb66ed 100644
--- a/src/dxvk/dxvk_cmdlist.h
+++ b/src/dxvk/dxvk_cmdlist.h
@@ -42,13 +42,13 @@ namespace dxvk {
    * only, array sizes are based on need.
    */
   struct DxvkQueueSubmission {
-    std::vector<VkSemaphoreSubmitInfo>     waitSync;
-    std::vector<VkSemaphoreSubmitInfo>     wakeSync;
+    std::vector<VkSemaphoreSubmitInfo>     waitInfos;
+    std::vector<VkSemaphoreSubmitInfo>     signalInfos;
     std::vector<VkCommandBufferSubmitInfo> cmdBuffers;
 
     void reset() {
-      waitSync.clear();
-      wakeSync.clear();
+      waitInfos.clear();
+      signalInfos.clear();
       cmdBuffers.clear();
     }
   };