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

Commit a55624ba authored by Yiwei Zhang's avatar Yiwei Zhang
Browse files

libvulkan: fix support for promoted GPDP2 

This change intercepts below entry points:
vkGetPhysicalDeviceFeatures2
vkGetPhysicalDeviceProperties2
vkGetPhysicalDeviceFormatProperties2
vkGetPhysicalDeviceImageFormatProperties2
vkGetPhysicalDeviceQueueFamilyProperties2
vkGetPhysicalDeviceMemoryProperties2
vkGetPhysicalDeviceSparseImageFormatProperties2

Bug: 160276146
Test: adb shell cmd gpu vkjson
Test: dEQP-VK.api.*
Change-Id: I446192e3d29a3b0496d8d274a5a9cd3f2c0b3ee5
parent e4f64170

vulkan/libvulkan/driver.cpp

+118 −13
Original line number Diff line number Diff line
@@ -970,13 +970,6 @@ VkResult EnumerateInstanceExtensionProperties( 
bool QueryPresentationProperties(

    VkPhysicalDevice physicalDevice,

    VkPhysicalDevicePresentationPropertiesANDROID *presentation_properties) {

    const InstanceData& data = GetData(physicalDevice);



    // GPDP2 must be present and enabled on the instance.

    if (!data.driver.GetPhysicalDeviceProperties2KHR &&

        !data.driver.GetPhysicalDeviceProperties2)

        return false;



    // Request the android-specific presentation properties via GPDP2

    VkPhysicalDeviceProperties2KHR properties = {

        VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR,
@@ -992,12 +985,7 @@ bool QueryPresentationProperties( 
    presentation_properties->pNext = nullptr;

    presentation_properties->sharedImage = VK_FALSE;



    if (data.driver.GetPhysicalDeviceProperties2KHR) {

        data.driver.GetPhysicalDeviceProperties2KHR(physicalDevice,

                                                    &properties);

    } else {

        data.driver.GetPhysicalDeviceProperties2(physicalDevice, &properties);

    }

    GetPhysicalDeviceProperties2(physicalDevice, &properties);



    return true;

}
@@ -1379,5 +1367,122 @@ VKAPI_ATTR VkResult QueueSubmit(VkQueue queue, 
    return data.driver.QueueSubmit(queue, submitCount, pSubmits, fence);

}



void GetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice,

                                VkPhysicalDeviceFeatures2* pFeatures) {

    ATRACE_CALL();



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



    if (driver.GetPhysicalDeviceFeatures2) {

        driver.GetPhysicalDeviceFeatures2(physicalDevice, pFeatures);

        return;

    }



    driver.GetPhysicalDeviceFeatures2KHR(physicalDevice, pFeatures);

}



void GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,

                                  VkPhysicalDeviceProperties2* pProperties) {

    ATRACE_CALL();



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



    if (driver.GetPhysicalDeviceProperties2) {

        driver.GetPhysicalDeviceProperties2(physicalDevice, pProperties);

        return;

    }



    driver.GetPhysicalDeviceProperties2KHR(physicalDevice, pProperties);

}



void GetPhysicalDeviceFormatProperties2(

    VkPhysicalDevice physicalDevice,

    VkFormat format,

    VkFormatProperties2* pFormatProperties) {

    ATRACE_CALL();



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



    if (driver.GetPhysicalDeviceFormatProperties2) {

        driver.GetPhysicalDeviceFormatProperties2(physicalDevice, format,

                                                  pFormatProperties);

        return;

    }



    driver.GetPhysicalDeviceFormatProperties2KHR(physicalDevice, format,

                                                 pFormatProperties);

}



VkResult GetPhysicalDeviceImageFormatProperties2(

    VkPhysicalDevice physicalDevice,

    const VkPhysicalDeviceImageFormatInfo2* pImageFormatInfo,

    VkImageFormatProperties2* pImageFormatProperties) {

    ATRACE_CALL();



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



    if (driver.GetPhysicalDeviceImageFormatProperties2) {

        return driver.GetPhysicalDeviceImageFormatProperties2(

            physicalDevice, pImageFormatInfo, pImageFormatProperties);

    }



    return driver.GetPhysicalDeviceImageFormatProperties2KHR(

        physicalDevice, pImageFormatInfo, pImageFormatProperties);

}



void GetPhysicalDeviceQueueFamilyProperties2(

    VkPhysicalDevice physicalDevice,

    uint32_t* pQueueFamilyPropertyCount,

    VkQueueFamilyProperties2* pQueueFamilyProperties) {

    ATRACE_CALL();



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



    if (driver.GetPhysicalDeviceQueueFamilyProperties2) {

        driver.GetPhysicalDeviceQueueFamilyProperties2(

            physicalDevice, pQueueFamilyPropertyCount, pQueueFamilyProperties);

        return;

    }



    driver.GetPhysicalDeviceQueueFamilyProperties2KHR(

        physicalDevice, pQueueFamilyPropertyCount, pQueueFamilyProperties);

}



void GetPhysicalDeviceMemoryProperties2(

    VkPhysicalDevice physicalDevice,

    VkPhysicalDeviceMemoryProperties2* pMemoryProperties) {

    ATRACE_CALL();



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



    if (driver.GetPhysicalDeviceMemoryProperties2) {

        driver.GetPhysicalDeviceMemoryProperties2(physicalDevice,

                                                  pMemoryProperties);

        return;

    }



    driver.GetPhysicalDeviceMemoryProperties2KHR(physicalDevice,

                                                 pMemoryProperties);

}



void GetPhysicalDeviceSparseImageFormatProperties2(

    VkPhysicalDevice physicalDevice,

    const VkPhysicalDeviceSparseImageFormatInfo2* pFormatInfo,

    uint32_t* pPropertyCount,

    VkSparseImageFormatProperties2* pProperties) {

    ATRACE_CALL();



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



    if (driver.GetPhysicalDeviceSparseImageFormatProperties2) {

        driver.GetPhysicalDeviceSparseImageFormatProperties2(

            physicalDevice, pFormatInfo, pPropertyCount, pProperties);

        return;

    }



    driver.GetPhysicalDeviceSparseImageFormatProperties2KHR(

        physicalDevice, pFormatInfo, pPropertyCount, pProperties);

}



}  // namespace driver

}  // namespace vulkan

vulkan/libvulkan/driver.h

+8 −0
Original line number Diff line number Diff line
@@ -126,6 +126,14 @@ VKAPI_ATTR void GetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint3 
VKAPI_ATTR void GetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2* pQueueInfo, VkQueue* pQueue);

VKAPI_ATTR VkResult AllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo* pAllocateInfo, VkCommandBuffer* pCommandBuffers);

VKAPI_ATTR VkResult QueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo* pSubmits, VkFence fence);



VKAPI_ATTR void GetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures2* pFeatures);

VKAPI_ATTR void GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2* pProperties);

VKAPI_ATTR void GetPhysicalDeviceFormatProperties2(VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties2* pFormatProperties);

VKAPI_ATTR VkResult GetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2* pImageFormatInfo, VkImageFormatProperties2* pImageFormatProperties);

VKAPI_ATTR void GetPhysicalDeviceQueueFamilyProperties2(VkPhysicalDevice physicalDevice, uint32_t* pQueueFamilyPropertyCount, VkQueueFamilyProperties2* pQueueFamilyProperties);

VKAPI_ATTR void GetPhysicalDeviceMemoryProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties2* pMemoryProperties);

VKAPI_ATTR void GetPhysicalDeviceSparseImageFormatProperties2(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2* pFormatInfo, uint32_t* pPropertyCount, VkSparseImageFormatProperties2* pProperties);

// clang-format on



template <typename DispatchableType>

vulkan/libvulkan/driver_gen.cpp

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

        reinterpret_cast<PFN_vkVoidFunction>(checkedGetPastPresentationTimingGOOGLE),

    },

    {

        "vkGetPhysicalDeviceFeatures2",

        ProcHook::INSTANCE,

        ProcHook::EXTENSION_CORE_1_1,

        reinterpret_cast<PFN_vkVoidFunction>(GetPhysicalDeviceFeatures2),

        nullptr,

    },

    {

        "vkGetPhysicalDeviceFormatProperties2",

        ProcHook::INSTANCE,

        ProcHook::EXTENSION_CORE_1_1,

        reinterpret_cast<PFN_vkVoidFunction>(GetPhysicalDeviceFormatProperties2),

        nullptr,

    },

    {

        "vkGetPhysicalDeviceImageFormatProperties2",

        ProcHook::INSTANCE,

        ProcHook::EXTENSION_CORE_1_1,

        reinterpret_cast<PFN_vkVoidFunction>(GetPhysicalDeviceImageFormatProperties2),

        nullptr,

    },

    {

        "vkGetPhysicalDeviceMemoryProperties2",

        ProcHook::INSTANCE,

        ProcHook::EXTENSION_CORE_1_1,

        reinterpret_cast<PFN_vkVoidFunction>(GetPhysicalDeviceMemoryProperties2),

        nullptr,

    },

    {

        "vkGetPhysicalDevicePresentRectanglesKHR",

        ProcHook::INSTANCE,
@@ -369,6 +397,27 @@ const ProcHook g_proc_hooks[] = { 
        reinterpret_cast<PFN_vkVoidFunction>(GetPhysicalDevicePresentRectanglesKHR),

        nullptr,

    },

    {

        "vkGetPhysicalDeviceProperties2",

        ProcHook::INSTANCE,

        ProcHook::EXTENSION_CORE_1_1,

        reinterpret_cast<PFN_vkVoidFunction>(GetPhysicalDeviceProperties2),

        nullptr,

    },

    {

        "vkGetPhysicalDeviceQueueFamilyProperties2",

        ProcHook::INSTANCE,

        ProcHook::EXTENSION_CORE_1_1,

        reinterpret_cast<PFN_vkVoidFunction>(GetPhysicalDeviceQueueFamilyProperties2),

        nullptr,

    },

    {

        "vkGetPhysicalDeviceSparseImageFormatProperties2",

        ProcHook::INSTANCE,

        ProcHook::EXTENSION_CORE_1_1,

        reinterpret_cast<PFN_vkVoidFunction>(GetPhysicalDeviceSparseImageFormatProperties2),

        nullptr,

    },

    {

        "vkGetPhysicalDeviceSurfaceCapabilities2KHR",

        ProcHook::INSTANCE,
@@ -544,8 +593,20 @@ bool InitDriverTable(VkInstance instance, 
    INIT_PROC_EXT(EXT_debug_report, true, instance, CreateDebugReportCallbackEXT);

    INIT_PROC_EXT(EXT_debug_report, true, instance, DestroyDebugReportCallbackEXT);

    INIT_PROC_EXT(EXT_debug_report, true, instance, DebugReportMessageEXT);

    INIT_PROC(false, instance, GetPhysicalDeviceFeatures2);

    INIT_PROC_EXT(KHR_get_physical_device_properties2, true, instance, GetPhysicalDeviceFeatures2KHR);

    INIT_PROC(false, instance, GetPhysicalDeviceProperties2);

    INIT_PROC_EXT(KHR_get_physical_device_properties2, true, instance, GetPhysicalDeviceProperties2KHR);

    INIT_PROC(false, instance, GetPhysicalDeviceFormatProperties2);

    INIT_PROC_EXT(KHR_get_physical_device_properties2, true, instance, GetPhysicalDeviceFormatProperties2KHR);

    INIT_PROC(false, instance, GetPhysicalDeviceImageFormatProperties2);

    INIT_PROC_EXT(KHR_get_physical_device_properties2, true, instance, GetPhysicalDeviceImageFormatProperties2KHR);

    INIT_PROC(false, instance, GetPhysicalDeviceQueueFamilyProperties2);

    INIT_PROC_EXT(KHR_get_physical_device_properties2, true, instance, GetPhysicalDeviceQueueFamilyProperties2KHR);

    INIT_PROC(false, instance, GetPhysicalDeviceMemoryProperties2);

    INIT_PROC_EXT(KHR_get_physical_device_properties2, true, instance, GetPhysicalDeviceMemoryProperties2KHR);

    INIT_PROC(false, instance, GetPhysicalDeviceSparseImageFormatProperties2);

    INIT_PROC_EXT(KHR_get_physical_device_properties2, true, instance, GetPhysicalDeviceSparseImageFormatProperties2KHR);

    INIT_PROC(false, instance, EnumeratePhysicalDeviceGroups);

    INIT_PROC_EXT(KHR_device_group_creation, true, instance, EnumeratePhysicalDeviceGroupsKHR);

    // clang-format on

vulkan/libvulkan/driver_gen.h

+12 −0
Original line number Diff line number Diff line
@@ -77,8 +77,20 @@ struct InstanceDriverTable { 
    PFN_vkCreateDebugReportCallbackEXT CreateDebugReportCallbackEXT;

    PFN_vkDestroyDebugReportCallbackEXT DestroyDebugReportCallbackEXT;

    PFN_vkDebugReportMessageEXT DebugReportMessageEXT;

    PFN_vkGetPhysicalDeviceFeatures2 GetPhysicalDeviceFeatures2;

    PFN_vkGetPhysicalDeviceFeatures2KHR GetPhysicalDeviceFeatures2KHR;

    PFN_vkGetPhysicalDeviceProperties2 GetPhysicalDeviceProperties2;

    PFN_vkGetPhysicalDeviceProperties2KHR GetPhysicalDeviceProperties2KHR;

    PFN_vkGetPhysicalDeviceFormatProperties2 GetPhysicalDeviceFormatProperties2;

    PFN_vkGetPhysicalDeviceFormatProperties2KHR GetPhysicalDeviceFormatProperties2KHR;

    PFN_vkGetPhysicalDeviceImageFormatProperties2 GetPhysicalDeviceImageFormatProperties2;

    PFN_vkGetPhysicalDeviceImageFormatProperties2KHR GetPhysicalDeviceImageFormatProperties2KHR;

    PFN_vkGetPhysicalDeviceQueueFamilyProperties2 GetPhysicalDeviceQueueFamilyProperties2;

    PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR GetPhysicalDeviceQueueFamilyProperties2KHR;

    PFN_vkGetPhysicalDeviceMemoryProperties2 GetPhysicalDeviceMemoryProperties2;

    PFN_vkGetPhysicalDeviceMemoryProperties2KHR GetPhysicalDeviceMemoryProperties2KHR;

    PFN_vkGetPhysicalDeviceSparseImageFormatProperties2 GetPhysicalDeviceSparseImageFormatProperties2;

    PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR GetPhysicalDeviceSparseImageFormatProperties2KHR;

    PFN_vkEnumeratePhysicalDeviceGroups EnumeratePhysicalDeviceGroups;

    PFN_vkEnumeratePhysicalDeviceGroupsKHR EnumeratePhysicalDeviceGroupsKHR;

    // clang-format on

vulkan/scripts/driver_generator.py

+25 −2
Original line number Diff line number Diff line
@@ -72,8 +72,6 @@ _NEEDED_COMMANDS = [ 
    'vkDestroyImage',



    'vkGetPhysicalDeviceProperties',

    'vkGetPhysicalDeviceProperties2',

    'vkGetPhysicalDeviceProperties2KHR',



    # VK_KHR_swapchain v69 requirement

    'vkBindImageMemory2',
@@ -81,6 +79,22 @@ _NEEDED_COMMANDS = [ 


    # For promoted VK_KHR_device_group_creation

    'vkEnumeratePhysicalDeviceGroupsKHR',



    # For promoted VK_KHR_get_physical_device_properties2

    'vkGetPhysicalDeviceFeatures2',

    'vkGetPhysicalDeviceFeatures2KHR',

    'vkGetPhysicalDeviceProperties2',

    'vkGetPhysicalDeviceProperties2KHR',

    'vkGetPhysicalDeviceFormatProperties2',

    'vkGetPhysicalDeviceFormatProperties2KHR',

    'vkGetPhysicalDeviceImageFormatProperties2',

    'vkGetPhysicalDeviceImageFormatProperties2KHR',

    'vkGetPhysicalDeviceQueueFamilyProperties2',

    'vkGetPhysicalDeviceQueueFamilyProperties2KHR',

    'vkGetPhysicalDeviceMemoryProperties2',

    'vkGetPhysicalDeviceMemoryProperties2KHR',

    'vkGetPhysicalDeviceSparseImageFormatProperties2',

    'vkGetPhysicalDeviceSparseImageFormatProperties2KHR',

]



# Functions intercepted at vulkan::driver level.
@@ -110,6 +124,15 @@ _INTERCEPTED_COMMANDS = [ 
    # VK_KHR_swapchain v69 requirement

    'vkBindImageMemory2',

    'vkBindImageMemory2KHR',



    # For promoted VK_KHR_get_physical_device_properties2

    'vkGetPhysicalDeviceFeatures2',

    'vkGetPhysicalDeviceProperties2',

    'vkGetPhysicalDeviceFormatProperties2',

    'vkGetPhysicalDeviceImageFormatProperties2',

    'vkGetPhysicalDeviceQueueFamilyProperties2',

    'vkGetPhysicalDeviceMemoryProperties2',

    'vkGetPhysicalDeviceSparseImageFormatProperties2',

]