Add WSI functions to GrVkInterface

include/gpu/vk/GrVkInterface.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-#ifndef GrRadInterface_DEFINED
-#define GrRadInterface_DEFINED
+#ifndef GrVkInterface_DEFINED
+#define GrVkInterface_DEFINED
 
 #include "SkRefCnt.h"
 
-#include "vulkan/vulkan.h"
+#include "vk/GrVkDefines.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
- * The default interface is returned by GrVkDefaultInterface. This function's
+ * The default interface is returned by GrVkCreateInterface. This function's
  * implementation is platform-specific.
  */
 
 struct GrVkInterface;
 
 /**
  * Creates a GrVkInterface.
  */
 const GrVkInterface* GrVkCreateInterface(VkInstance instance, VkDevice device,
                                          uint32_t extensionFlags);
@@ skipping 164 matching lines @@
         VkPtr<PFN_vkCmdPushConstants> fCmdPushConstants;
         VkPtr<PFN_vkCmdBeginRenderPass> fCmdBeginRenderPass;
         VkPtr<PFN_vkCmdNextSubpass> fCmdNextSubpass;
         VkPtr<PFN_vkCmdEndRenderPass> fCmdEndRenderPass;
         VkPtr<PFN_vkCmdExecuteCommands> fCmdExecuteCommands;
         VkPtr<PFN_vkDestroySurfaceKHR> fDestroySurfaceKHR;
         VkPtr<PFN_vkGetPhysicalDeviceSurfaceSupportKHR> fGetPhysicalDeviceSurfaceSupportKHR;
         VkPtr<PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR> fGetPhysicalDeviceSurfaceCapabilitiesKHR;
         VkPtr<PFN_vkGetPhysicalDeviceSurfaceFormatsKHR> fGetPhysicalDeviceSurfaceFormatsKHR;
         VkPtr<PFN_vkGetPhysicalDeviceSurfacePresentModesKHR> fGetPhysicalDeviceSurfacePresentModesKHR;
+#if defined(VK_USE_PLATFORM_WIN32_KHR)

[bsalomon, 2016/03/28 13:05:47]

Will these be used in Ganesh proper or just in the OSWindow code? Wondering if
we should create a different interface for WSI that lives with that code. 

[jvanverth1, 2016/03/28 13:35:38]

Sure, I could do that when I get the windowing going. I was just trying to avoid
code duplication.

+        VkPtr<PFN_vkCreateWin32SurfaceKHR> fCreateWin32SurfaceKHR;
+        VkPtr<PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR> fGetPhysicalDeviceWin32PresentationSupportKHR;
+#elif defined(VK_USE_PLATFORM_ANDROID_KHR)
+        VkPtr<PFN_vkCreateAndroidSurfaceKHR> fCreateAndroidSurfaceKHR;
+#elif defined(VK_USE_PLATFORM_XLIB_KHR)
+        VkPtr<PFN_vkCreateXlibSurfaceKHR> fCreateXlibSurfaceKHR;
+        VkPtr<PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR> fGetPhysicalDeviceXlibPresentationSupportKHR;
+#endif
         VkPtr<PFN_vkCreateSwapchainKHR> fCreateSwapchainKHR;
         VkPtr<PFN_vkDestroySwapchainKHR> fDestroySwapchainKHR;
         VkPtr<PFN_vkGetSwapchainImagesKHR> fGetSwapchainImagesKHR;
         VkPtr<PFN_vkAcquireNextImageKHR> fAcquireNextImageKHR;
         VkPtr<PFN_vkQueuePresentKHR> fQueuePresentKHR;
         VkPtr<PFN_vkGetPhysicalDeviceDisplayPropertiesKHR> fGetPhysicalDeviceDisplayPropertiesKHR;
         VkPtr<PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR> fGetPhysicalDeviceDisplayPlanePropertiesKHR;
         VkPtr<PFN_vkGetDisplayPlaneSupportedDisplaysKHR> fGetDisplayPlaneSupportedDisplaysKHR;
         VkPtr<PFN_vkGetDisplayModePropertiesKHR> fGetDisplayModePropertiesKHR;
         VkPtr<PFN_vkCreateDisplayModeKHR> fCreateDisplayModeKHR;
         VkPtr<PFN_vkGetDisplayPlaneCapabilitiesKHR> fGetDisplayPlaneCapabilitiesKHR;
         VkPtr<PFN_vkCreateDisplayPlaneSurfaceKHR> fCreateDisplayPlaneSurfaceKHR;
         VkPtr<PFN_vkCreateSharedSwapchainsKHR> fCreateSharedSwapchainsKHR;
         VkPtr<PFN_vkCreateDebugReportCallbackEXT> fCreateDebugReportCallbackEXT;
         VkPtr<PFN_vkDebugReportMessageEXT> fDebugReportMessageEXT;
         VkPtr<PFN_vkDestroyDebugReportCallbackEXT> fDestroyDebugReportCallbackEXT;
     } fFunctions;
 
 };
 
 #endif