Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ec497c4 authored by Courtney Goeltzenleuchter's avatar Courtney Goeltzenleuchter
Browse files

Revert "libvulkan: Implement VK_PRESENT_MODE_MAILBOX_KHR" 

This reverts commit f3339223.
Hologram demo dies with this change.
parent 416fa12c

vulkan/libvulkan/swapchain.cpp

+2 −15
Original line number Diff line number Diff line
@@ -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.