Revert "Move Vulkan DebugCallback code into tools."

This reverts commit d4b2adeaa929edd1664754ac6621ec524992ef03.

Reason for revert: Need to revert earlier changes cause of fucshia

Original change's description:
> Move Vulkan DebugCallback code into tools.
> 
> Bug: skia:
> Change-Id: Ib356200e86e54f9ff0ba16396874e6fd10cf0465
> Reviewed-on: https://skia-review.googlesource.com/137424
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>

TBR=egdaniel@google.com,jvanverth@google.com,bsalomon@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: skia:
Change-Id: I38d4e71dc29c6503f92712be54e22c58956498c5
Reviewed-on: https://skia-review.googlesource.com/137902
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

2 files changed, 19 insertions, 27 deletions

diff --git a/tools/sk_app/VulkanWindowContext.cpp b/tools/sk_app/VulkanWindowContext.cpp
index 8e0749ec1b..411f114e63 100644
--- a/tools/sk_app/VulkanWindowContext.cpp
+++ b/tools/sk_app/VulkanWindowContext.cpp
@@ -51,8 +51,7 @@ void VulkanWindowContext::initializeContext() {
 
     GrVkBackendContext backendContext;
     if (!sk_gpu_test::CreateVkBackendContext(fGetInstanceProcAddr, fGetDeviceProcAddr,
-                                             &backendContext, &fDebugCallback,
-                                             &fPresentQueueIndex, fCanPresentFn)) {
+                                             &backendContext, &fPresentQueueIndex, fCanPresentFn)) {
         return;
     }
 
@@ -410,26 +409,28 @@ VulkanWindowContext::~VulkanWindowContext() {
 }
 
 void VulkanWindowContext::destroyContext() {
-    if (this->isValid()) {
-        fQueueWaitIdle(fPresentQueue);
-        fDeviceWaitIdle(fDevice);
+    if (!this->isValid()) {
+        return;
+    }
 
-        this->destroyBuffers();
+    fQueueWaitIdle(fPresentQueue);
+    fDeviceWaitIdle(fDevice);
 
-        if (VK_NULL_HANDLE != fCommandPool) {
-            GR_VK_CALL(fInterface, DestroyCommandPool(fDevice, fCommandPool, nullptr));
-            fCommandPool = VK_NULL_HANDLE;
-        }
+    this->destroyBuffers();
 
-        if (VK_NULL_HANDLE != fSwapchain) {
-            fDestroySwapchainKHR(fDevice, fSwapchain, nullptr);
-            fSwapchain = VK_NULL_HANDLE;
-        }
+    if (VK_NULL_HANDLE != fCommandPool) {
+        GR_VK_CALL(fInterface, DestroyCommandPool(fDevice, fCommandPool, nullptr));
+        fCommandPool = VK_NULL_HANDLE;
+    }
 
-        if (VK_NULL_HANDLE != fSurface) {
-            fDestroySurfaceKHR(fInstance, fSurface, nullptr);
-            fSurface = VK_NULL_HANDLE;
-        }
+    if (VK_NULL_HANDLE != fSwapchain) {
+        fDestroySwapchainKHR(fDevice, fSwapchain, nullptr);
+        fSwapchain = VK_NULL_HANDLE;
+    }
+
+    if (VK_NULL_HANDLE != fSurface) {
+        fDestroySurfaceKHR(fInstance, fSurface, nullptr);
+        fSurface = VK_NULL_HANDLE;
     }
 
     fContext.reset();
@@ -439,14 +440,6 @@ void VulkanWindowContext::destroyContext() {
         fDestroyDevice(fDevice, nullptr);
         fDevice = VK_NULL_HANDLE;
     }
-
-#ifdef SK_ENABLE_VK_LAYERS
-    if (fDebugCallback != VK_NULL_HANDLE) {
-        GR_VK_CALL(fInterface, DestroyDebugReportCallbackEXT(fInstance, fDebugCallback,
-                                                             nullptr));
-    }
-#endif
-
     fPhysicalDevice = VK_NULL_HANDLE;
 
     if (VK_NULL_HANDLE != fInstance) {
diff --git a/tools/sk_app/VulkanWindowContext.h b/tools/sk_app/VulkanWindowContext.h
index 3d9687b674..79298f6b38 100644
--- a/tools/sk_app/VulkanWindowContext.h
+++ b/tools/sk_app/VulkanWindowContext.h
@@ -68,7 +68,6 @@ private:
     VkInstance fInstance = VK_NULL_HANDLE;
     VkPhysicalDevice fPhysicalDevice = VK_NULL_HANDLE;
     VkDevice fDevice = VK_NULL_HANDLE;
-    VkDebugReportCallbackEXT fDebugCallback = VK_NULL_HANDLE;
 
     // simple wrapper class that exists only to initialize a pointer to NULL
     template <typename FNPTR_TYPE> class VkPtr {