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

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

Merge "Inline GetPhysicalDeviceProperties2 into QueryPresentationProperties" am: 55adcd04 

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

Change-Id: I8195f0c96c720b7d12f2ae199bccb0acb056c9b2
parents c2ae1147 55adcd04

vulkan/libvulkan/driver.cpp

+13 −1
Original line number Diff line number Diff line
@@ -979,6 +979,8 @@ VkResult EnumerateInstanceExtensionProperties( 
void QueryPresentationProperties(

    VkPhysicalDevice physicalDevice,

    VkPhysicalDevicePresentationPropertiesANDROID* presentation_properties) {

    ATRACE_CALL();



    // Request the android-specific presentation properties via GPDP2

    VkPhysicalDeviceProperties2 properties = {

        VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2,
@@ -994,7 +996,17 @@ void QueryPresentationProperties( 
    presentation_properties->pNext = nullptr;

    presentation_properties->sharedImage = VK_FALSE;



    GetPhysicalDeviceProperties2(physicalDevice, &properties);

    const auto& driver = GetData(physicalDevice).driver;



    if (driver.GetPhysicalDeviceProperties2) {

        // >= 1.1 driver, supports core GPDP2 entrypoint.

        driver.GetPhysicalDeviceProperties2(physicalDevice, &properties);

    } else if (driver.GetPhysicalDeviceProperties2KHR) {

        // Old driver, but may support presentation properties

        // if we have the GPDP2 extension. Otherwise, no presentation

        // properties supported.

        driver.GetPhysicalDeviceProperties2KHR(physicalDevice, &properties);

    }

}



VkResult EnumerateDeviceExtensionProperties(