Revert "libvulkan: Implement VK_PRESENT_MODE_MAILBOX_KHR"

This reverts commit f333922399393609f5bf022a3467b7541bd1ad0f.
Hologram demo dies with this change.

diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index 2392b5c..bab5a59 100644 (file)
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -346,10 +346,8 @@ VkResult CreateSwapchainKHR_Bottom(VkDevice device,
              "swapchain re-creation not yet implemented");
     ALOGE_IF(create_info->preTransform != VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR,
              "swapchain preTransform not yet implemented");
-    ALOGW_IF((create_info->presentMode != VK_PRESENT_MODE_FIFO_KHR ||
-              create_info->presentMode != VK_PRESENT_MODE_MAILBOX_KHR),
-             "swapchain present mode %d not supported",
-             create_info->presentMode);
+    ALOGE_IF(create_info->presentMode != VK_PRESENT_MODE_FIFO_KHR,
+             "present modes other than FIFO are not yet implemented");
 
     // -- Configure the native window --
 
@@ -420,17 +418,6 @@ VkResult CreateSwapchainKHR_Bottom(VkDevice device,
         return VK_ERROR_INITIALIZATION_FAILED;
     }
 
-    err = surface.window->setSwapInterval(
-        surface.window.get(),
-        create_info->presentMode == VK_PRESENT_MODE_MAILBOX_KHR ? 0 : 1);
-    if (err != 0) {
-        // TODO(jessehall): Improve error reporting. Can we enumerate possible
-        // errors and translate them to valid Vulkan result codes?
-        ALOGE("native_window->setSwapInterval failed: %s (%d)", strerror(-err),
-              err);
-        return VK_ERROR_INITIALIZATION_FAILED;
-    }
-
     // -- Allocate our Swapchain object --
     // After this point, we must deallocate the swapchain on error.