diff options
Diffstat (limited to 'include/gpu/vk/GrVkInterface.h')
| -rw-r--r-- | include/gpu/vk/GrVkInterface.h | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/include/gpu/vk/GrVkInterface.h b/include/gpu/vk/GrVkInterface.h index b4691e8994..05ce561829 100644 --- a/include/gpu/vk/GrVkInterface.h +++ b/include/gpu/vk/GrVkInterface.h @@ -11,7 +11,6 @@ #include "SkRefCnt.h" #include "vk/GrVkDefines.h" -#include "vk/GrVkExtensions.h" //////////////////////////////////////////////////////////////////////////////// @@ -51,25 +50,17 @@ public: GrVkInterface(GetProc getProc, VkInstance instance, VkDevice device, - uint32_t instanceExtensionCount, - const char* const* instanceExtensions, - uint32_t deviceExtensionCount, - const char* const* deviceExtensions); + uint32_t extensionFlags); - // TODO: This is deprecated. Remove onces clients have switch to new interface - GrVkInterface(GetProc getProc, + GrVkInterface(const GetInstanceProc&, + const GetDeviceProc&, VkInstance instance, VkDevice device, uint32_t extensionFlags); // Validates that the GrVkInterface supports its advertised standard. This means the necessary // function pointers have been initialized for Vulkan version. - bool validate() const; - - // This is deprecated since the extensions information is stored already on the GrVkInterface. - bool validate(uint32_t /*extensionFlags*/) const { - return this->validate(); - } + bool validate(uint32_t extensionFlags) const; /** * The function pointers are in a struct so that we can have a compiler generated assignment @@ -217,10 +208,6 @@ public: VkPtr<PFN_vkDestroyDebugReportCallbackEXT> fDestroyDebugReportCallbackEXT; } fFunctions; - GrVkExtensions fExtensions; - -private: - void init(GetProc getProc, VkInstance instance, VkDevice device); }; #endif |