| Index: src/gpu/batches/GrVertexBatch.cpp
|
| diff --git a/src/gpu/batches/GrVertexBatch.cpp b/src/gpu/batches/GrVertexBatch.cpp
|
| index d61b51145a4e366c5a8286fedb8fb6c158eb14f7..5d10a725950928a45ef58f901ba7a82b3b1195c6 100644
|
| --- a/src/gpu/batches/GrVertexBatch.cpp
|
| +++ b/src/gpu/batches/GrVertexBatch.cpp
|
| @@ -22,7 +22,7 @@ void* GrVertexBatch::InstancedHelper::init(Target* target, GrPrimitiveType primT
|
| int instancesToDraw) {
|
| SkASSERT(target);
|
| if (!indexBuffer) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| const GrVertexBuffer* vertexBuffer;
|
| int firstVertex;
|
| @@ -30,7 +30,7 @@ void* GrVertexBatch::InstancedHelper::init(Target* target, GrPrimitiveType primT
|
| void* vertices = target->makeVertexSpace(vertexStride, vertexCount, &vertexBuffer, &firstVertex);
|
| if (!vertices) {
|
| SkDebugf("Vertices could not be allocated for instanced rendering.");
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| SkASSERT(vertexBuffer);
|
| size_t ibSize = indexBuffer->gpuMemorySize();
|
| @@ -53,7 +53,7 @@ void* GrVertexBatch::QuadHelper::init(Target* target, size_t vertexStride,
|
| target->resourceProvider()->refQuadIndexBuffer());
|
| if (!quadIndexBuffer) {
|
| SkDebugf("Could not get quad index buffer.");
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| return this->INHERITED::init(target, kTriangles_GrPrimitiveType, vertexStride,
|
| quadIndexBuffer, kVerticesPerQuad, kIndicesPerQuad, quadsToDraw);
|
|
|