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

Commit 30ac78b4 authored by Jesse Hall's avatar Jesse Hall
Browse files

vulkan: Fix 64-bit compilation errors 

Change-Id: I5f76ae6bb517d39c3461e95421444121a093b7da
(cherry picked from commit 9f434d3bbe473d93c7801f2f618ae02aa2318950)
parent 275d76c8

vulkan/libvulkan/layers_extensions.cpp

+4 −4
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ void* GetLayerGetProcAddr(const Layer& layer, 
                          size_t gpa_name_len) {

    const LayerLibrary& library = g_layer_libraries[layer.library_idx];

    void* gpa;

    size_t layer_name_len = std::max(2u, strlen(layer.properties.layerName));

    size_t layer_name_len = std::max(size_t{2}, strlen(layer.properties.layerName));

    char* name = static_cast<char*>(alloca(layer_name_len + gpa_name_len + 1));

    strcpy(name, layer.properties.layerName);

    strcpy(name + layer_name_len, gpa_name);
@@ -199,11 +199,11 @@ void DiscoverLayers() { 
}



uint32_t EnumerateLayers(uint32_t count, VkLayerProperties* properties) {

    uint32_t n = std::min(count, g_layers.size());

    uint32_t n = std::min(count, static_cast<uint32_t>(g_layers.size()));

    for (uint32_t i = 0; i < n; i++) {

        properties[i] = g_layers[i].properties;

    }

    return g_layers.size();

    return static_cast<uint32_t>(g_layers.size());

}



void GetLayerExtensions(const char* name,
@@ -213,7 +213,7 @@ void GetLayerExtensions(const char* name, 
        if (strcmp(name, layer.properties.layerName) != 0)

            continue;

        *properties = layer.extensions.data();

        *count = layer.extensions.size();

        *count = static_cast<uint32_t>(layer.extensions.size());

    }

}

vulkan/tools/vkinfo.cpp

+4 −4
Original line number Diff line number Diff line
@@ -287,11 +287,11 @@ void PrintGpuInfo(const GpuInfo& info) { 
        strbuf.str(std::string());



        if (!info.extensions.empty()) {

            printf("    Extensions [%u]:\n", info.extensions.size());

            printf("    Extensions [%zu]:\n", info.extensions.size());

            PrintExtensions(info.extensions, "    ");

        }

        if (!info.layers.empty()) {

            printf("    Layers [%u]:\n", info.layers.size());

            printf("    Layers [%zu]:\n", info.layers.size());

            for (size_t i = 0; i < info.layers.size(); i++) {

                const auto& layer = info.layers[i];

                printf("    - %s %u.%u.%u/%u \"%s\"\n", layer.layerName,
@@ -312,10 +312,10 @@ void PrintGpuInfo(const GpuInfo& info) { 
void PrintInfo(const VulkanInfo& info) {

    std::ostringstream strbuf;



    printf("Instance Extensions [%u]:\n", info.extensions.size());

    printf("Instance Extensions [%zu]:\n", info.extensions.size());

    PrintExtensions(info.extensions, "  ");

    if (!info.layers.empty()) {

        printf("Instance Layers [%u]:\n", info.layers.size());

        printf("Instance Layers [%zu]:\n", info.layers.size());

        for (size_t i = 0; i < info.layers.size(); i++) {

            const auto& layer = info.layers[i];

            printf("  - %s %u.%u.%u/%u \"%s\"\n", layer.layerName,