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

Commit 6614a577 authored by Jesse Hall's avatar Jesse Hall
Browse files

vulkan: Fix GetSpecific*ProcAddr for extension functions 

Change-Id: Ib19e08b9e057affe348e0da5e6840e139d4ec292
(cherry picked from commit b7f5ef5d5fee72fc16fb3e883b0d1725f2c7feed)
parent e2fd788b

vulkan/libvulkan/get_proc_addr.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -407,7 +407,7 @@ PFN_vkVoidFunction GetSpecificInstanceProcAddr(const InstanceVtbl* vtbl, 
        return nullptr;

        return nullptr;

    const unsigned char* base = reinterpret_cast<const unsigned char*>(vtbl);

    const unsigned char* base = reinterpret_cast<const unsigned char*>(vtbl);

    return *reinterpret_cast<PFN_vkVoidFunction*>(

    return *reinterpret_cast<PFN_vkVoidFunction*>(

        const_cast<unsigned char*>(base) + entry->offset);

               const_cast<unsigned char*>(base) + offset);

}

}





PFN_vkVoidFunction GetSpecificDeviceProcAddr(const DeviceVtbl* vtbl,

PFN_vkVoidFunction GetSpecificDeviceProcAddr(const DeviceVtbl* vtbl,
@@ -436,7 +436,7 @@ PFN_vkVoidFunction GetSpecificDeviceProcAddr(const DeviceVtbl* vtbl, 
        return nullptr;

        return nullptr;

    const unsigned char* base = reinterpret_cast<const unsigned char*>(vtbl);

    const unsigned char* base = reinterpret_cast<const unsigned char*>(vtbl);

    return *reinterpret_cast<PFN_vkVoidFunction*>(

    return *reinterpret_cast<PFN_vkVoidFunction*>(

        const_cast<unsigned char*>(base) + entry->offset);

               const_cast<unsigned char*>(base) + offset);

}

}





bool LoadInstanceVtbl(VkInstance instance,

bool LoadInstanceVtbl(VkInstance instance,

vulkan/libvulkan/get_proc_addr.cpp.tmpl

+2 −2
Original line number Original line Diff line number Diff line
@@ -168,7 +168,7 @@ PFN_vkVoidFunction GetSpecificInstanceProcAddr(const InstanceVtbl* vtbl, 
        return nullptr;

        return nullptr;

    const unsigned char* base = reinterpret_cast<const unsigned char*>(vtbl);

    const unsigned char* base = reinterpret_cast<const unsigned char*>(vtbl);

    return *reinterpret_cast<PFN_vkVoidFunction*>(

    return *reinterpret_cast<PFN_vkVoidFunction*>(

        const_cast<unsigned char*>(base) + entry->offset);

        const_cast<unsigned char*>(base) + offset);

}

}





PFN_vkVoidFunction GetSpecificDeviceProcAddr(const DeviceVtbl* vtbl,

PFN_vkVoidFunction GetSpecificDeviceProcAddr(const DeviceVtbl* vtbl,
@@ -197,7 +197,7 @@ PFN_vkVoidFunction GetSpecificDeviceProcAddr(const DeviceVtbl* vtbl, 
        return nullptr;

        return nullptr;

    const unsigned char* base = reinterpret_cast<const unsigned char*>(vtbl);

    const unsigned char* base = reinterpret_cast<const unsigned char*>(vtbl);

    return *reinterpret_cast<PFN_vkVoidFunction*>(

    return *reinterpret_cast<PFN_vkVoidFunction*>(

        const_cast<unsigned char*>(base) + entry->offset);

        const_cast<unsigned char*>(base) + offset);

}

}





bool LoadInstanceVtbl(VkInstance instance,

bool LoadInstanceVtbl(VkInstance instance,