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

Commit 47d4af7c authored by Jesse Hall's avatar Jesse Hall Committed by Automerger Merge Worker
Browse files

Merge "libvulkan: support vkGIPA self-query" into rvc-dev am: 68904ad9 

Change-Id: Ib770da958eade79235f4c6854bc9f85128af2288
parents dbb46aa5 68904ad9

vulkan/libvulkan/api_gen.cpp

+1 −0
Original line number Diff line number Diff line
@@ -621,6 +621,7 @@ VKAPI_ATTR PFN_vkVoidFunction GetInstanceProcAddr(VkInstance instance, const cha 
    // global functions

    if (instance == VK_NULL_HANDLE) {

        if (strcmp(pName, "vkCreateInstance") == 0) return reinterpret_cast<PFN_vkVoidFunction>(CreateInstance);

        if (strcmp(pName, "vkGetInstanceProcAddr") == 0) return reinterpret_cast<PFN_vkVoidFunction>(GetInstanceProcAddr);

        if (strcmp(pName, "vkEnumerateInstanceVersion") == 0) return reinterpret_cast<PFN_vkVoidFunction>(EnumerateInstanceVersion);

        if (strcmp(pName, "vkEnumerateInstanceLayerProperties") == 0) return reinterpret_cast<PFN_vkVoidFunction>(EnumerateInstanceLayerProperties);

        if (strcmp(pName, "vkEnumerateInstanceExtensionProperties") == 0) return reinterpret_cast<PFN_vkVoidFunction>(EnumerateInstanceExtensionProperties);

vulkan/scripts/api_generator.py

+3 −1
Original line number Diff line number Diff line
@@ -152,7 +152,9 @@ def _intercept_instance_proc_addr(f): 
    if (instance == VK_NULL_HANDLE) {\n""")



  for cmd in gencom.command_list:

    if gencom.is_globally_dispatched(cmd):

    # vkGetInstanceProcAddr(nullptr, "vkGetInstanceProcAddr") is effectively

    # globally dispatched

    if gencom.is_globally_dispatched(cmd) or cmd == 'vkGetInstanceProcAddr':

      f.write(gencom.indent(2) +

              'if (strcmp(pName, \"' + cmd +

              '\") == 0) return reinterpret_cast<PFN_vkVoidFunction>(' +