1 files changed, 138 insertions, 138 deletions
diff --git a/src/gpu/vk/GrVkInterface.cpp b/src/gpu/vk/GrVkInterface.cpp
index 4188943b17..dedc264136 100644
--- a/src/gpu/vk/GrVkInterface.cpp
+++ b/src/gpu/vk/GrVkInterface.cpp
@@ -200,148 +200,148 @@ GrVkInterface::GrVkInterface(GetProc getProc,
 
 bool GrVkInterface::validate(uint32_t extensionFlags) const {
     // functions that are always required
-    if (NULL == fFunctions.fCreateInstance ||
-        NULL == fFunctions.fDestroyInstance ||
-        NULL == fFunctions.fEnumeratePhysicalDevices ||
-        NULL == fFunctions.fGetPhysicalDeviceFeatures ||
-        NULL == fFunctions.fGetPhysicalDeviceFormatProperties ||
-        NULL == fFunctions.fGetPhysicalDeviceImageFormatProperties ||
-        NULL == fFunctions.fGetPhysicalDeviceProperties ||
-        NULL == fFunctions.fGetPhysicalDeviceQueueFamilyProperties ||
-        NULL == fFunctions.fGetPhysicalDeviceMemoryProperties ||
-        NULL == fFunctions.fCreateDevice ||
-        NULL == fFunctions.fDestroyDevice ||
-        NULL == fFunctions.fEnumerateInstanceExtensionProperties ||
-        NULL == fFunctions.fEnumerateDeviceExtensionProperties ||
-        NULL == fFunctions.fEnumerateInstanceLayerProperties ||
-        NULL == fFunctions.fEnumerateDeviceLayerProperties ||
-        NULL == fFunctions.fGetDeviceQueue ||
-        NULL == fFunctions.fQueueSubmit ||
-        NULL == fFunctions.fQueueWaitIdle ||
-        NULL == fFunctions.fDeviceWaitIdle ||
-        NULL == fFunctions.fAllocateMemory ||
-        NULL == fFunctions.fFreeMemory ||
-        NULL == fFunctions.fMapMemory ||
-        NULL == fFunctions.fUnmapMemory ||
-        NULL == fFunctions.fFlushMappedMemoryRanges ||
-        NULL == fFunctions.fInvalidateMappedMemoryRanges ||
-        NULL == fFunctions.fGetDeviceMemoryCommitment ||
-        NULL == fFunctions.fBindBufferMemory ||
-        NULL == fFunctions.fBindImageMemory ||
-        NULL == fFunctions.fGetBufferMemoryRequirements ||
-        NULL == fFunctions.fGetImageMemoryRequirements ||
-        NULL == fFunctions.fGetImageSparseMemoryRequirements ||
-        NULL == fFunctions.fGetPhysicalDeviceSparseImageFormatProperties ||
-        NULL == fFunctions.fQueueBindSparse ||
-        NULL == fFunctions.fCreateFence ||
-        NULL == fFunctions.fDestroyFence ||
-        NULL == fFunctions.fResetFences ||
-        NULL == fFunctions.fGetFenceStatus ||
-        NULL == fFunctions.fWaitForFences ||
-        NULL == fFunctions.fCreateSemaphore ||
-        NULL == fFunctions.fDestroySemaphore ||
-        NULL == fFunctions.fCreateEvent ||
-        NULL == fFunctions.fDestroyEvent ||
-        NULL == fFunctions.fGetEventStatus ||
-        NULL == fFunctions.fSetEvent ||
-        NULL == fFunctions.fResetEvent ||
-        NULL == fFunctions.fCreateQueryPool ||
-        NULL == fFunctions.fDestroyQueryPool ||
-        NULL == fFunctions.fGetQueryPoolResults ||
-        NULL == fFunctions.fCreateBuffer ||
-        NULL == fFunctions.fDestroyBuffer ||
-        NULL == fFunctions.fCreateBufferView ||
-        NULL == fFunctions.fDestroyBufferView ||
-        NULL == fFunctions.fCreateImage ||
-        NULL == fFunctions.fDestroyImage ||
-        NULL == fFunctions.fGetImageSubresourceLayout ||
-        NULL == fFunctions.fCreateImageView ||
-        NULL == fFunctions.fDestroyImageView ||
-        NULL == fFunctions.fCreateShaderModule ||
-        NULL == fFunctions.fDestroyShaderModule ||
-        NULL == fFunctions.fCreatePipelineCache ||
-        NULL == fFunctions.fDestroyPipelineCache ||
-        NULL == fFunctions.fGetPipelineCacheData ||
-        NULL == fFunctions.fMergePipelineCaches ||
-        NULL == fFunctions.fCreateGraphicsPipelines ||
-        NULL == fFunctions.fCreateComputePipelines ||
-        NULL == fFunctions.fDestroyPipeline ||
-        NULL == fFunctions.fCreatePipelineLayout ||
-        NULL == fFunctions.fDestroyPipelineLayout ||
-        NULL == fFunctions.fCreateSampler ||
-        NULL == fFunctions.fDestroySampler ||
-        NULL == fFunctions.fCreateDescriptorSetLayout ||
-        NULL == fFunctions.fDestroyDescriptorSetLayout ||
-        NULL == fFunctions.fCreateDescriptorPool ||
-        NULL == fFunctions.fDestroyDescriptorPool ||
-        NULL == fFunctions.fResetDescriptorPool ||
-        NULL == fFunctions.fAllocateDescriptorSets ||
-        NULL == fFunctions.fFreeDescriptorSets ||
-        NULL == fFunctions.fUpdateDescriptorSets ||
-        NULL == fFunctions.fCreateFramebuffer ||
-        NULL == fFunctions.fDestroyFramebuffer ||
-        NULL == fFunctions.fCreateRenderPass ||
-        NULL == fFunctions.fDestroyRenderPass ||
-        NULL == fFunctions.fGetRenderAreaGranularity ||
-        NULL == fFunctions.fCreateCommandPool ||
-        NULL == fFunctions.fDestroyCommandPool ||
-        NULL == fFunctions.fResetCommandPool ||
-        NULL == fFunctions.fAllocateCommandBuffers ||
-        NULL == fFunctions.fFreeCommandBuffers ||
-        NULL == fFunctions.fBeginCommandBuffer ||
-        NULL == fFunctions.fEndCommandBuffer ||
-        NULL == fFunctions.fResetCommandBuffer ||
-        NULL == fFunctions.fCmdBindPipeline ||
-        NULL == fFunctions.fCmdSetViewport ||
-        NULL == fFunctions.fCmdSetScissor ||
-        NULL == fFunctions.fCmdSetLineWidth ||
-        NULL == fFunctions.fCmdSetDepthBias ||
-        NULL == fFunctions.fCmdSetBlendConstants ||
-        NULL == fFunctions.fCmdSetDepthBounds ||
-        NULL == fFunctions.fCmdSetStencilCompareMask ||
-        NULL == fFunctions.fCmdSetStencilWriteMask ||
-        NULL == fFunctions.fCmdSetStencilReference ||
-        NULL == fFunctions.fCmdBindDescriptorSets ||
-        NULL == fFunctions.fCmdBindIndexBuffer ||
-        NULL == fFunctions.fCmdBindVertexBuffers ||
-        NULL == fFunctions.fCmdDraw ||
-        NULL == fFunctions.fCmdDrawIndexed ||
-        NULL == fFunctions.fCmdDrawIndirect ||
-        NULL == fFunctions.fCmdDrawIndexedIndirect ||
-        NULL == fFunctions.fCmdDispatch ||
-        NULL == fFunctions.fCmdDispatchIndirect ||
-        NULL == fFunctions.fCmdCopyBuffer ||
-        NULL == fFunctions.fCmdCopyImage ||
-        NULL == fFunctions.fCmdBlitImage ||
-        NULL == fFunctions.fCmdCopyBufferToImage ||
-        NULL == fFunctions.fCmdCopyImageToBuffer ||
-        NULL == fFunctions.fCmdUpdateBuffer ||
-        NULL == fFunctions.fCmdFillBuffer ||
-        NULL == fFunctions.fCmdClearColorImage ||
-        NULL == fFunctions.fCmdClearDepthStencilImage ||
-        NULL == fFunctions.fCmdClearAttachments ||
-        NULL == fFunctions.fCmdResolveImage ||
-        NULL == fFunctions.fCmdSetEvent ||
-        NULL == fFunctions.fCmdResetEvent ||
-        NULL == fFunctions.fCmdWaitEvents ||
-        NULL == fFunctions.fCmdPipelineBarrier ||
-        NULL == fFunctions.fCmdBeginQuery ||
-        NULL == fFunctions.fCmdEndQuery ||
-        NULL == fFunctions.fCmdResetQueryPool ||
-        NULL == fFunctions.fCmdWriteTimestamp ||
-        NULL == fFunctions.fCmdCopyQueryPoolResults ||
-        NULL == fFunctions.fCmdPushConstants ||
-        NULL == fFunctions.fCmdBeginRenderPass ||
-        NULL == fFunctions.fCmdNextSubpass ||
-        NULL == fFunctions.fCmdEndRenderPass ||
-        NULL == fFunctions.fCmdExecuteCommands) {
+    if (nullptr == fFunctions.fCreateInstance ||
+        nullptr == fFunctions.fDestroyInstance ||
+        nullptr == fFunctions.fEnumeratePhysicalDevices ||
+        nullptr == fFunctions.fGetPhysicalDeviceFeatures ||
+        nullptr == fFunctions.fGetPhysicalDeviceFormatProperties ||
+        nullptr == fFunctions.fGetPhysicalDeviceImageFormatProperties ||
+        nullptr == fFunctions.fGetPhysicalDeviceProperties ||
+        nullptr == fFunctions.fGetPhysicalDeviceQueueFamilyProperties ||
+        nullptr == fFunctions.fGetPhysicalDeviceMemoryProperties ||
+        nullptr == fFunctions.fCreateDevice ||
+        nullptr == fFunctions.fDestroyDevice ||
+        nullptr == fFunctions.fEnumerateInstanceExtensionProperties ||
+        nullptr == fFunctions.fEnumerateDeviceExtensionProperties ||
+        nullptr == fFunctions.fEnumerateInstanceLayerProperties ||
+        nullptr == fFunctions.fEnumerateDeviceLayerProperties ||
+        nullptr == fFunctions.fGetDeviceQueue ||
+        nullptr == fFunctions.fQueueSubmit ||
+        nullptr == fFunctions.fQueueWaitIdle ||
+        nullptr == fFunctions.fDeviceWaitIdle ||
+        nullptr == fFunctions.fAllocateMemory ||
+        nullptr == fFunctions.fFreeMemory ||
+        nullptr == fFunctions.fMapMemory ||
+        nullptr == fFunctions.fUnmapMemory ||
+        nullptr == fFunctions.fFlushMappedMemoryRanges ||
+        nullptr == fFunctions.fInvalidateMappedMemoryRanges ||
+        nullptr == fFunctions.fGetDeviceMemoryCommitment ||
+        nullptr == fFunctions.fBindBufferMemory ||
+        nullptr == fFunctions.fBindImageMemory ||
+        nullptr == fFunctions.fGetBufferMemoryRequirements ||
+        nullptr == fFunctions.fGetImageMemoryRequirements ||
+        nullptr == fFunctions.fGetImageSparseMemoryRequirements ||
+        nullptr == fFunctions.fGetPhysicalDeviceSparseImageFormatProperties ||
+        nullptr == fFunctions.fQueueBindSparse ||
+        nullptr == fFunctions.fCreateFence ||
+        nullptr == fFunctions.fDestroyFence ||
+        nullptr == fFunctions.fResetFences ||
+        nullptr == fFunctions.fGetFenceStatus ||
+        nullptr == fFunctions.fWaitForFences ||
+        nullptr == fFunctions.fCreateSemaphore ||
+        nullptr == fFunctions.fDestroySemaphore ||
+        nullptr == fFunctions.fCreateEvent ||
+        nullptr == fFunctions.fDestroyEvent ||
+        nullptr == fFunctions.fGetEventStatus ||
+        nullptr == fFunctions.fSetEvent ||
+        nullptr == fFunctions.fResetEvent ||
+        nullptr == fFunctions.fCreateQueryPool ||
+        nullptr == fFunctions.fDestroyQueryPool ||
+        nullptr == fFunctions.fGetQueryPoolResults ||
+        nullptr == fFunctions.fCreateBuffer ||
+        nullptr == fFunctions.fDestroyBuffer ||
+        nullptr == fFunctions.fCreateBufferView ||
+        nullptr == fFunctions.fDestroyBufferView ||
+        nullptr == fFunctions.fCreateImage ||
+        nullptr == fFunctions.fDestroyImage ||
+        nullptr == fFunctions.fGetImageSubresourceLayout ||
+        nullptr == fFunctions.fCreateImageView ||
+        nullptr == fFunctions.fDestroyImageView ||
+        nullptr == fFunctions.fCreateShaderModule ||
+        nullptr == fFunctions.fDestroyShaderModule ||
+        nullptr == fFunctions.fCreatePipelineCache ||
+        nullptr == fFunctions.fDestroyPipelineCache ||
+        nullptr == fFunctions.fGetPipelineCacheData ||
+        nullptr == fFunctions.fMergePipelineCaches ||
+        nullptr == fFunctions.fCreateGraphicsPipelines ||
+        nullptr == fFunctions.fCreateComputePipelines ||
+        nullptr == fFunctions.fDestroyPipeline ||
+        nullptr == fFunctions.fCreatePipelineLayout ||
+        nullptr == fFunctions.fDestroyPipelineLayout ||
+        nullptr == fFunctions.fCreateSampler ||
+        nullptr == fFunctions.fDestroySampler ||
+        nullptr == fFunctions.fCreateDescriptorSetLayout ||
+        nullptr == fFunctions.fDestroyDescriptorSetLayout ||
+        nullptr == fFunctions.fCreateDescriptorPool ||
+        nullptr == fFunctions.fDestroyDescriptorPool ||
+        nullptr == fFunctions.fResetDescriptorPool ||
+        nullptr == fFunctions.fAllocateDescriptorSets ||
+        nullptr == fFunctions.fFreeDescriptorSets ||
+        nullptr == fFunctions.fUpdateDescriptorSets ||
+        nullptr == fFunctions.fCreateFramebuffer ||
+        nullptr == fFunctions.fDestroyFramebuffer ||
+        nullptr == fFunctions.fCreateRenderPass ||
+        nullptr == fFunctions.fDestroyRenderPass ||
+        nullptr == fFunctions.fGetRenderAreaGranularity ||
+        nullptr == fFunctions.fCreateCommandPool ||
+        nullptr == fFunctions.fDestroyCommandPool ||
+        nullptr == fFunctions.fResetCommandPool ||
+        nullptr == fFunctions.fAllocateCommandBuffers ||
+        nullptr == fFunctions.fFreeCommandBuffers ||
+        nullptr == fFunctions.fBeginCommandBuffer ||
+        nullptr == fFunctions.fEndCommandBuffer ||
+        nullptr == fFunctions.fResetCommandBuffer ||
+        nullptr == fFunctions.fCmdBindPipeline ||
+        nullptr == fFunctions.fCmdSetViewport ||
+        nullptr == fFunctions.fCmdSetScissor ||
+        nullptr == fFunctions.fCmdSetLineWidth ||
+        nullptr == fFunctions.fCmdSetDepthBias ||
+        nullptr == fFunctions.fCmdSetBlendConstants ||
+        nullptr == fFunctions.fCmdSetDepthBounds ||
+        nullptr == fFunctions.fCmdSetStencilCompareMask ||
+        nullptr == fFunctions.fCmdSetStencilWriteMask ||
+        nullptr == fFunctions.fCmdSetStencilReference ||
+        nullptr == fFunctions.fCmdBindDescriptorSets ||
+        nullptr == fFunctions.fCmdBindIndexBuffer ||
+        nullptr == fFunctions.fCmdBindVertexBuffers ||
+        nullptr == fFunctions.fCmdDraw ||
+        nullptr == fFunctions.fCmdDrawIndexed ||
+        nullptr == fFunctions.fCmdDrawIndirect ||
+        nullptr == fFunctions.fCmdDrawIndexedIndirect ||
+        nullptr == fFunctions.fCmdDispatch ||
+        nullptr == fFunctions.fCmdDispatchIndirect ||
+        nullptr == fFunctions.fCmdCopyBuffer ||
+        nullptr == fFunctions.fCmdCopyImage ||
+        nullptr == fFunctions.fCmdBlitImage ||
+        nullptr == fFunctions.fCmdCopyBufferToImage ||
+        nullptr == fFunctions.fCmdCopyImageToBuffer ||
+        nullptr == fFunctions.fCmdUpdateBuffer ||
+        nullptr == fFunctions.fCmdFillBuffer ||
+        nullptr == fFunctions.fCmdClearColorImage ||
+        nullptr == fFunctions.fCmdClearDepthStencilImage ||
+        nullptr == fFunctions.fCmdClearAttachments ||
+        nullptr == fFunctions.fCmdResolveImage ||
+        nullptr == fFunctions.fCmdSetEvent ||
+        nullptr == fFunctions.fCmdResetEvent ||
+        nullptr == fFunctions.fCmdWaitEvents ||
+        nullptr == fFunctions.fCmdPipelineBarrier ||
+        nullptr == fFunctions.fCmdBeginQuery ||
+        nullptr == fFunctions.fCmdEndQuery ||
+        nullptr == fFunctions.fCmdResetQueryPool ||
+        nullptr == fFunctions.fCmdWriteTimestamp ||
+        nullptr == fFunctions.fCmdCopyQueryPoolResults ||
+        nullptr == fFunctions.fCmdPushConstants ||
+        nullptr == fFunctions.fCmdBeginRenderPass ||
+        nullptr == fFunctions.fCmdNextSubpass ||
+        nullptr == fFunctions.fCmdEndRenderPass ||
+        nullptr == fFunctions.fCmdExecuteCommands) {
         RETURN_FALSE_INTERFACE
     }
 
     if (extensionFlags & kEXT_debug_report_GrVkExtensionFlag) {
-        if (NULL == fFunctions.fCreateDebugReportCallbackEXT ||
-            NULL == fFunctions.fDebugReportMessageEXT ||
-            NULL == fFunctions.fDestroyDebugReportCallbackEXT) {
+        if (nullptr == fFunctions.fCreateDebugReportCallbackEXT ||
+            nullptr == fFunctions.fDebugReportMessageEXT ||
+            nullptr == fFunctions.fDestroyDebugReportCallbackEXT) {
             RETURN_FALSE_INTERFACE
         }
     }