Revise WSI setup.

src/gpu/vk/GrVkInterface.cpp

Index: src/gpu/vk/GrVkInterface.cpp
diff --git a/src/gpu/vk/GrVkInterface.cpp b/src/gpu/vk/GrVkInterface.cpp
index 37e3570e48acf3853e7235269859bb3a272afbd0..17b254eb6aa7bc5122114e9b38e070ea153c282a 100644
--- a/src/gpu/vk/GrVkInterface.cpp
+++ b/src/gpu/vk/GrVkInterface.cpp
@@ -157,45 +157,6 @@ const GrVkInterface* GrVkCreateInterface(VkInstance instance, VkDevice device,
     GET_DEV_PROC(CmdNextSubpass);
     GET_DEV_PROC(CmdEndRenderPass);
     GET_DEV_PROC(CmdExecuteCommands);
-    if (extensionFlags & kKHR_surface_GrVkExtensionFlag) {
-        GET_PROC(DestroySurfaceKHR);
-        GET_PROC(GetPhysicalDeviceSurfaceSupportKHR);
-        GET_PROC(GetPhysicalDeviceSurfaceCapabilitiesKHR);
-        GET_PROC(GetPhysicalDeviceSurfaceFormatsKHR);
-        GET_PROC(GetPhysicalDeviceSurfacePresentModesKHR);
-    }
-    if (extensionFlags & kKHR_surface_GrVkExtensionFlag) {
-        GET_DEV_PROC(CreateSwapchainKHR);
-        GET_DEV_PROC(DestroySwapchainKHR);
-        GET_DEV_PROC(GetSwapchainImagesKHR);
-        GET_DEV_PROC(AcquireNextImageKHR);
-        GET_DEV_PROC(QueuePresentKHR);
-    }
-#if defined(VK_USE_PLATFORM_WIN32_KHR)
-    if (extensionFlags & kKHR_win32_surface_GrVkExtensionFlag) {
-        GET_PROC(CreateWin32SurfaceKHR);
-        GET_PROC(GetPhysicalDeviceWin32PresentationSupportKHR);
-    }
-#elif defined(VK_USE_PLATFORM_ANDROID_KHR)
-    if (extensionFlags & kKHR_android_surface_GrVkExtensionFlag) {
-        GET_PROC(CreateAndroidSurfaceKHR);
-    }
-#elif defined(VK_USE_PLATFORM_XLIB_KHR)
-    if (extensionFlags & kKHR_xlib_surface_GrVkExtensionFlag) {
-        GET_PROC(CreateXlibSurfaceKHR);
-        GET_PROC(GetPhysicalDeviceXlibPresentationSupportKHR);
-    }
-#endif
-
-    // We probably don't care about these, they're for consoles
-    //GET_PROC(GetPhysicalDeviceDisplayPropertiesKHR);
-    //GET_PROC(GetPhysicalDeviceDisplayPlanePropertiesKHR);
-    //GET_PROC(GetDisplayPlaneSupportedDisplaysKHR);
-    //GET_PROC(GetDisplayModePropertiesKHR);
-    //GET_PROC(CreateDisplayModeKHR);
-    //GET_PROC(GetDisplayPlaneCapabilitiesKHR);
-    //GET_PROC(CreateDisplayPlaneSurfaceKHR);
-    //GET_DEV_PROC(CreateSharedSwapchainsKHR);
 
     if (extensionFlags & kEXT_debug_report_GrVkExtensionFlag) {
         GET_PROC(CreateDebugReportCallbackEXT);
@@ -347,24 +308,6 @@ bool GrVkInterface::validate() const {
         NULL == fFunctions.fCmdNextSubpass ||
         NULL == fFunctions.fCmdEndRenderPass ||
         NULL == fFunctions.fCmdExecuteCommands ||
-        NULL == fFunctions.fDestroySurfaceKHR ||
-        NULL == fFunctions.fGetPhysicalDeviceSurfaceSupportKHR ||
-        NULL == fFunctions.fGetPhysicalDeviceSurfaceCapabilitiesKHR ||
-        NULL == fFunctions.fGetPhysicalDeviceSurfaceFormatsKHR ||
-        NULL == fFunctions.fGetPhysicalDeviceSurfacePresentModesKHR ||
-        NULL == fFunctions.fCreateSwapchainKHR ||
-        NULL == fFunctions.fDestroySwapchainKHR ||
-        NULL == fFunctions.fGetSwapchainImagesKHR ||
-        NULL == fFunctions.fAcquireNextImageKHR ||
-        NULL == fFunctions.fQueuePresentKHR ||
-        //NULL == fFunctions.fGetPhysicalDeviceDisplayPropertiesKHR ||
-        //NULL == fFunctions.fGetPhysicalDeviceDisplayPlanePropertiesKHR ||
-        //NULL == fFunctions.fGetDisplayPlaneSupportedDisplaysKHR ||
-        //NULL == fFunctions.fGetDisplayModePropertiesKHR ||
-        //NULL == fFunctions.fCreateDisplayModeKHR ||
-        //NULL == fFunctions.fGetDisplayPlaneCapabilitiesKHR ||
-        //NULL == fFunctions.fCreateDisplayPlaneSurfaceKHR ||
-        //NULL == fFunctions.fCreateSharedSwapchainsKHR ||
         NULL == fFunctions.fCreateDebugReportCallbackEXT ||
         NULL == fFunctions.fDebugReportMessageEXT ||
         NULL == fFunctions.fDestroyDebugReportCallbackEXT) {