Add WSI functions to GrVkInterface

src/gpu/vk/GrVkCaps.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 GrVkCaps_DEFINED
 #define GrVkCaps_DEFINED
 
 #include "GrCaps.h"
 #include "GrVkStencilAttachment.h"
-#include "vulkan/vulkan.h"
+#include "vk/GrVkDefines.h"
 
 struct GrVkInterface;
 class GrGLSLCaps;
 
 /**
  * Stores some capabilities of a Vk backend.
  */
 class GrVkCaps : public GrCaps {
 public:    
     typedef GrVkStencilAttachment::Format StencilFormat;
@@ skipping 44 matching lines @@
     GrGLSLCaps* glslCaps() const { return reinterpret_cast<GrGLSLCaps*>(fShaderCaps.get()); }
 
 private:
     void init(const GrContextOptions& contextOptions, const GrVkInterface* vkInterface,
               VkPhysicalDevice device, uint32_t featureFlags);
     void initGrCaps(const VkPhysicalDeviceProperties&,
                     const VkPhysicalDeviceMemoryProperties&,
                     uint32_t featureFlags);
     void initGLSLCaps(const VkPhysicalDeviceProperties&, uint32_t featureFlags);
     void initSampleCount(const VkPhysicalDeviceProperties& properties);
-    void initConfigRenderableTable(const GrVkInterface* interface, VkPhysicalDevice physDev);
-    void initConfigTexturableTable(const GrVkInterface* interface, VkPhysicalDevice physDev);
-    void initStencilFormats(const GrVkInterface* interface, VkPhysicalDevice physDev);
+    void initConfigRenderableTable(const GrVkInterface* iface, VkPhysicalDevice physDev);
+    void initConfigTexturableTable(const GrVkInterface* iface, VkPhysicalDevice physDev);
+    void initStencilFormats(const GrVkInterface* iface, VkPhysicalDevice physDev);
 
 
     bool fConfigTextureSupport[kGrPixelConfigCnt];
     // For Vulkan we track whether a config is supported linearly (without need for swizzling)
     bool fConfigLinearTextureSupport[kGrPixelConfigCnt];
 
     // The first entry for each config is without msaa and the second is with.
     bool fConfigRenderSupport[kGrPixelConfigCnt][2];
     // The first entry for each config is without msaa and the second is with.
     bool fConfigLinearRenderSupport[kGrPixelConfigCnt][2];
 
     SkTArray<StencilFormat, true> fLinearStencilFormats;
     SkTArray<StencilFormat, true> fStencilFormats;
 
     typedef GrCaps INHERITED;
 };
 
 #endif