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

Commit 269e05ed authored by Ian Elliott's avatar Ian Elliott Committed by Automerger Merge Worker
Browse files

Merge "swapchain: Do not return MAILBOX for VK_GOOGLE_surfaceless_query" am:...

Merge "swapchain: Do not return MAILBOX for VK_GOOGLE_surfaceless_query" am: f8c9b943 am: fc637474 am: 075f44f3

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2115353



Change-Id: I48882542bb920777e812c23e3bb457dca0b7dff9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 24bd8987 075f44f3
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -939,8 +939,7 @@ VkResult GetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice pdev,
        // VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR and
        // VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR.  We technically cannot
        // know if VK_PRESENT_MODE_SHARED_MAILBOX_KHR is supported without a
        // surface, and that cannot be relied upon.
        present_modes.push_back(VK_PRESENT_MODE_MAILBOX_KHR);
        // surface, and that cannot be relied upon.  Therefore, don't return it.
        present_modes.push_back(VK_PRESENT_MODE_FIFO_KHR);
    } else {
        ANativeWindow* window = SurfaceFromHandle(surface)->window.get();