Remove unused swapchain bookkeeping

3 files changed, 0 insertions, 60 deletions

diff --git a/src/device_context.cc b/src/device_context.cc
index 97103de..d246d73 100644
--- a/src/device_context.cc
+++ b/src/device_context.cc
@@ -81,15 +81,6 @@ DeviceContext::Clock::ticks_to_time(const std::uint64_t& ticks) const {
     return time_point_t{delta};
 }
 
-void DeviceContext::notify_acquire(const VkSwapchainKHR& swapchain,
-                                   const std::uint32_t& image_index,
-                                   const VkSemaphore& signal_semaphore) {
-    const auto it = this->swapchain_signals.try_emplace(swapchain).first;
-
-    // Doesn't matter if it was already there, overwrite it.
-    it->second.insert_or_assign(image_index, signal_semaphore);
-}
-
 void DeviceContext::sleep_in_input() {
     // Present hasn't happened yet, we don't know what queue to attack.
     if (!this->present_queue) {
diff --git a/src/device_context.hh b/src/device_context.hh
index b4a337b..7ec54d9 100644
--- a/src/device_context.hh
+++ b/src/device_context.hh
@@ -28,12 +28,6 @@ struct DeviceContext final : public Context {
 
     std::unordered_map<VkQueue, std::shared_ptr<QueueContext>> queues;
 
-    // We map swapchains to image indexes and their last signalled semaphore.
-    // FIXME: This isn't used right now, it was formerly used to map queue
-    // submissions but it ended up being unnecessary complexity.
-    using index_semaphores_t = std::unordered_map<std::uint32_t, VkSemaphore>;
-    std::unordered_map<VkSwapchainKHR, index_semaphores_t> swapchain_signals;
-
     struct Clock {
       public:
         using time_point_t = std::chrono::time_point<std::chrono::steady_clock,
@@ -71,11 +65,6 @@ struct DeviceContext final : public Context {
     virtual ~DeviceContext();
 
   public:
-    void notify_acquire(const VkSwapchainKHR& swapchain,
-                        const std::uint32_t& image_index,
-                        const VkSemaphore& signal_semaphore);
-
-    //
     void notify_antilag_update(const VkAntiLagDataAMD& data);
 
     void notify_queue_present(const QueueContext& queue);
diff --git a/src/layer.cc b/src/layer.cc
index 3600a47..126f465 100644
--- a/src/layer.cc
+++ b/src/layer.cc
@@ -378,43 +378,6 @@ static VKAPI_ATTR void VKAPI_CALL GetDeviceQueue2(
     context->queues.emplace(*queue, ptr);
 }
 
-static VKAPI_ATTR VkResult VKAPI_CALL vkAcquireNextImageKHR(
-    VkDevice device, VkSwapchainKHR swapchain, std::uint64_t timeout,
-    VkSemaphore semaphore, VkFence fence, std::uint32_t* pImageIndex) {
-
-    const auto context = layer_context.get_context(device);
-
-    if (const auto result = context->vtable.AcquireNextImageKHR(
-            device, swapchain, timeout, semaphore, fence, pImageIndex);
-        result != VK_SUCCESS) {
-
-        return result;
-    }
-
-    context->notify_acquire(swapchain, *pImageIndex, semaphore);
-
-    return VK_SUCCESS;
-}
-
-static VKAPI_ATTR VkResult VKAPI_CALL vkAcquireNextImage2KHR(
-    VkDevice device, const VkAcquireNextImageInfoKHR* pAcquireInfo,
-    std::uint32_t* pImageIndex) {
-
-    const auto context = layer_context.get_context(device);
-
-    if (const auto result = context->vtable.AcquireNextImage2KHR(
-            device, pAcquireInfo, pImageIndex);
-        result != VK_SUCCESS) {
-
-        return result;
-    }
-
-    context->notify_acquire(pAcquireInfo->swapchain, *pImageIndex,
-                            pAcquireInfo->semaphore);
-
-    return VK_SUCCESS;
-}
-
 static VKAPI_ATTR VkResult VKAPI_CALL
 vkQueueSubmit(VkQueue queue, std::uint32_t submit_count,
               const VkSubmitInfo* submit_infos, VkFence fence) {
@@ -679,9 +642,6 @@ static const auto device_functions = func_map_t{
 
     HOOK_ENTRY("vkQueuePresentKHR", low_latency::vkQueuePresentKHR),
 
-    HOOK_ENTRY("vkAcquireNextImageKHR", low_latency::vkAcquireNextImageKHR),
-    HOOK_ENTRY("vkAcquireNextImage2KHR", low_latency::vkAcquireNextImage2KHR),
-
     HOOK_ENTRY("vkAntiLagUpdateAMD", low_latency::AntiLagUpdateAMD),
 };
 #undef HOOK_ENTRY