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

Commit 2452cf7e authored by Chris Forbes's avatar Chris Forbes Committed by Jesse Hall
Browse files

vulkan: Implement KHR_get_surface_capabilities2 

Implemented by forwarding to the KHR_surface equivalents. This requires
a bit of rejigging in the case of GetPhysicalDeviceSurfaceFormats2KHR
to deal with the stride difference.

Change-Id: I0f1cc83cfc885955a39fc02d4a15609e83d36798
Test: dEQP-VK.wsi.android.surface.*2
parent e2d3ee18

vulkan/libvulkan/code-generator.tmpl

+1 −0
Original line number Original line Diff line number Diff line
@@ -690,6 +690,7 @@ VK_KHR_incremental_present 
VK_KHR_shared_presentable_image

VK_KHR_shared_presentable_image

VK_KHR_surface

VK_KHR_surface

VK_KHR_swapchain

VK_KHR_swapchain

VK_KHR_get_surface_capabilities2

{{end}}

{{end}}

vulkan/libvulkan/driver.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -448,6 +448,7 @@ void CreateInfoWrapper::FilterExtension(const char* name) { 
            case ProcHook::KHR_android_surface:

            case ProcHook::KHR_android_surface:

            case ProcHook::KHR_surface:

            case ProcHook::KHR_surface:

            case ProcHook::EXT_swapchain_colorspace:

            case ProcHook::EXT_swapchain_colorspace:

            case ProcHook::KHR_get_surface_capabilities2:

                hook_extensions_.set(ext_bit);

                hook_extensions_.set(ext_bit);

                // return now as these extensions do not require HAL support

                // return now as these extensions do not require HAL support

                return;

                return;
@@ -674,13 +675,15 @@ VkResult EnumerateInstanceExtensionProperties( 
    const char* pLayerName,

    const char* pLayerName,

    uint32_t* pPropertyCount,

    uint32_t* pPropertyCount,

    VkExtensionProperties* pProperties) {

    VkExtensionProperties* pProperties) {

    static const std::array<VkExtensionProperties, 3> loader_extensions = {{

    static const std::array<VkExtensionProperties, 4> loader_extensions = {{

        // WSI extensions

        // WSI extensions

        {VK_KHR_SURFACE_EXTENSION_NAME, VK_KHR_SURFACE_SPEC_VERSION},

        {VK_KHR_SURFACE_EXTENSION_NAME, VK_KHR_SURFACE_SPEC_VERSION},

        {VK_KHR_ANDROID_SURFACE_EXTENSION_NAME,

        {VK_KHR_ANDROID_SURFACE_EXTENSION_NAME,

         VK_KHR_ANDROID_SURFACE_SPEC_VERSION},

         VK_KHR_ANDROID_SURFACE_SPEC_VERSION},

        {VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME,

        {VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME,

         VK_EXT_SWAPCHAIN_COLOR_SPACE_SPEC_VERSION},

         VK_EXT_SWAPCHAIN_COLOR_SPACE_SPEC_VERSION},

        {VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME,

         VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION},

    }};

    }};

    static const VkExtensionProperties loader_debug_report_extension = {

    static const VkExtensionProperties loader_debug_report_extension = {

        VK_EXT_DEBUG_REPORT_EXTENSION_NAME, VK_EXT_DEBUG_REPORT_SPEC_VERSION,

        VK_EXT_DEBUG_REPORT_EXTENSION_NAME, VK_EXT_DEBUG_REPORT_SPEC_VERSION,

vulkan/libvulkan/driver_gen.cpp

+15 −0
Original line number Original line Diff line number Diff line
@@ -261,6 +261,13 @@ const ProcHook g_proc_hooks[] = { 
        reinterpret_cast<PFN_vkVoidFunction>(GetPastPresentationTimingGOOGLE),

        reinterpret_cast<PFN_vkVoidFunction>(GetPastPresentationTimingGOOGLE),

        reinterpret_cast<PFN_vkVoidFunction>(checkedGetPastPresentationTimingGOOGLE),

        reinterpret_cast<PFN_vkVoidFunction>(checkedGetPastPresentationTimingGOOGLE),

    },

    },

    {

        "vkGetPhysicalDeviceSurfaceCapabilities2KHR",

        ProcHook::INSTANCE,

        ProcHook::KHR_get_surface_capabilities2,

        reinterpret_cast<PFN_vkVoidFunction>(GetPhysicalDeviceSurfaceCapabilities2KHR),

        nullptr,

    },

    {

    {

        "vkGetPhysicalDeviceSurfaceCapabilitiesKHR",

        "vkGetPhysicalDeviceSurfaceCapabilitiesKHR",

        ProcHook::INSTANCE,

        ProcHook::INSTANCE,
@@ -268,6 +275,13 @@ const ProcHook g_proc_hooks[] = { 
        reinterpret_cast<PFN_vkVoidFunction>(GetPhysicalDeviceSurfaceCapabilitiesKHR),

        reinterpret_cast<PFN_vkVoidFunction>(GetPhysicalDeviceSurfaceCapabilitiesKHR),

        nullptr,

        nullptr,

    },

    },

    {

        "vkGetPhysicalDeviceSurfaceFormats2KHR",

        ProcHook::INSTANCE,

        ProcHook::KHR_get_surface_capabilities2,

        reinterpret_cast<PFN_vkVoidFunction>(GetPhysicalDeviceSurfaceFormats2KHR),

        nullptr,

    },

    {

    {

        "vkGetPhysicalDeviceSurfaceFormatsKHR",

        "vkGetPhysicalDeviceSurfaceFormatsKHR",

        ProcHook::INSTANCE,

        ProcHook::INSTANCE,
@@ -372,6 +386,7 @@ ProcHook::Extension GetProcHookExtension(const char* name) { 
    if (strcmp(name, "VK_KHR_shared_presentable_image") == 0) return ProcHook::KHR_shared_presentable_image;

    if (strcmp(name, "VK_KHR_shared_presentable_image") == 0) return ProcHook::KHR_shared_presentable_image;

    if (strcmp(name, "VK_KHR_surface") == 0) return ProcHook::KHR_surface;

    if (strcmp(name, "VK_KHR_surface") == 0) return ProcHook::KHR_surface;

    if (strcmp(name, "VK_KHR_swapchain") == 0) return ProcHook::KHR_swapchain;

    if (strcmp(name, "VK_KHR_swapchain") == 0) return ProcHook::KHR_swapchain;

    if (strcmp(name, "VK_KHR_get_surface_capabilities2") == 0) return ProcHook::KHR_get_surface_capabilities2;

    if (strcmp(name, "VK_KHR_get_physical_device_properties2") == 0) return ProcHook::KHR_get_physical_device_properties2;

    if (strcmp(name, "VK_KHR_get_physical_device_properties2") == 0) return ProcHook::KHR_get_physical_device_properties2;

    // clang-format on

    // clang-format on

    return ProcHook::EXTENSION_UNKNOWN;

    return ProcHook::EXTENSION_UNKNOWN;

vulkan/libvulkan/driver_gen.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ struct ProcHook { 
        KHR_shared_presentable_image,

        KHR_shared_presentable_image,

        KHR_surface,

        KHR_surface,

        KHR_swapchain,

        KHR_swapchain,

        KHR_get_surface_capabilities2,

        KHR_get_physical_device_properties2,

        KHR_get_physical_device_properties2,





        EXTENSION_CORE,  // valid bit

        EXTENSION_CORE,  // valid bit

vulkan/libvulkan/swapchain.cpp

+44 −0
Original line number Original line Diff line number Diff line
@@ -648,6 +648,50 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev, 
    return result;

    return result;

}

}





VKAPI_ATTR

VkResult GetPhysicalDeviceSurfaceCapabilities2KHR(

    VkPhysicalDevice physicalDevice,

    const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo,

    VkSurfaceCapabilities2KHR* pSurfaceCapabilities) {

    VkResult result = GetPhysicalDeviceSurfaceCapabilitiesKHR(

        physicalDevice, pSurfaceInfo->surface,

        &pSurfaceCapabilities->surfaceCapabilities);



    return result;

}



VKAPI_ATTR

VkResult GetPhysicalDeviceSurfaceFormats2KHR(

    VkPhysicalDevice physicalDevice,

    const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo,

    uint32_t* pSurfaceFormatCount,

    VkSurfaceFormat2KHR* pSurfaceFormats) {

    if (!pSurfaceFormats) {

        return GetPhysicalDeviceSurfaceFormatsKHR(physicalDevice,

                                                  pSurfaceInfo->surface,

                                                  pSurfaceFormatCount, nullptr);

    } else {

        // temp vector for forwarding; we'll marshal it into the pSurfaceFormats

        // after the call.

        android::Vector<VkSurfaceFormatKHR> surface_formats;

        surface_formats.resize(*pSurfaceFormatCount);

        VkResult result = GetPhysicalDeviceSurfaceFormatsKHR(

            physicalDevice, pSurfaceInfo->surface, pSurfaceFormatCount,

            &surface_formats.editItemAt(0));



        if (result == VK_SUCCESS || result == VK_INCOMPLETE) {

            // marshal results individually due to stride difference.

            // completely ignore any chained extension structs.

            uint32_t formats_to_marshal = *pSurfaceFormatCount;

            for (uint32_t i = 0u; i < formats_to_marshal; i++) {

                pSurfaceFormats[i].surfaceFormat = surface_formats[i];

            }

        }



        return result;

    }

}



VKAPI_ATTR

VKAPI_ATTR

VkResult GetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice pdev,

VkResult GetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice pdev,

                                                 VkSurfaceKHR /*surface*/,

                                                 VkSurfaceKHR /*surface*/,