diff options
author | 2018-06-27 15:03:36 +0000 | |
---|---|---|
committer | 2018-06-27 15:03:46 +0000 | |
commit | cb92b26e5ca6063bcf1a922109b8224e0b6eb4da (patch) | |
tree | 3b691007851a1edc040ce8367dd2d67f10dc44fd /include/gpu/vk/GrVkInterface.h | |
parent | 45c9dab4c3ec43cedb28d1b8c08e166fe0c2e767 (diff) |
Revert "Let client pass in full extension to GrVkBackendContext."
This reverts commit 45c9dab4c3ec43cedb28d1b8c08e166fe0c2e767.
Reason for revert: fucshia uses GrVkBackendContext. Need to revert earlier changes
Original change's description:
> Let client pass in full extension to GrVkBackendContext.
>
> Bug: skia:
> Change-Id: I772ab4ccbca0f4f7e7d429d6c421b07d97f0606f
> Reviewed-on: https://skia-review.googlesource.com/131880
> Reviewed-by: Jim Van Verth <jvanverth@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,jvanverth@google.com,bsalomon@google.com
Change-Id: I1a765ff406c83cb234c3614b804fbed677d5a382
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/137901
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
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 |