diff options
| author |  Ben Wagner <bungeman@google.com> | 2017-08-28 10:34:05 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-28 17:48:57 +0000 |
| commit | a93a14a99816d25b773f0b12868143702baf44bf (patch) | |
| tree | 727e7cb88867bdc12cbcf8baa354ae3afc9444e2 /src/gpu/vk/GrVkMemory.cpp | |
| parent | 695db408437807d049ecc02b3b852704092728f2 (diff) | |
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>
Diffstat (limited to 'src/gpu/vk/GrVkMemory.cpp')
| -rw-r--r-- | src/gpu/vk/GrVkMemory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/vk/GrVkMemory.cpp b/src/gpu/vk/GrVkMemory.cpp index 31dea10ac4..0496a5463c 100644 --- a/src/gpu/vk/GrVkMemory.cpp +++ b/src/gpu/vk/GrVkMemory.cpp @@ -472,7 +472,7 @@ GrVkSubHeap::GrVkSubHeap(const GrVkGpu* gpu, uint32_t memoryTypeIndex, uint32_t VkMemoryAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, // sType - NULL, // pNext + nullptr, // pNext size, // allocationSize memoryTypeIndex, // memoryTypeIndex }; @@ -518,7 +518,7 @@ bool GrVkHeap::subAlloc(VkDeviceSize size, VkDeviceSize alignment, if (alignedSize > fSubHeapSize) { VkMemoryAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, // sType - NULL, // pNext + nullptr, // pNext size, // allocationSize memoryTypeIndex, // memoryTypeIndex }; |