commit d3e65aa7582bf889c7b05f8e9c69555bae4d7941
author Greg Daniel <egdaniel@google.com> Wed Aug 01 09:19:45 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Aug 01 13:45:55 2018 +0000
tree 41411140c89a2f5bb18aa1fbe1e9f17030060f17
parent 9b9453e9076cef8e62e3dfbed6d2b5dd46f5dfb2

Move GrVkInterface out of public API.

Bug: skia:
Change-Id: I8b73982e4c9372af1c35bfc5e665c2c146d7d9f5
Reviewed-on: https://skia-review.googlesource.com/141121
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/gpu/vk/GrVkInterface.cpp

diff --git a/src/gpu/vk/GrVkInterface.cpp b/src/gpu/vk/GrVkInterface.cpp
index dedc264..f658505 100644
--- a/src/gpu/vk/GrVkInterface.cpp
+++ b/src/gpu/vk/GrVkInterface.cpp
@@ -5,34 +5,14 @@
  * found in the LICENSE file.
  */
 
-#include "vk/GrVkInterface.h"
+#include "GrVkInterface.h"
 #include "vk/GrVkBackendContext.h"
 #include "vk/GrVkUtil.h"
 
 #define ACQUIRE_PROC(name, instance, device) fFunctions.f##name = \
     reinterpret_cast<PFN_vk##name>(getProc("vk"#name, instance, device));
 
-GrVkInterface::GetProc make_unified_getter(const GrVkInterface::GetInstanceProc& iproc,
-                                           const GrVkInterface::GetDeviceProc& dproc) {
-    return [&iproc, &dproc](const char* proc_name, VkInstance instance, VkDevice device) {
-        if (device != VK_NULL_HANDLE) {
-            return dproc(device, proc_name);
-        }
-        return iproc(instance, proc_name);
-    };
-}
-
-GrVkInterface::GrVkInterface(const GetInstanceProc& getInstanceProc,
-                             const GetDeviceProc& getDeviceProc,
-                             VkInstance instance,
-                             VkDevice device,
-                             uint32_t extensionFlags)
-        : GrVkInterface(make_unified_getter(getInstanceProc, getDeviceProc),
-                        instance,
-                        device,
-                        extensionFlags) {}
-
-GrVkInterface::GrVkInterface(GetProc getProc,
+GrVkInterface::GrVkInterface(GrVkGetProc getProc,
                              VkInstance instance,
                              VkDevice device,
                              uint32_t extensionFlags) {