commit e7f036c24c2814bd18cb2ff892428c21bf45ec18
author Ian Elliott <ianelliott@google.com> Tue Mar 15 16:49:21 2022 -0600
committer Ian Elliott <ianelliott@google.com> Tue Mar 15 16:49:21 2022 -0600
tree a47ad0dc314cb466482e60c3391ed96e572cf3a2
parent e8361aefe96e06097534bb276c08fbc6e9c0fdfe

Revert "swapchain: Implement VK_GOOGLE_surfaceless_query"

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 8e0f12163f90a1a511625ba1f290de95777beb86.

Test: Manual inspection
Bug: 203826952
Change-Id: I227993c87b1601b8dc0d1cf4bb008d5af9abc930

vulkan/libvulkan/driver.cpp

diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp
index 8cb1b21..6e54d6c 100644
--- a/vulkan/libvulkan/driver.cpp
+++ b/vulkan/libvulkan/driver.cpp
@@ -634,7 +634,6 @@
             case ProcHook::KHR_surface:
             case ProcHook::EXT_swapchain_colorspace:
             case ProcHook::KHR_get_surface_capabilities2:
-            case ProcHook::GOOGLE_surfaceless_query:
                 hook_extensions_.set(ext_bit);
                 // return now as these extensions do not require HAL support
                 return;
@@ -713,7 +712,6 @@
             case ProcHook::KHR_surface:
             case ProcHook::EXT_debug_report:
             case ProcHook::EXT_swapchain_colorspace:
-            case ProcHook::GOOGLE_surfaceless_query:
             case ProcHook::ANDROID_native_buffer:
             case ProcHook::EXTENSION_CORE_1_0:
             case ProcHook::EXTENSION_CORE_1_1:
@@ -930,11 +928,9 @@
     loader_extensions.push_back({
         VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME,
         VK_EXT_SWAPCHAIN_COLOR_SPACE_SPEC_VERSION});
-    loader_extensions.push_back({
-        VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME,
-        VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION});
-    loader_extensions.push_back({VK_GOOGLE_SURFACELESS_QUERY_EXTENSION_NAME,
-                                 VK_GOOGLE_SURFACELESS_QUERY_SPEC_VERSION});
+    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,