Revise layer, extension and feature setup for Vulkan

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
 
 #include "SkRefCnt.h"
 
-#include "GrVkExtensions.h"
-
 #include "vulkan/vulkan.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
  * The default interface is returned by GrVkDefaultInterface. This function's
  * implementation is platform-specific.
  */
 
 struct GrVkInterface;
 
 /**
  * Creates a GrVkInterface.
  */
-const GrVkInterface* GrVkCreateInterface(VkInstance instance, VkPhysicalDevice physDev, 
-                                         VkDevice device);
+const GrVkInterface* GrVkCreateInterface(VkInstance instance, VkDevice device,
+                                         uint32_t extensionFlags);
 
 
 /**
  * GrContext uses the following interface to make all calls into Vulkan. When a
  * GrContext is created it is given a GrVkInterface. All functions that should be
  * available based on the Vulkan's version must be non-NULL or GrContext creation
  * will fail. This can be tested with the validate() method.
  */
 struct SK_API GrVkInterface : public SkRefCnt {
 private:
     // simple wrapper class that exists only to initialize a pointer to NULL
     template <typename FNPTR_TYPE> class VkPtr {
     public:
         VkPtr() : fPtr(NULL) {}
         VkPtr operator=(FNPTR_TYPE ptr) { fPtr = ptr; return *this; }
         operator FNPTR_TYPE() const { return fPtr; }
     private:
         FNPTR_TYPE fPtr;
     };
 
     typedef SkRefCnt INHERITED;
 
 public:
     GrVkInterface();
 
     // Validates that the GrVkInterface supports its advertised standard. This means the necessary
     // function pointers have been initialized for Vulkan version.
     bool validate() const;
 
-    GrVkExtensions fExtensions;
-
-    bool hasInstanceExtension(const char ext[]) const {
-        return fExtensions.hasInstanceExtension(ext);
-    }
-    bool hasDeviceExtension(const char ext[]) const {
-        return fExtensions.hasDeviceExtension(ext);
-    }
-    bool hasInstanceLayer(const char ext[]) const {
-        return fExtensions.hasInstanceLayer(ext);
-    }
-    bool hasDeviceLayer(const char ext[]) const {
-        return fExtensions.hasDeviceLayer(ext);
-    }
-
     /**
      * The function pointers are in a struct so that we can have a compiler generated assignment
      * operator.
      */
     struct Functions {
         VkPtr<PFN_vkCreateInstance> fCreateInstance;
         VkPtr<PFN_vkDestroyInstance> fDestroyInstance;
         VkPtr<PFN_vkEnumeratePhysicalDevices> fEnumeratePhysicalDevices;
         VkPtr<PFN_vkGetPhysicalDeviceFeatures> fGetPhysicalDeviceFeatures;
         VkPtr<PFN_vkGetPhysicalDeviceFormatProperties> fGetPhysicalDeviceFormatProperties;
@@ skipping 146 matching lines @@
         VkPtr<PFN_vkCreateDisplayPlaneSurfaceKHR> fCreateDisplayPlaneSurfaceKHR;
         VkPtr<PFN_vkCreateSharedSwapchainsKHR> fCreateSharedSwapchainsKHR;
         VkPtr<PFN_vkCreateDebugReportCallbackEXT> fCreateDebugReportCallbackEXT;
         VkPtr<PFN_vkDebugReportMessageEXT> fDebugReportMessageEXT;
         VkPtr<PFN_vkDestroyDebugReportCallbackEXT> fDestroyDebugReportCallbackEXT;
     } fFunctions;
 
 };
 
 #endif