Add Xlib support to viewer

src/gpu/vk/GrVkBackendContext.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "vk/GrVkBackendContext.h"
 #include "vk/GrVkExtensions.h"
 #include "vk/GrVkInterface.h"
@@ skipping 22 matching lines @@
 
 // the minimum version of Vulkan supported
 #ifdef SK_BUILD_FOR_ANDROID
 const uint32_t kGrVkMinimumVersion = VK_MAKE_VERSION(1, 0, 3);
 #else
 const uint32_t kGrVkMinimumVersion = VK_MAKE_VERSION(1, 0, 8);
 #endif
 
 // Create the base Vulkan objects needed by the GrVkGpu object
 const GrVkBackendContext* GrVkBackendContext::Create(uint32_t* presentQueueIndexPtr,
-                             bool(*canPresent)(VkInstance, VkPhysicalDevice, uint32_t queueIndex)) {
+                             bool(*canPresent)(VkInstance, VkPhysicalDevice, uint32_t queueIndex,
+                                               void* platformData),
+                             void* platformData) {
     VkPhysicalDevice physDev;
     VkDevice device;
     VkInstance inst;
     VkResult err;
 
     const VkApplicationInfo app_info = {
         VK_STRUCTURE_TYPE_APPLICATION_INFO, // sType
         nullptr,                            // pNext
         "vktest",                           // pApplicationName
         0,                                  // applicationVersion
@@ skipping 30 matching lines @@
     }
 #ifdef SK_BUILD_FOR_WIN
     if (extensions.hasInstanceExtension(VK_KHR_WIN32_SURFACE_EXTENSION_NAME)) {
         instanceExtensionNames.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME);
         extensionFlags |= kKHR_win32_surface_GrVkExtensionFlag;
     }
 #elif SK_BUILD_FOR_ANDROID
     if (extensions.hasInstanceExtension(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME)) {
         instanceExtensionNames.push_back(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME);
         extensionFlags |= kKHR_android_surface_GrVkExtensionFlag;
-}
+    }
 #elif SK_BUILD_FOR_UNIX
-    if (extensions.hasInstanceExtension(VK_KHR_XLIB_SURFACE_EXTENSION_NAME)) {
-        instanceExtensionNames.push_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME);
-        extensionFlags |= kKHR_xlib_surface_GrVkExtensionFlag;
+    if (extensions.hasInstanceExtension(VK_KHR_XCB_SURFACE_EXTENSION_NAME)) {
+        instanceExtensionNames.push_back(VK_KHR_XCB_SURFACE_EXTENSION_NAME);
+        extensionFlags |= kKHR_xcb_surface_GrVkExtensionFlag;
     }
 #endif
 
     const VkInstanceCreateInfo instance_create = {
         VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,    // sType
         nullptr,                                   // pNext
         0,                                         // flags
         &app_info,                                 // pApplicationInfo
         (uint32_t) instanceLayerNames.count(),     // enabledLayerNameCount
         instanceLayerNames.begin(),                // ppEnabledLayerNames
@@ skipping 43 matching lines @@
             graphicsQueueIndex = i;
             break;
         }
     }
     SkASSERT(graphicsQueueIndex < queueCount);
 
     // iterate to find the present queue, if needed
     uint32_t presentQueueIndex = graphicsQueueIndex;
     if (presentQueueIndexPtr && canPresent) {
         for (uint32_t i = 0; i < queueCount; i++) {
-            if (canPresent(inst, physDev, i)) {
+            if (canPresent(inst, physDev, i, platformData)) {
                 presentQueueIndex = i;
                 break;
             }
         }
         SkASSERT(presentQueueIndex < queueCount);
         *presentQueueIndexPtr = presentQueueIndex;
     }
 
     extensions.initDevice(kGrVkMinimumVersion, inst, physDev);
 
@@ skipping 93 matching lines @@
     return ctx;
 }
 
 GrVkBackendContext::~GrVkBackendContext() {
     vkDeviceWaitIdle(fDevice);
     vkDestroyDevice(fDevice, nullptr);
     fDevice = VK_NULL_HANDLE;
     vkDestroyInstance(fInstance, nullptr);
     fInstance = VK_NULL_HANDLE;
 }