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

Commit 1609500c authored by Chris Forbes's avatar Chris Forbes
Browse files

libvulkan: Enable GSC2 and SPI extensions 

These two extensions have now been ratified, so we can expose them.

Test: build, matching CTS change pending
Change-Id: I8194f31dcddc8b85b184c64135a3966ce1f83aac
Bug: b/38042483
parent 0e04fe47

vulkan/libvulkan/driver.cpp

+9 −18
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@ extern "C" { 
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

#if ENABLE_ALLOC_CALLSTACKS

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

        VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME,

        VK_EXT_SWAPCHAIN_COLOR_SPACE_SPEC_VERSION});



    if (kEnableUnratifiedExtensions) {

    loader_extensions.push_back({

        VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME,

        VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION});

    }



    static const VkExtensionProperties loader_debug_report_extension = {

        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_SPEC_VERSION});



    if (kEnableUnratifiedExtensions) {

        // conditionally add shared_presentable_image if supportable

    VkPhysicalDevicePresentationPropertiesANDROID presentation_properties;

    if (QueryPresentationProperties(physicalDevice, &presentation_properties) &&

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

            VK_KHR_SHARED_PRESENTABLE_IMAGE_SPEC_VERSION});

    }

    }



    // conditionally add VK_GOOGLE_display_timing if present timestamps are

    // supported by the driver: