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

Commit b467c0d6 authored by Michael Lentine's avatar Michael Lentine Committed by Jesse Hall
Browse files

Add support for arbitrary number of layers 

Add a static string in vulkan_layer_path that is set by the loader.
This path is then searched inside the loader for layers to load.

Change-Id: Ibd6fa87579d6fd39bba0814935be2bd38a416848
(cherry picked from commit 1dd0ae574084204bbbb614e551125ee84dc5cf3d)
parent 950bb4fb

vulkan/libvulkan/loader.cpp

+33 −20
Original line number Diff line number Diff line
@@ -313,6 +313,24 @@ PFN_vkVoidFunction GetLayerDeviceProcAddr(VkDevice device, const char* name) { 
    return loader_device->GetDeviceProcAddr(device, name);

}



struct InstanceLayersPair {

    Instance* instance;

    UnorderedMap<String, SharedLibraryHandle>* layers;

};



void LoadLayerFromProperty(const char* name, const char* value, void* data) {

    auto instance_layers_pair = static_cast<InstanceLayersPair*>(data);

    const char prefix[] = "debug.vulkan.layer.";

    const size_t prefixlen = sizeof(prefix) - 1;

    if (value[0] == '\0' || strncmp(name, prefix, prefixlen) != 0)

        return;

    String layer_name_str(

        name + prefixlen,

        CallbackAllocator<char>(instance_layers_pair->instance->alloc));

    LoadLayer(instance_layers_pair->instance, layer_name_str,

              (*instance_layers_pair->layers)[layer_name_str]);

}



// -----------------------------------------------------------------------------

// "Bottom" functions. These are called at the end of the instance dispatch

// chain.
@@ -722,19 +740,11 @@ VkResult CreateInstance(const VkInstanceCreateInfo* create_info, 
    // Load layers

    {

        char layer_prop[PROPERTY_VALUE_MAX];

        property_get("vulkan.layers", layer_prop, "");

        // TODO: Find a way to enable a large number but not all of the layers

        size_t length = strlen(layer_prop);

        if (length == 1 && layer_prop[0] == '+') {

            for (auto& layer : layers) {

                LoadLayer(instance, layer.first, layer.second);

            }

        } else {

        property_get("debug.vulkan.layers", layer_prop, "");

        String layer_name(string_allocator);

        String layer_prop_str(layer_prop, string_allocator);

        size_t end, start = 0;

            while ((end = layer_prop_str.find(':', start)) !=

                   std::string::npos) {

        while ((end = layer_prop_str.find(':', start)) != std::string::npos) {

            layer_name = layer_prop_str.substr(start, end - start);

            auto element = layers.find(layer_name);

            if (element != layers.end()) {
@@ -743,7 +753,10 @@ VkResult CreateInstance(const VkInstanceCreateInfo* create_info, 
            }

            start = end + 1;

        }

        }

        InstanceLayersPair instance_layers_pair = {.instance = instance,

                                                   .layers = &layers};

        property_list(LoadLayerFromProperty,

                      static_cast<void*>(&instance_layers_pair));

    }

    for (uint32_t i = 0; i < create_info->layerCount; ++i) {

        String layer_name(create_info->ppEnabledLayerNames[i],