Convert NULL and 0 to nullptr.
This was created by looking at warnings produced by clang's
-Wzero-as-null-pointer-constant. This updates most issues in
Skia code. However, there are places where GL and Vulkan want
pointer values which are explicitly 0, external headers which
use NULL directly, and possibly more uses in un-compiled
sources (for other platforms).
Change-Id: Id22fbac04d5c53497a53d734f0896b4f06fe8345
Reviewed-on: https://skia-review.googlesource.com/39521
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
diff --git a/src/gpu/GrAutoLocaleSetter.h b/src/gpu/GrAutoLocaleSetter.h
index 9cfa637..c373b78 100644
--- a/src/gpu/GrAutoLocaleSetter.h
+++ b/src/gpu/GrAutoLocaleSetter.h
@@ -54,11 +54,11 @@
name = nullptr;
}
#endif
- fLocale = newlocale(LC_ALL_MASK, name, 0);
+ fLocale = newlocale(LC_ALL_MASK, name, nullptr);
if (fLocale) {
fOldLocale = uselocale(fLocale);
} else {
- fOldLocale = static_cast<locale_t>(0);
+ fOldLocale = static_cast<locale_t>(nullptr);
}
#else
(void) name; // suppress unused param warning.
diff --git a/src/gpu/GrDrawingManager.h b/src/gpu/GrDrawingManager.h
index 6a1ad19..0143783 100644
--- a/src/gpu/GrDrawingManager.h
+++ b/src/gpu/GrDrawingManager.h
@@ -60,7 +60,7 @@
GrPathRenderer* getPathRenderer(const GrPathRenderer::CanDrawPathArgs& args,
bool allowSW,
GrPathRendererChain::DrawType drawType,
- GrPathRenderer::StencilSupport* stencilSupport = NULL);
+ GrPathRenderer::StencilSupport* stencilSupport = nullptr);
void flushIfNecessary() {
if (fContext->getResourceCache()->requestsFlush()) {
diff --git a/src/gpu/GrGpuResourceRef.h b/src/gpu/GrGpuResourceRef.h
index a56674b..866521a 100644
--- a/src/gpu/GrGpuResourceRef.h
+++ b/src/gpu/GrGpuResourceRef.h
@@ -173,7 +173,7 @@
*/
template <typename T, GrIOType IO_TYPE> class GrPendingIOResource : SkNoncopyable {
public:
- GrPendingIOResource(T* resource = NULL) : fResource(NULL) {
+ GrPendingIOResource(T* resource = nullptr) : fResource(nullptr) {
this->reset(resource);
}
diff --git a/src/gpu/GrResourceProvider.cpp b/src/gpu/GrResourceProvider.cpp
index 1979570..a022808 100644
--- a/src/gpu/GrResourceProvider.cpp
+++ b/src/gpu/GrResourceProvider.cpp
@@ -287,7 +287,7 @@
SkASSERT(texture);
return texture;
}
- return NULL;
+ return nullptr;
}
void GrResourceProvider::assignUniqueKeyToTexture(const GrUniqueKey& key, GrTexture* texture) {
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
index 5943120..36c26dc 100644
--- a/src/gpu/gl/GrGLGpu.cpp
+++ b/src/gpu/gl/GrGLGpu.cpp
@@ -1543,7 +1543,7 @@
0,
externalFormat,
externalType,
- NULL));
+ nullptr));
if (GR_GL_NO_ERROR != CHECK_ALLOC_ERROR(this->glInterface())) {
GL_CALL(DeleteTextures(1, &colorID));
return -1;
diff --git a/src/gpu/vk/GrVkBuffer.cpp b/src/gpu/vk/GrVkBuffer.cpp
index b2af229..a93a16e 100644
--- a/src/gpu/vk/GrVkBuffer.cpp
+++ b/src/gpu/vk/GrVkBuffer.cpp
@@ -88,7 +88,7 @@
bool byRegion) const {
VkBufferMemoryBarrier bufferMemoryBarrier = {
VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, // sType
- NULL, // pNext
+ nullptr, // pNext
srcAccessMask, // srcAccessMask
dstAccesMask, // dstAccessMask
VK_QUEUE_FAMILY_IGNORED, // srcQueueFamilyIndex
diff --git a/src/gpu/vk/GrVkCommandBuffer.cpp b/src/gpu/vk/GrVkCommandBuffer.cpp
index c44d121..8a17a4f 100644
--- a/src/gpu/vk/GrVkCommandBuffer.cpp
+++ b/src/gpu/vk/GrVkCommandBuffer.cpp
@@ -344,7 +344,7 @@
VkCommandPool cmdPool) {
const VkCommandBufferAllocateInfo cmdInfo = {
VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // sType
- NULL, // pNext
+ nullptr, // pNext
cmdPool, // commandPool
VK_COMMAND_BUFFER_LEVEL_PRIMARY, // level
1 // bufferCount
@@ -751,7 +751,7 @@
VkCommandPool cmdPool) {
const VkCommandBufferAllocateInfo cmdInfo = {
VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // sType
- NULL, // pNext
+ nullptr, // pNext
cmdPool, // commandPool
VK_COMMAND_BUFFER_LEVEL_SECONDARY, // level
1 // bufferCount
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index 83d28de..f32a83a 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -1070,7 +1070,7 @@
VkImageAspectFlags aspectFlags = VK_IMAGE_ASPECT_COLOR_BIT;
VkImageMemoryBarrier imageMemoryBarrier = {
VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, // sType
- NULL, // pNext
+ nullptr, // pNext
VK_ACCESS_TRANSFER_WRITE_BIT, // srcAccessMask
VK_ACCESS_TRANSFER_READ_BIT, // dstAccessMask
VK_IMAGE_LAYOUT_GENERAL, // oldLayout
@@ -1213,7 +1213,7 @@
const VkImageCreateInfo imageCreateInfo = {
VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, // sType
- NULL, // pNext
+ nullptr, // pNext
0, // VkImageCreateFlags
VK_IMAGE_TYPE_2D, // VkImageType
pixelFormat, // VkFormat
@@ -1295,7 +1295,7 @@
const VkCommandBufferAllocateInfo cmdInfo = {
VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // sType
- NULL, // pNext
+ nullptr, // pNext
fCmdPool, // commandPool
VK_COMMAND_BUFFER_LEVEL_PRIMARY, // level
1 // bufferCount
diff --git a/src/gpu/vk/GrVkImage.cpp b/src/gpu/vk/GrVkImage.cpp
index 5a9f69d..c3a47dc 100644
--- a/src/gpu/vk/GrVkImage.cpp
+++ b/src/gpu/vk/GrVkImage.cpp
@@ -90,7 +90,7 @@
const VkImageCreateInfo imageCreateInfo = {
VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, // sType
- NULL, // pNext
+ nullptr, // pNext
createFlags, // VkImageCreateFlags
imageDesc.fImageType, // VkImageType
imageDesc.fFormat, // VkFormat
diff --git a/src/gpu/vk/GrVkInterface.cpp b/src/gpu/vk/GrVkInterface.cpp
index 4188943..dedc264 100644
--- a/src/gpu/vk/GrVkInterface.cpp
+++ b/src/gpu/vk/GrVkInterface.cpp
@@ -200,148 +200,148 @@
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
}
}
diff --git a/src/gpu/vk/GrVkMemory.cpp b/src/gpu/vk/GrVkMemory.cpp
index 31dea10..0496a54 100644
--- a/src/gpu/vk/GrVkMemory.cpp
+++ b/src/gpu/vk/GrVkMemory.cpp
@@ -472,7 +472,7 @@
VkMemoryAllocateInfo allocInfo = {
VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, // sType
- NULL, // pNext
+ nullptr, // pNext
size, // allocationSize
memoryTypeIndex, // memoryTypeIndex
};
@@ -518,7 +518,7 @@
if (alignedSize > fSubHeapSize) {
VkMemoryAllocateInfo allocInfo = {
VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, // sType
- NULL, // pNext
+ nullptr, // pNext
size, // allocationSize
memoryTypeIndex, // memoryTypeIndex
};