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

Commit ba0be41a authored by Chia-I Wu's avatar Chia-I Wu
Browse files

vulkan: move GetDeviceQueue_Bottom 

Move it from loader.cpp to driver.cpp and rename it to
driver::GetDeviceQueue.  No functional change.

Change-Id: Ide8ebe044e62b8ef6fc64ac03dcc1d920f5bf9a6
parent cc5e2765

vulkan/libvulkan/code-generator.tmpl

+2 −0
Original line number Diff line number Diff line
@@ -834,6 +834,8 @@ VK_KHR_swapchain 


        {{if eq $.Name "vkGetDeviceProcAddr"}}

          reinterpret_cast<PFN_vkVoidFunction>({{$base}}),

        {{else if eq $.Name "vkGetDeviceQueue"}}

          reinterpret_cast<PFN_vkVoidFunction>({{$base}}),

        {{else}}

          reinterpret_cast<PFN_vkVoidFunction>({{$base}}_Bottom),

        {{end}}

vulkan/libvulkan/driver.cpp

+10 −0
Original line number Diff line number Diff line
@@ -205,5 +205,15 @@ PFN_vkVoidFunction GetDeviceProcAddr(VkDevice device, const char* pName) { 
               : hook->disabled_proc;

}



void GetDeviceQueue(VkDevice device,

                    uint32_t queueFamilyIndex,

                    uint32_t queueIndex,

                    VkQueue* pQueue) {

    const auto& data = GetData(device);



    data.driver.GetDeviceQueue(device, queueFamilyIndex, queueIndex, pQueue);

    SetData(*pQueue, data);

}



}  // namespace driver

}  // namespace vulkan

vulkan/libvulkan/driver.h

+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ const VkAllocationCallbacks& GetDefaultAllocator(); 
VKAPI_ATTR PFN_vkVoidFunction GetInstanceProcAddr(VkInstance instance, const char* pName);

VKAPI_ATTR PFN_vkVoidFunction GetDeviceProcAddr(VkDevice device, const char* pName);

VKAPI_ATTR VkResult EnumerateInstanceExtensionProperties(const char* pLayerName, uint32_t* pPropertyCount, VkExtensionProperties* pProperties);



VKAPI_ATTR void GetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue* pQueue);

// clang-format on



template <typename DispatchableType>

vulkan/libvulkan/driver_gen.cpp

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ const ProcHook g_proc_hooks[] = { 
        "vkGetDeviceQueue",

        ProcHook::DEVICE,

        ProcHook::EXTENSION_CORE,

        reinterpret_cast<PFN_vkVoidFunction>(GetDeviceQueue_Bottom),

        reinterpret_cast<PFN_vkVoidFunction>(GetDeviceQueue),

        nullptr,

        nullptr,

    },

vulkan/libvulkan/loader.cpp

+0 −10
Original line number Diff line number Diff line
@@ -638,16 +638,6 @@ void DestroyDevice_Bottom(VkDevice vkdevice, const VkAllocationCallbacks*) { 
    DestroyDevice(&GetDispatchParent(vkdevice), vkdevice);

}



void GetDeviceQueue_Bottom(VkDevice vkdevice,

                           uint32_t family,

                           uint32_t index,

                           VkQueue* queue_out) {

    const auto& data = driver::GetData(vkdevice);



    data.driver.GetDeviceQueue(vkdevice, family, index, queue_out);

    driver::SetData(*queue_out, data);

}



VkResult AllocateCommandBuffers_Bottom(

    VkDevice vkdevice,

    const VkCommandBufferAllocateInfo* alloc_info,