commit 768bf2842229936d06d2a78cd028acb4a9452ffd
author Forrest Reiling <freiling@google.com> Thu Jul 13 12:15:34 2017 -0700
committer Forrest Reiling <freiling@google.com> Thu Jul 13 12:15:34 2017 -0700
tree 55605a54798bb1bea5890bb56db7431fb7ec7f8e
parent ad09b33d107a7d011ae4581a2de700061e44fedb

[MA-289][WORKAROUND] block on swapchain aquire to prevent Mozart from getting ahead of itself

Change-Id: I0cf66cc9ca7cb27d67429d07b47173b6b85e79b2

src/vulkan/wsi/wsi_common_magma.cc

diff --git a/src/vulkan/wsi/wsi_common_magma.cc b/src/vulkan/wsi/wsi_common_magma.cc
index 099dcf7..8c75aba 100644
--- a/src/vulkan/wsi/wsi_common_magma.cc
+++ b/src/vulkan/wsi/wsi_common_magma.cc
@@ -243,6 +243,15 @@
       uint32_t index = chain->next_index_;
       MagmaImage* image = chain->get_image(index);
 
+      //TODO(MA-289) remove this wait/signal once Mozart 2.0 lands
+      magma_status_t status = magma_wait_semaphore(image->display_semaphore(), timeout);
+      if (status == MAGMA_STATUS_TIMED_OUT) {
+         DLOG("timeout waiting for image semaphore");
+         return VK_TIMEOUT;
+      }
+      magma_signal_semaphore(image->display_semaphore());
+
+
       DLOG("AcquireNextImage semaphore id 0x%" PRIx64,
            magma_get_semaphore_id(image->display_semaphore()));