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
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
}
diff --git a/tools/vulkan/VulkanTestContext.cpp b/tools/vulkan/VulkanTestContext.cpp
index 0e07734..e9137c0 100644
--- a/tools/vulkan/VulkanTestContext.cpp
+++ b/tools/vulkan/VulkanTestContext.cpp
@@ -240,7 +240,7 @@
GrBackendRenderTargetDesc desc;
GrVkTextureInfo info;
info.fImage = fImages[i];
- info.fAlloc = nullptr;
+ info.fAlloc = VK_NULL_HANDLE;
info.fImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
info.fImageTiling = VK_IMAGE_TILING_OPTIMAL;
info.fFormat = format;