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

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

vulkan: rework CreateInstance_Bottom and related ones 

The reworked driver::CreateInstance will

 - call HAL's EnumerateInstanceExtensionProperties and filter out
   extensions unknown to HAL, if there is any extension enabled.

We do not expect or enumerate any HAL layer yet as that requires some
works to layers_extensions.cpp.

The reworked driver::EnumerateInstanceExtensionProperties instead will
return all extensions enumerated by HAL, after prepending VK_KHR_surface
and VK_KHR_android_surface to them.  This allows extensions unknown to the
loader to be enumerated.

Change-Id: I73b496582a773e06c7b79f0c5c166700737f2953
parent 01cf3053

vulkan/libvulkan/code-generator.tmpl

+3 −16
Original line number Diff line number Diff line
@@ -601,6 +601,7 @@ VK_KHR_swapchain 
    {{/* Create functions of dispatchable objects */}}

    {{     if eq $.Name "vkCreateInstance"}}true

    {{else if eq $.Name "vkCreateDevice"}}true

    {{else if eq $.Name "vkEnumeratePhysicalDevices"}}true

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

    {{else if eq $.Name "vkAllocateCommandBuffers"}}true
@@ -612,9 +613,6 @@ VK_KHR_swapchain 
    {{else if eq $.Name "vkEnumerateInstanceExtensionProperties"}}true

    {{else if eq $.Name "vkEnumerateDeviceExtensionProperties"}}true



    {{/* We cache physical devices in loader.cpp */}}

    {{else if eq $.Name "vkEnumeratePhysicalDevices"}}true



    {{else if eq $.Name "vkGetInstanceProcAddr"}}true

    {{else if eq $.Name "vkGetDeviceProcAddr"}}true
@@ -749,11 +747,7 @@ VK_KHR_swapchain 
    "{{$.Name}}",

    ProcHook::GLOBAL,

    ProcHook::EXTENSION_CORE,

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

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

    {{else}}

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

    {{end}}

    nullptr,

    nullptr,

  },
@@ -789,14 +783,7 @@ VK_KHR_swapchain 
      {{end}}

    {{else}}

      ProcHook::EXTENSION_CORE,



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

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

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

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

      {{else}}

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

      {{end}}

      nullptr,

      nullptr,

    {{end}}

vulkan/libvulkan/driver.cpp

+157 −5
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <stdlib.h>

#include <string.h>

#include <algorithm>

#include <array>

#include <new>

#include <malloc.h>

