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

Commit 2ca1bd55 authored by Jesse Hall's avatar Jesse Hall
Browse files

libvulkan: Fix missed vkAllocateCommandBuffers renames 

Change-Id: Ic3fee0d565009327f524084b14da498c8412155f
(cherry picked from commit 3b8513e831673417af2ad79baa6c73710742fa0f)
parent e6839555

vulkan/libvulkan/entry.cpp

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ VKAPI_ATTR VkResult vkResetCommandPool(VkDevice device, VkCommandPool commandPoo 


__attribute__((visibility("default")))

VKAPI_ATTR VkResult vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo* pAllocateInfo, VkCommandBuffer* pCommandBuffers) {

    return GetVtbl(device).AllocateCommandBuffers(device, pAllocateInfo, pCommandBuffers);

    return vulkan::AllocateCommandBuffers(device, pAllocateInfo, pCommandBuffers);

}



__attribute__((visibility("default")))

vulkan/libvulkan/entry.cpp.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ namespace { 
*/}}

{{define "IsSpecialEntry"}}

  {{/* TODO: figure out how to do this in a cleaner or at least multi-line way */}}

  {{if or (eq $ "vkGetInstanceProcAddr") (or (eq $ "vkGetDeviceProcAddr") (or (eq $ "vkGetDeviceQueue") (or (eq $ "vkCreateCommandBuffer") (eq $ "vkDestroyDevice"))))}}

  {{if or (eq $ "vkGetInstanceProcAddr") (or (eq $ "vkGetDeviceProcAddr") (or (eq $ "vkGetDeviceQueue") (or (eq $ "vkAllocateCommandBuffers") (eq $ "vkDestroyDevice"))))}}

    true

  {{end}}

{{end}}

vulkan/libvulkan/loader.cpp

+5 −5
Original line number Diff line number Diff line
@@ -1121,8 +1121,8 @@ PFN_vkVoidFunction GetDeviceProcAddr(VkDevice device, const char* name) { 
    if (strcmp(name, "vkGetDeviceQueue") == 0) {

        return reinterpret_cast<PFN_vkVoidFunction>(GetDeviceQueue);

    }

    if (strcmp(name, "vkAllocCommandBuffers") == 0) {

        return reinterpret_cast<PFN_vkVoidFunction>(AllocCommandBuffers);

    if (strcmp(name, "vkAllocateCommandBuffers") == 0) {

        return reinterpret_cast<PFN_vkVoidFunction>(AllocateCommandBuffers);

    }

    if (strcmp(name, "vkDestroyDevice") == 0) {

        return reinterpret_cast<PFN_vkVoidFunction>(DestroyDevice);
@@ -1146,7 +1146,7 @@ void GetDeviceQueue(VkDevice drv_device, 
    *out_queue = queue;

}



VkResult AllocCommandBuffers(VkDevice device,

VkResult AllocateCommandBuffers(VkDevice device,

                                const VkCommandBufferAllocateInfo* alloc_info,

                                VkCommandBuffer* cmdbufs) {

    const DeviceVtbl* vtbl = GetVtbl(device);

vulkan/libvulkan/loader.h

+3 −3
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ void GetDeviceQueue(VkDevice drv_device, 
                    uint32_t family,

                    uint32_t index,

                    VkQueue* out_queue);

VkResult AllocCommandBuffers(VkDevice device,

VkResult AllocateCommandBuffers(VkDevice device,

                                const VkCommandBufferAllocateInfo* alloc_info,

                                VkCommandBuffer* cmdbufs);

VkResult DestroyDevice(VkDevice drv_device,