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

Commit ac13378c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update VK_GOOGLE_surfaceless_query extension fixed values" am:...

Merge "Update VK_GOOGLE_surfaceless_query extension fixed values" am: 54fa2352 am: e22a33b5 am: 4b6e5f3b am: 2382dd38 am: 54f323b1

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



Change-Id: I5bb404d4996de6716ee480a0fbedb1cc897c3d2d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 781002d5 54f323b1
Loading
Loading
Loading
Loading
+7 −6
Original line number Diff line number Diff line
@@ -668,10 +668,11 @@ VkResult GetPhysicalDeviceSurfaceCapabilitiesKHR(
        // VkSurfaceProtectedCapabilitiesKHR::supportsProtected.  The following
        // four values cannot be known without a surface.  Default values will
        // be supplied anyway, but cannot be relied upon.
        width = 1000;
        height = 1000;
        transform_hint = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
        max_buffer_count = 10;
        width = 0xFFFFFFFF;
        height = 0xFFFFFFFF;
        transform_hint = VK_SURFACE_TRANSFORM_INHERIT_BIT_KHR;
        capabilities->minImageCount = 0xFFFFFFFF;
        capabilities->maxImageCount = 0xFFFFFFFF;
    } else {
        ANativeWindow* window = SurfaceFromHandle(surface)->window.get();

@@ -703,9 +704,9 @@ VkResult GetPhysicalDeviceSurfaceCapabilitiesKHR(
                  strerror(-err), err);
            return VK_ERROR_SURFACE_LOST_KHR;
        }
    }
        capabilities->minImageCount = std::min(max_buffer_count, 3);
        capabilities->maxImageCount = static_cast<uint32_t>(max_buffer_count);
    }

    capabilities->currentExtent =
        VkExtent2D{static_cast<uint32_t>(width), static_cast<uint32_t>(height)};