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

Commit 4d1ad47a authored by Ian Elliott's avatar Ian Elliott
Browse files

Revert "swapchain: Implement VK_KHR_surface_protected_capabilities" 

In order to help the automerger get this everywhere, am reverting it
here, and then will land it in AOSP master (which will automerge here
again).

This reverts commit a9e06fd4.

Test: Manual Inspection
Bug: 221490496
Change-Id: I21dcc2ab87d34b2366d32d06b910c88400c5f70d
parent 75df6ff4

vulkan/libvulkan/driver.cpp

+1 −7
Original line number Original line Diff line number Diff line
@@ -632,7 +632,6 @@ void CreateInfoWrapper::FilterExtension(const char* name) { 
        switch (ext_bit) {

        switch (ext_bit) {

            case ProcHook::KHR_android_surface:

            case ProcHook::KHR_android_surface:

            case ProcHook::KHR_surface:

            case ProcHook::KHR_surface:

            case ProcHook::KHR_surface_protected_capabilities:

            case ProcHook::EXT_swapchain_colorspace:

            case ProcHook::EXT_swapchain_colorspace:

            case ProcHook::KHR_get_surface_capabilities2:

            case ProcHook::KHR_get_surface_capabilities2:

            case ProcHook::GOOGLE_surfaceless_query:

            case ProcHook::GOOGLE_surfaceless_query:
@@ -712,7 +711,6 @@ void CreateInfoWrapper::FilterExtension(const char* name) { 
            case ProcHook::KHR_external_fence_capabilities:

            case ProcHook::KHR_external_fence_capabilities:

            case ProcHook::KHR_get_surface_capabilities2:

            case ProcHook::KHR_get_surface_capabilities2:

            case ProcHook::KHR_surface:

            case ProcHook::KHR_surface:

            case ProcHook::KHR_surface_protected_capabilities:

            case ProcHook::EXT_debug_report:

            case ProcHook::EXT_debug_report:

            case ProcHook::EXT_swapchain_colorspace:

            case ProcHook::EXT_swapchain_colorspace:

            case ProcHook::GOOGLE_surfaceless_query:

            case ProcHook::GOOGLE_surfaceless_query:
@@ -924,12 +922,8 @@ VkResult EnumerateInstanceExtensionProperties( 
    uint32_t* pPropertyCount,

    uint32_t* pPropertyCount,

    VkExtensionProperties* pProperties) {

    VkExtensionProperties* pProperties) {

    std::vector<VkExtensionProperties> loader_extensions;

    std::vector<VkExtensionProperties> loader_extensions;

    loader_extensions.push_back({

        VK_KHR_SURFACE_EXTENSION_NAME,

        VK_KHR_SURFACE_SPEC_VERSION});

    loader_extensions.push_back(

    loader_extensions.push_back(

        {VK_KHR_SURFACE_PROTECTED_CAPABILITIES_EXTENSION_NAME,

        {VK_KHR_SURFACE_EXTENSION_NAME, VK_KHR_SURFACE_SPEC_VERSION});

         VK_KHR_SURFACE_PROTECTED_CAPABILITIES_SPEC_VERSION});

    loader_extensions.push_back({

    loader_extensions.push_back({

        VK_KHR_ANDROID_SURFACE_EXTENSION_NAME,

        VK_KHR_ANDROID_SURFACE_EXTENSION_NAME,

        VK_KHR_ANDROID_SURFACE_SPEC_VERSION});

        VK_KHR_ANDROID_SURFACE_SPEC_VERSION});

vulkan/libvulkan/driver_gen.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -571,7 +571,6 @@ ProcHook::Extension GetProcHookExtension(const char* name) { 
    if (strcmp(name, "VK_KHR_incremental_present") == 0) return ProcHook::KHR_incremental_present;

    if (strcmp(name, "VK_KHR_incremental_present") == 0) return ProcHook::KHR_incremental_present;

    if (strcmp(name, "VK_KHR_shared_presentable_image") == 0) return ProcHook::KHR_shared_presentable_image;

    if (strcmp(name, "VK_KHR_shared_presentable_image") == 0) return ProcHook::KHR_shared_presentable_image;

    if (strcmp(name, "VK_KHR_surface") == 0) return ProcHook::KHR_surface;

    if (strcmp(name, "VK_KHR_surface") == 0) return ProcHook::KHR_surface;

    if (strcmp(name, "VK_KHR_surface_protected_capabilities") == 0) return ProcHook::KHR_surface_protected_capabilities;

    if (strcmp(name, "VK_KHR_swapchain") == 0) return ProcHook::KHR_swapchain;

    if (strcmp(name, "VK_KHR_swapchain") == 0) return ProcHook::KHR_swapchain;

    if (strcmp(name, "VK_ANDROID_external_memory_android_hardware_buffer") == 0) return ProcHook::ANDROID_external_memory_android_hardware_buffer;

    if (strcmp(name, "VK_ANDROID_external_memory_android_hardware_buffer") == 0) return ProcHook::ANDROID_external_memory_android_hardware_buffer;

    if (strcmp(name, "VK_KHR_bind_memory2") == 0) return ProcHook::KHR_bind_memory2;

    if (strcmp(name, "VK_KHR_bind_memory2") == 0) return ProcHook::KHR_bind_memory2;

vulkan/libvulkan/driver_gen.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,6 @@ struct ProcHook { 
        KHR_incremental_present,

        KHR_incremental_present,

        KHR_shared_presentable_image,

        KHR_shared_presentable_image,

        KHR_surface,

        KHR_surface,

        KHR_surface_protected_capabilities,

        KHR_swapchain,

        KHR_swapchain,

        ANDROID_external_memory_android_hardware_buffer,

        ANDROID_external_memory_android_hardware_buffer,

        KHR_bind_memory2,

        KHR_bind_memory2,

vulkan/libvulkan/swapchain.cpp

+0 −6
Original line number Original line Diff line number Diff line
@@ -865,12 +865,6 @@ VkResult GetPhysicalDeviceSurfaceCapabilities2KHR( 
                        .supportedUsageFlags;

                        .supportedUsageFlags;

            } break;

            } break;





            case VK_STRUCTURE_TYPE_SURFACE_PROTECTED_CAPABILITIES_KHR: {

                VkSurfaceProtectedCapabilitiesKHR* protected_caps =

                    reinterpret_cast<VkSurfaceProtectedCapabilitiesKHR*>(caps);

                protected_caps->supportsProtected = VK_TRUE;

            } break;



            default:

            default:

                // Ignore all other extension structs

                // Ignore all other extension structs

                break;

                break;

vulkan/scripts/driver_generator.py

+0 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,6 @@ _INTERCEPTED_EXTENSIONS = [ 
    'VK_KHR_incremental_present',

    'VK_KHR_incremental_present',

    'VK_KHR_shared_presentable_image',

    'VK_KHR_shared_presentable_image',

    'VK_KHR_surface',

    'VK_KHR_surface',

    'VK_KHR_surface_protected_capabilities',

    'VK_KHR_swapchain',

    'VK_KHR_swapchain',

]

]