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

Commit a790a724 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ieb55dfec,I08e5647f,I446192e3,I9e2d9af6 

* changes:
  vkjson: refactor based on 1.1 assumptions
  libvulkan: fix support for promoted VK_KHR_external_* extensions
  libvulkan: fix support for promoted GPDP2
  libvulkan: fix support for 1.1 vkEnumeratePhysicalDeviceGroups
parents 6d20b3b2 91fc3dc9

vulkan/libvulkan/driver.cpp

+213 −17
Original line number Diff line number Diff line
@@ -633,6 +633,10 @@ void CreateInfoWrapper::FilterExtension(const char* name) { 
                hook_extensions_.set(ext_bit);

                break;

            case ProcHook::KHR_get_physical_device_properties2:

            case ProcHook::KHR_device_group_creation:

            case ProcHook::KHR_external_memory_capabilities:

            case ProcHook::KHR_external_semaphore_capabilities:

            case ProcHook::KHR_external_fence_capabilities:

            case ProcHook::EXTENSION_UNKNOWN:

                // Extensions we don't need to do anything about at this level

                break;
@@ -689,6 +693,10 @@ void CreateInfoWrapper::FilterExtension(const char* name) { 


            case ProcHook::KHR_android_surface:

            case ProcHook::KHR_get_physical_device_properties2:

            case ProcHook::KHR_device_group_creation:

            case ProcHook::KHR_external_memory_capabilities:

            case ProcHook::KHR_external_semaphore_capabilities:

            case ProcHook::KHR_external_fence_capabilities:

            case ProcHook::KHR_get_surface_capabilities2:

            case ProcHook::KHR_surface:

            case ProcHook::EXT_debug_report:
@@ -968,13 +976,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,
@@ -990,12 +991,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;

}
@@ -1266,7 +1262,8 @@ VkResult EnumeratePhysicalDeviceGroups( 
    VkResult result = VK_SUCCESS;

    const auto& data = GetData(instance);



    if (!data.driver.EnumeratePhysicalDeviceGroups) {

    if (!data.driver.EnumeratePhysicalDeviceGroups &&

        !data.driver.EnumeratePhysicalDeviceGroupsKHR) {

        uint32_t device_count = 0;

        result = EnumeratePhysicalDevices(instance, &device_count, nullptr);

        if (result < 0)
@@ -1298,9 +1295,15 @@ VkResult EnumeratePhysicalDeviceGroups( 
            pPhysicalDeviceGroupProperties[i].subsetAllocation = 0;

        }

    } else {

        if (data.driver.EnumeratePhysicalDeviceGroups) {

            result = data.driver.EnumeratePhysicalDeviceGroups(

                instance, pPhysicalDeviceGroupCount,

                pPhysicalDeviceGroupProperties);

        } else {

            result = data.driver.EnumeratePhysicalDeviceGroupsKHR(

                instance, pPhysicalDeviceGroupCount,

                pPhysicalDeviceGroupProperties);

        }

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

            *pPhysicalDeviceGroupCount && pPhysicalDeviceGroupProperties) {

            for (uint32_t i = 0; i < *pPhysicalDeviceGroupCount; i++) {
@@ -1370,5 +1373,198 @@ 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);

}



void GetPhysicalDeviceExternalBufferProperties(

    VkPhysicalDevice physicalDevice,

    const VkPhysicalDeviceExternalBufferInfo* pExternalBufferInfo,

    VkExternalBufferProperties* pExternalBufferProperties) {

    ATRACE_CALL();



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



    if (driver.GetPhysicalDeviceExternalBufferProperties) {

        driver.GetPhysicalDeviceExternalBufferProperties(

            physicalDevice, pExternalBufferInfo, pExternalBufferProperties);

        return;

    }



    if (driver.GetPhysicalDeviceExternalBufferPropertiesKHR) {

        driver.GetPhysicalDeviceExternalBufferPropertiesKHR(

            physicalDevice, pExternalBufferInfo, pExternalBufferProperties);

        return;

    }



    memset(&pExternalBufferProperties->externalMemoryProperties, 0,

           sizeof(VkExternalMemoryProperties));

}



void GetPhysicalDeviceExternalSemaphoreProperties(

    VkPhysicalDevice physicalDevice,

    const VkPhysicalDeviceExternalSemaphoreInfo* pExternalSemaphoreInfo,

    VkExternalSemaphoreProperties* pExternalSemaphoreProperties) {

    ATRACE_CALL();



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



    if (driver.GetPhysicalDeviceExternalSemaphoreProperties) {

        driver.GetPhysicalDeviceExternalSemaphoreProperties(

            physicalDevice, pExternalSemaphoreInfo,

            pExternalSemaphoreProperties);

        return;

    }



    if (driver.GetPhysicalDeviceExternalSemaphorePropertiesKHR) {

        driver.GetPhysicalDeviceExternalSemaphorePropertiesKHR(

            physicalDevice, pExternalSemaphoreInfo,

            pExternalSemaphoreProperties);

        return;

    }



    pExternalSemaphoreProperties->exportFromImportedHandleTypes = 0;

    pExternalSemaphoreProperties->compatibleHandleTypes = 0;

    pExternalSemaphoreProperties->externalSemaphoreFeatures = 0;

}



void GetPhysicalDeviceExternalFenceProperties(

    VkPhysicalDevice physicalDevice,

    const VkPhysicalDeviceExternalFenceInfo* pExternalFenceInfo,

    VkExternalFenceProperties* pExternalFenceProperties) {

    ATRACE_CALL();



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



    if (driver.GetPhysicalDeviceExternalFenceProperties) {

        driver.GetPhysicalDeviceExternalFenceProperties(

            physicalDevice, pExternalFenceInfo, pExternalFenceProperties);

        return;

    }



    if (driver.GetPhysicalDeviceExternalFencePropertiesKHR) {

        driver.GetPhysicalDeviceExternalFencePropertiesKHR(

            physicalDevice, pExternalFenceInfo, pExternalFenceProperties);

        return;

    }



    pExternalFenceProperties->exportFromImportedHandleTypes = 0;

    pExternalFenceProperties->compatibleHandleTypes = 0;

    pExternalFenceProperties->externalFenceFeatures = 0;

}



}  // namespace driver

}  // namespace vulkan

vulkan/libvulkan/driver.h

+12 −0
Original line number Diff line number Diff line
@@ -126,6 +126,18 @@ 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);



VKAPI_ATTR void GetPhysicalDeviceExternalBufferProperties(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo* pExternalBufferInfo, VkExternalBufferProperties* pExternalBufferProperties);

VKAPI_ATTR void GetPhysicalDeviceExternalSemaphoreProperties(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalSemaphoreInfo* pExternalSemaphoreInfo, VkExternalSemaphoreProperties* pExternalSemaphoreProperties);

VKAPI_ATTR void GetPhysicalDeviceExternalFenceProperties(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalFenceInfo* pExternalFenceInfo, VkExternalFenceProperties* pExternalFenceProperties);

// clang-format on



template <typename DispatchableType>

vulkan/libvulkan/driver_gen.cpp

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

        reinterpret_cast<PFN_vkVoidFunction>(checkedGetPastPresentationTimingGOOGLE),

    },

    {

        "vkGetPhysicalDeviceExternalBufferProperties",

        ProcHook::INSTANCE,

        ProcHook::EXTENSION_CORE_1_1,

        reinterpret_cast<PFN_vkVoidFunction>(GetPhysicalDeviceExternalBufferProperties),

        nullptr,

    },

    {

        "vkGetPhysicalDeviceExternalFenceProperties",

        ProcHook::INSTANCE,

        ProcHook::EXTENSION_CORE_1_1,

        reinterpret_cast<PFN_vkVoidFunction>(GetPhysicalDeviceExternalFenceProperties),

        nullptr,

    },

    {

        "vkGetPhysicalDeviceExternalSemaphoreProperties",

        ProcHook::INSTANCE,

        ProcHook::EXTENSION_CORE_1_1,

        reinterpret_cast<PFN_vkVoidFunction>(GetPhysicalDeviceExternalSemaphoreProperties),

        nullptr,

    },

    {

        "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 +418,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,
@@ -505,6 +575,10 @@ ProcHook::Extension GetProcHookExtension(const char* name) { 
    if (strcmp(name, "VK_ANDROID_external_memory_android_hardware_buffer") == 0) return ProcHook::ANDROID_external_memory_android_hardware_buffer;

    if (strcmp(name, "VK_KHR_bind_memory2") == 0) return ProcHook::KHR_bind_memory2;

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

    if (strcmp(name, "VK_KHR_device_group_creation") == 0) return ProcHook::KHR_device_group_creation;

    if (strcmp(name, "VK_KHR_external_memory_capabilities") == 0) return ProcHook::KHR_external_memory_capabilities;

    if (strcmp(name, "VK_KHR_external_semaphore_capabilities") == 0) return ProcHook::KHR_external_semaphore_capabilities;

    if (strcmp(name, "VK_KHR_external_fence_capabilities") == 0) return ProcHook::KHR_external_fence_capabilities;

    // clang-format on

    return ProcHook::EXTENSION_UNKNOWN;

}
@@ -543,9 +617,28 @@ 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, GetPhysicalDeviceExternalBufferProperties);

    INIT_PROC_EXT(KHR_external_memory_capabilities, true, instance, GetPhysicalDeviceExternalBufferPropertiesKHR);

    INIT_PROC(false, instance, GetPhysicalDeviceExternalSemaphoreProperties);

    INIT_PROC_EXT(KHR_external_semaphore_capabilities, true, instance, GetPhysicalDeviceExternalSemaphorePropertiesKHR);

    INIT_PROC(false, instance, GetPhysicalDeviceExternalFenceProperties);

    INIT_PROC_EXT(KHR_external_fence_capabilities, true, instance, GetPhysicalDeviceExternalFencePropertiesKHR);

    INIT_PROC(false, instance, EnumeratePhysicalDeviceGroups);

    INIT_PROC_EXT(KHR_device_group_creation, true, instance, EnumeratePhysicalDeviceGroupsKHR);

    // clang-format on



    return success;

vulkan/libvulkan/driver_gen.h

+23 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ struct ProcHook { 
        ANDROID_external_memory_android_hardware_buffer,

        KHR_bind_memory2,

        KHR_get_physical_device_properties2,

        KHR_device_group_creation,

        KHR_external_memory_capabilities,

        KHR_external_semaphore_capabilities,

        KHR_external_fence_capabilities,



        EXTENSION_CORE_1_0,

        EXTENSION_CORE_1_1,
@@ -76,9 +80,28 @@ 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_vkGetPhysicalDeviceExternalBufferProperties GetPhysicalDeviceExternalBufferProperties;

    PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR GetPhysicalDeviceExternalBufferPropertiesKHR;

    PFN_vkGetPhysicalDeviceExternalSemaphoreProperties GetPhysicalDeviceExternalSemaphoreProperties;

    PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR GetPhysicalDeviceExternalSemaphorePropertiesKHR;

    PFN_vkGetPhysicalDeviceExternalFenceProperties GetPhysicalDeviceExternalFenceProperties;

    PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR GetPhysicalDeviceExternalFencePropertiesKHR;

    PFN_vkEnumeratePhysicalDeviceGroups EnumeratePhysicalDeviceGroups;

    PFN_vkEnumeratePhysicalDeviceGroupsKHR EnumeratePhysicalDeviceGroupsKHR;

    // clang-format on

};

vulkan/scripts/driver_generator.py

+53 −2
Original line number Diff line number Diff line
@@ -40,6 +40,10 @@ _KNOWN_EXTENSIONS = _INTERCEPTED_EXTENSIONS + [ 
    'VK_ANDROID_external_memory_android_hardware_buffer',

    'VK_KHR_bind_memory2',

    'VK_KHR_get_physical_device_properties2',

    'VK_KHR_device_group_creation',

    'VK_KHR_external_memory_capabilities',

    'VK_KHR_external_semaphore_capabilities',

    'VK_KHR_external_fence_capabilities',

]



# Functions needed at vulkan::driver level.
@@ -71,12 +75,41 @@ _NEEDED_COMMANDS = [ 
    'vkDestroyImage',



    'vkGetPhysicalDeviceProperties',

    'vkGetPhysicalDeviceProperties2',

    'vkGetPhysicalDeviceProperties2KHR',



    # VK_KHR_swapchain v69 requirement

    'vkBindImageMemory2',

    'vkBindImageMemory2KHR',



    # 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',



    # For promoted VK_KHR_external_memory_capabilities

    'vkGetPhysicalDeviceExternalBufferProperties',

    'vkGetPhysicalDeviceExternalBufferPropertiesKHR',



    # For promoted VK_KHR_external_semaphore_capabilities

    'vkGetPhysicalDeviceExternalSemaphoreProperties',

    'vkGetPhysicalDeviceExternalSemaphorePropertiesKHR',



    # For promoted VK_KHR_external_fence_capabilities

    'vkGetPhysicalDeviceExternalFenceProperties',

    'vkGetPhysicalDeviceExternalFencePropertiesKHR',

]



# Functions intercepted at vulkan::driver level.
@@ -106,6 +139,24 @@ _INTERCEPTED_COMMANDS = [ 
    # VK_KHR_swapchain v69 requirement

    'vkBindImageMemory2',

    'vkBindImageMemory2KHR',



    # For promoted VK_KHR_get_physical_device_properties2

    'vkGetPhysicalDeviceFeatures2',

    'vkGetPhysicalDeviceProperties2',

    'vkGetPhysicalDeviceFormatProperties2',

    'vkGetPhysicalDeviceImageFormatProperties2',

    'vkGetPhysicalDeviceQueueFamilyProperties2',

    'vkGetPhysicalDeviceMemoryProperties2',

    'vkGetPhysicalDeviceSparseImageFormatProperties2',



    # For promoted VK_KHR_external_memory_capabilities

    'vkGetPhysicalDeviceExternalBufferProperties',



    # For promoted VK_KHR_external_semaphore_capabilities

    'vkGetPhysicalDeviceExternalSemaphoreProperties',



    # For promoted VK_KHR_external_fence_capabilities

    'vkGetPhysicalDeviceExternalFenceProperties',

]