commit 419ca64f0f800dc098369b5aa5a604acd017b240
author brianosman <brianosman@google.com> Wed May 04 08:19:44 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed May 04 08:19:44 2016 -0700
tree cd2a170d04ce20eb6b5f2a5a1e9f0a4bfd3381f3
parent ae5c01d52b613cea5321400357403678627e443e

Fix type conversion compile errors

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1949553003

Review-Url: https://codereview.chromium.org/1949553003

src/gpu/vk/GrVkGpu.cpp

diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index 25bf250..0005f2c 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -89,7 +89,7 @@
     fBackendContext.reset(backendCtx);
 
 #ifdef ENABLE_VK_LAYERS
-    fCallback = nullptr;
+    fCallback = VK_NULL_HANDLE;
     if (backendCtx->fExtensions & kEXT_debug_report_GrVkExtensionFlag) {
         // Setup callback creation information
         VkDebugReportCallbackCreateInfoEXT callbackCreateInfo;
@@ -153,7 +153,7 @@
 #ifdef ENABLE_VK_LAYERS
     if (fCallback) {
         VK_CALL(DestroyDebugReportCallbackEXT(fBackendContext->fInstance, fCallback, nullptr));
-        fCallback = nullptr;
+        fCallback = VK_NULL_HANDLE;
     }
 #endif
 }