#include <sys/prctl.h>
@@ -47,6 +48,9 @@ namespace { 


class CreateInfoWrapper {

   public:

    CreateInfoWrapper(hwvulkan_device_t* hw_dev,

                      const VkInstanceCreateInfo& create_info,

                      const VkAllocationCallbacks& allocator);

    CreateInfoWrapper(VkPhysicalDevice physical_dev,

                      const VkDeviceCreateInfo& create_info,

                      const VkAllocationCallbacks& allocator);
@@ -57,6 +61,7 @@ class CreateInfoWrapper { 
    const std::bitset<ProcHook::EXTENSION_COUNT>& get_hook_extensions() const;

    const std::bitset<ProcHook::EXTENSION_COUNT>& get_hal_extensions() const;



    explicit operator const VkInstanceCreateInfo*() const;

    explicit operator const VkDeviceCreateInfo*() const;



   private:
@@ -98,6 +103,18 @@ class CreateInfoWrapper { 
    std::bitset<ProcHook::EXTENSION_COUNT> hal_extensions_;

};



CreateInfoWrapper::CreateInfoWrapper(hwvulkan_device_t* hw_dev,

                                     const VkInstanceCreateInfo& create_info,

                                     const VkAllocationCallbacks& allocator)

    : is_instance_(true),

      allocator_(allocator),

      hw_dev_(hw_dev),

      instance_info_(create_info),

      extension_filter_() {

    hook_extensions_.set(ProcHook::EXTENSION_CORE);

    hal_extensions_.set(ProcHook::EXTENSION_CORE);

}



CreateInfoWrapper::CreateInfoWrapper(VkPhysicalDevice physical_dev,

                                     const VkDeviceCreateInfo& create_info,

                                     const VkAllocationCallbacks& allocator)
@@ -135,6 +152,10 @@ CreateInfoWrapper::get_hal_extensions() const { 
    return hal_extensions_;

}



CreateInfoWrapper::operator const VkInstanceCreateInfo*() const {

    return &instance_info_;

}



CreateInfoWrapper::operator const VkDeviceCreateInfo*() const {

    return &dev_info_;

}
@@ -370,6 +391,22 @@ VKAPI_ATTR void DefaultFree(void*, void* ptr) { 
    free(ptr);

}



InstanceData* AllocateInstanceData(const VkAllocationCallbacks& allocator) {

    void* data_mem = allocator.pfnAllocation(

        allocator.pUserData, sizeof(InstanceData), alignof(InstanceData),

        VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);

    if (!data_mem)

        return nullptr;



    return new (data_mem) InstanceData(allocator);

}



void FreeInstanceData(InstanceData* data,

                      const VkAllocationCallbacks& allocator) {

    data->~InstanceData();

    allocator.pfnFree(allocator.pUserData, data);

}



DeviceData* AllocateDeviceData(const VkAllocationCallbacks& allocator) {

    void* data_mem = allocator.pfnAllocation(

        allocator.pUserData, sizeof(DeviceData), alignof(DeviceData),
@@ -413,11 +450,6 @@ bool OpenHAL() { 
        return false;

    }



    if (!InitLoader(device)) {

        device->common.close(&device->common);

        return false;

    }



    g_hwdevice = device;



    return true;
@@ -496,6 +528,42 @@ PFN_vkVoidFunction GetDeviceProcAddr(VkDevice device, const char* pName) { 
               : hook->disabled_proc;

}



VkResult EnumerateInstanceExtensionProperties(

    const char* pLayerName,

    uint32_t* pPropertyCount,

    VkExtensionProperties* pProperties) {

    static const std::array<VkExtensionProperties, 2> loader_extensions = {{

        // WSI extensions

        {VK_KHR_SURFACE_EXTENSION_NAME, VK_KHR_SURFACE_SPEC_VERSION},

        {VK_KHR_ANDROID_SURFACE_EXTENSION_NAME,

         VK_KHR_ANDROID_SURFACE_SPEC_VERSION},

    }};



    // enumerate our extensions first

    if (!pLayerName && pProperties) {

        uint32_t count = std::min(

            *pPropertyCount, static_cast<uint32_t>(loader_extensions.size()));



        std::copy_n(loader_extensions.begin(), count, pProperties);



        if (count < loader_extensions.size()) {

            *pPropertyCount = count;

            return VK_INCOMPLETE;

        }



        pProperties += count;

        *pPropertyCount -= count;

    }



    VkResult result = g_hwdevice->EnumerateInstanceExtensionProperties(

        pLayerName, pPropertyCount, pProperties);



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

        *pPropertyCount += loader_extensions.size();



    return result;

}



VkResult EnumerateDeviceExtensionProperties(

    VkPhysicalDevice physicalDevice,

    const char* pLayerName,
@@ -527,6 +595,75 @@ VkResult EnumerateDeviceExtensionProperties( 
    return result;

}



VkResult CreateInstance(const VkInstanceCreateInfo* pCreateInfo,

                        const VkAllocationCallbacks* pAllocator,

                        VkInstance* pInstance) {

    const VkAllocationCallbacks& data_allocator =

        (pAllocator) ? *pAllocator : GetDefaultAllocator();



    CreateInfoWrapper wrapper(g_hwdevice, *pCreateInfo, data_allocator);

    VkResult result = wrapper.validate();

    if (result != VK_SUCCESS)

        return result;



    InstanceData* data = AllocateInstanceData(data_allocator);

    if (!data)

        return VK_ERROR_OUT_OF_HOST_MEMORY;



    data->hook_extensions |= wrapper.get_hook_extensions();

    data->hal_extensions |= wrapper.get_hal_extensions();



    // call into the driver

    VkInstance instance;

    result = g_hwdevice->CreateInstance(

        static_cast<const VkInstanceCreateInfo*>(wrapper), pAllocator,

        &instance);

    if (result != VK_SUCCESS) {

        FreeInstanceData(data, data_allocator);

        return result;

    }



    // initialize InstanceDriverTable

    if (!SetData(instance, *data) ||

        !InitDriverTable(instance, g_hwdevice->GetInstanceProcAddr)) {

        data->driver.DestroyInstance = reinterpret_cast<PFN_vkDestroyInstance>(

            g_hwdevice->GetInstanceProcAddr(instance, "vkDestroyInstance"));

        if (data->driver.DestroyInstance)

            data->driver.DestroyInstance(instance, pAllocator);



        FreeInstanceData(data, data_allocator);



        return VK_ERROR_INCOMPATIBLE_DRIVER;

    }



    data->get_device_proc_addr = reinterpret_cast<PFN_vkGetDeviceProcAddr>(

        g_hwdevice->GetInstanceProcAddr(instance, "vkGetDeviceProcAddr"));

    if (!data->get_device_proc_addr) {

        data->driver.DestroyInstance(instance, pAllocator);

        FreeInstanceData(data, data_allocator);



        return VK_ERROR_INCOMPATIBLE_DRIVER;

    }



    *pInstance = instance;



    return VK_SUCCESS;

}



void DestroyInstance(VkInstance instance,

                     const VkAllocationCallbacks* pAllocator) {

    InstanceData& data = GetData(instance);

    data.driver.DestroyInstance(instance, pAllocator);



    VkAllocationCallbacks local_allocator;

    if (!pAllocator) {

        local_allocator = data.allocator;

        pAllocator = &local_allocator;

    }



    FreeInstanceData(&data, *pAllocator);

}



VkResult CreateDevice(VkPhysicalDevice physicalDevice,

                      const VkDeviceCreateInfo* pCreateInfo,

                      const VkAllocationCallbacks* pAllocator,
@@ -588,6 +725,21 @@ void DestroyDevice(VkDevice device, const VkAllocationCallbacks* pAllocator) { 
    FreeDeviceData(&data, *pAllocator);

}



VkResult EnumeratePhysicalDevices(VkInstance instance,

                                  uint32_t* pPhysicalDeviceCount,

                                  VkPhysicalDevice* pPhysicalDevices) {

    const auto& data = GetData(instance);



    VkResult result = data.driver.EnumeratePhysicalDevices(

        instance, pPhysicalDeviceCount, pPhysicalDevices);

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

        for (uint32_t i = 0; i < *pPhysicalDeviceCount; i++)

            SetData(pPhysicalDevices[i], data);

    }



    return result;

}



void GetDeviceQueue(VkDevice device,

                    uint32_t queueFamilyIndex,

                    uint32_t queueIndex,

vulkan/libvulkan/driver.h

+6 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


#include "api_gen.h"

#include "driver_gen.h"

#include "debug_report.h"



namespace vulkan {
@@ -81,6 +82,8 @@ struct InstanceData { 


    InstanceDriverTable driver;

    PFN_vkGetDeviceProcAddr get_device_proc_addr;



    DebugReportCallbackList debug_report_callbacks;

};



struct DeviceData {
@@ -111,9 +114,12 @@ VKAPI_ATTR VkResult EnumerateInstanceExtensionProperties(const char* pLayerName, 


VKAPI_ATTR VkResult EnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char* pLayerName, uint32_t* pPropertyCount, VkExtensionProperties* pProperties);



VKAPI_ATTR VkResult CreateInstance(const VkInstanceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkInstance* pInstance);

VKAPI_ATTR void DestroyInstance(VkInstance instance, const VkAllocationCallbacks* pAllocator);

VKAPI_ATTR VkResult CreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDevice* pDevice);

VKAPI_ATTR void DestroyDevice(VkDevice device, const VkAllocationCallbacks* pAllocator);



VKAPI_ATTR VkResult EnumeratePhysicalDevices(VkInstance instance, uint32_t* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices);

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

VKAPI_ATTR VkResult AllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo* pAllocateInfo, VkCommandBuffer* pCommandBuffers);

// clang-format on

vulkan/libvulkan/driver_gen.cpp

+3 −3
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ const ProcHook g_proc_hooks[] = { 
        "vkCreateInstance",

        ProcHook::GLOBAL,

        ProcHook::EXTENSION_CORE,

        reinterpret_cast<PFN_vkVoidFunction>(CreateInstance_Bottom),

        reinterpret_cast<PFN_vkVoidFunction>(CreateInstance),

        nullptr,

        nullptr,

    },
@@ -212,7 +212,7 @@ const ProcHook g_proc_hooks[] = { 
        "vkDestroyInstance",

        ProcHook::INSTANCE,

        ProcHook::EXTENSION_CORE,

        reinterpret_cast<PFN_vkVoidFunction>(DestroyInstance_Bottom),

        reinterpret_cast<PFN_vkVoidFunction>(DestroyInstance),

        nullptr,

        nullptr,

    },
@@ -252,7 +252,7 @@ const ProcHook g_proc_hooks[] = { 
        "vkEnumeratePhysicalDevices",

        ProcHook::INSTANCE,

        ProcHook::EXTENSION_CORE,

        reinterpret_cast<PFN_vkVoidFunction>(EnumeratePhysicalDevices_Bottom),

        reinterpret_cast<PFN_vkVoidFunction>(EnumeratePhysicalDevices),

        nullptr,

        nullptr,

    },

vulkan/libvulkan/loader.cpp

+2 −497

File changed.

Preview size limit exceeded, changes collapsed.