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

Commit c4edc50a authored by Chris Forbes's avatar Chris Forbes Committed by android-build-merger
Browse files

Merge "libvulkan: Enable GSC2 and SPI extensions" into oc-dev 

am: d69b9d0e

Change-Id: Ibf936d0fe5f3584a198623ecf669522b63aebd06
parents 941af0bd d69b9d0e

vulkan/libvulkan/driver.cpp

+9 −18
Original line number Original line Diff line number Diff line
@@ -39,9 +39,6 @@ extern "C" { 
android_namespace_t* android_get_exported_namespace(const char*);

android_namespace_t* android_get_exported_namespace(const char*);

}

}





// Set to true to enable exposing unratified extensions for development

static const bool kEnableUnratifiedExtensions = false;



// #define ENABLE_ALLOC_CALLSTACKS 1

// #define ENABLE_ALLOC_CALLSTACKS 1

#if ENABLE_ALLOC_CALLSTACKS

#if ENABLE_ALLOC_CALLSTACKS

#include <utils/CallStack.h>

#include <utils/CallStack.h>
@@ -717,12 +714,9 @@ VkResult EnumerateInstanceExtensionProperties( 
    loader_extensions.push_back({

    loader_extensions.push_back({

        VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME,

        VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME,

        VK_EXT_SWAPCHAIN_COLOR_SPACE_SPEC_VERSION});

        VK_EXT_SWAPCHAIN_COLOR_SPACE_SPEC_VERSION});



    if (kEnableUnratifiedExtensions) {

    loader_extensions.push_back({

    loader_extensions.push_back({

        VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME,

        VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME,

        VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION});

        VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION});

    }





    static const VkExtensionProperties loader_debug_report_extension = {

    static const VkExtensionProperties loader_debug_report_extension = {

        VK_EXT_DEBUG_REPORT_EXTENSION_NAME, VK_EXT_DEBUG_REPORT_SPEC_VERSION,

        VK_EXT_DEBUG_REPORT_EXTENSION_NAME, VK_EXT_DEBUG_REPORT_SPEC_VERSION,
@@ -818,8 +812,6 @@ VkResult EnumerateDeviceExtensionProperties( 
        VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME,

        VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME,

        VK_KHR_INCREMENTAL_PRESENT_SPEC_VERSION});

        VK_KHR_INCREMENTAL_PRESENT_SPEC_VERSION});





    if (kEnableUnratifiedExtensions) {

        // conditionally add shared_presentable_image if supportable

    VkPhysicalDevicePresentationPropertiesANDROID presentation_properties;

    VkPhysicalDevicePresentationPropertiesANDROID presentation_properties;

    if (QueryPresentationProperties(physicalDevice, &presentation_properties) &&

    if (QueryPresentationProperties(physicalDevice, &presentation_properties) &&

        presentation_properties.sharedImage) {

        presentation_properties.sharedImage) {
@@ -827,7 +819,6 @@ VkResult EnumerateDeviceExtensionProperties( 
            VK_KHR_SHARED_PRESENTABLE_IMAGE_EXTENSION_NAME,

            VK_KHR_SHARED_PRESENTABLE_IMAGE_EXTENSION_NAME,

            VK_KHR_SHARED_PRESENTABLE_IMAGE_SPEC_VERSION});

            VK_KHR_SHARED_PRESENTABLE_IMAGE_SPEC_VERSION});

    }

    }

    }





    // conditionally add VK_GOOGLE_display_timing if present timestamps are

    // conditionally add VK_GOOGLE_display_timing if present timestamps are

    // supported by the driver:

    // supported by the driver: