| Index: src/gpu/gl/debug/GrGLCreateDebugInterface.cpp
|
| diff --git a/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp b/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp
|
| index ef52fb6763cf3295736d91104c0ce13c52f79fea..75b673688dd352342ffa29afabc8fc704947f98b 100644
|
| --- a/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp
|
| +++ b/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp
|
| @@ -84,7 +84,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLBufferData(GrGLenum target,
|
| GR_GL_STATIC_DRAW == usage ||
|
| GR_GL_DYNAMIC_DRAW == usage);
|
|
|
| - GrBufferObj *buffer = NULL;
|
| + GrBufferObj *buffer = nullptr;
|
| switch (target) {
|
| case GR_GL_ARRAY_BUFFER:
|
| buffer = GrDebugGL::getInstance()->getArrayBuffer();
|
| @@ -241,7 +241,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLReadPixels(GrGLint x,
|
|
|
| if (textures[j] == pTU->getTexture()->getID()) {
|
| // this ID is the current texture - revert the binding to 0
|
| - pTU->setTexture(NULL);
|
| + pTU->setTexture(nullptr);
|
| }
|
| }
|
| }
|
| @@ -258,15 +258,15 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLReadPixels(GrGLint x,
|
|
|
| if (frameBuffer->getColor() &&
|
| textures[i] == frameBuffer->getColor()->getID()) {
|
| - frameBuffer->setColor(NULL);
|
| + frameBuffer->setColor(nullptr);
|
| }
|
| if (frameBuffer->getDepth() &&
|
| textures[i] == frameBuffer->getDepth()->getID()) {
|
| - frameBuffer->setDepth(NULL);
|
| + frameBuffer->setDepth(nullptr);
|
| }
|
| if (frameBuffer->getStencil() &&
|
| textures[i] == frameBuffer->getStencil()->getID()) {
|
| - frameBuffer->setStencil(NULL);
|
| + frameBuffer->setStencil(nullptr);
|
| }
|
| }
|
| }
|
| @@ -298,7 +298,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLReadPixels(GrGLint x,
|
| if (frameBuffers[i] ==
|
| GrDebugGL::getInstance()->getFrameBuffer()->getID()) {
|
| // this ID is the current frame buffer - rebind to the default
|
| - GrDebugGL::getInstance()->setFrameBuffer(NULL);
|
| + GrDebugGL::getInstance()->setFrameBuffer(nullptr);
|
| }
|
| }
|
| }
|
| @@ -326,7 +326,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLReadPixels(GrGLint x,
|
| GrDebugGL::getInstance()->getRenderBuffer()->getID()) {
|
| // this ID is the current render buffer - make no
|
| // render buffer be bound
|
| - GrDebugGL::getInstance()->setRenderBuffer(NULL);
|
| + GrDebugGL::getInstance()->setRenderBuffer(nullptr);
|
| }
|
| }
|
| }
|
| @@ -343,15 +343,15 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLReadPixels(GrGLint x,
|
|
|
| if (frameBuffer->getColor() &&
|
| renderBuffers[i] == frameBuffer->getColor()->getID()) {
|
| - frameBuffer->setColor(NULL);
|
| + frameBuffer->setColor(nullptr);
|
| }
|
| if (frameBuffer->getDepth() &&
|
| renderBuffers[i] == frameBuffer->getDepth()->getID()) {
|
| - frameBuffer->setDepth(NULL);
|
| + frameBuffer->setDepth(nullptr);
|
| }
|
| if (frameBuffer->getStencil() &&
|
| renderBuffers[i] == frameBuffer->getStencil()->getID()) {
|
| - frameBuffer->setStencil(NULL);
|
| + frameBuffer->setStencil(nullptr);
|
| }
|
| }
|
| }
|
| @@ -552,7 +552,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLDeleteVertexArrays(GrGLsizei n, const GrGLui
|
|
|
| // Deleting the current vertex array binds object 0
|
| if (GrDebugGL::getInstance()->getVertexArray() == array) {
|
| - GrDebugGL::getInstance()->setVertexArray(NULL);
|
| + GrDebugGL::getInstance()->setVertexArray(nullptr);
|
| }
|
|
|
| if (array->getRefCount()) {
|
| @@ -599,13 +599,13 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLDeleteBuffers(GrGLsizei n, const GrGLuint* i
|
| if (GrDebugGL::getInstance()->getArrayBuffer() &&
|
| ids[i] == GrDebugGL::getInstance()->getArrayBuffer()->getID()) {
|
| // this ID is the current array buffer
|
| - GrDebugGL::getInstance()->setArrayBuffer(NULL);
|
| + GrDebugGL::getInstance()->setArrayBuffer(nullptr);
|
| }
|
| if (GrDebugGL::getInstance()->getElementArrayBuffer() &&
|
| ids[i] ==
|
| GrDebugGL::getInstance()->getElementArrayBuffer()->getID()) {
|
| // this ID is the current element array buffer
|
| - GrDebugGL::getInstance()->setElementArrayBuffer(NULL);
|
| + GrDebugGL::getInstance()->setElementArrayBuffer(nullptr);
|
| }
|
| }
|
|
|
| @@ -631,7 +631,7 @@ GrGLvoid* GR_GL_FUNCTION_TYPE debugGLMapBufferRange(GrGLenum target, GrGLintptr
|
| GrAlwaysAssert(!SkToBool(GR_GL_MAP_READ_BIT & access));
|
| GrAlwaysAssert((GR_GL_MAP_INVALIDATE_BUFFER_BIT | GR_GL_MAP_INVALIDATE_RANGE_BIT) & access);
|
|
|
| - GrBufferObj *buffer = NULL;
|
| + GrBufferObj *buffer = nullptr;
|
| switch (target) {
|
| case GR_GL_ARRAY_BUFFER:
|
| buffer = GrDebugGL::getInstance()->getArrayBuffer();
|
| @@ -652,13 +652,13 @@ GrGLvoid* GR_GL_FUNCTION_TYPE debugGLMapBufferRange(GrGLenum target, GrGLintptr
|
| }
|
|
|
| GrAlwaysAssert(false);
|
| - return NULL; // no buffer bound to the target
|
| + return nullptr; // no buffer bound to the target
|
| }
|
|
|
| GrGLvoid* GR_GL_FUNCTION_TYPE debugGLMapBuffer(GrGLenum target, GrGLenum access) {
|
| GrAlwaysAssert(GR_GL_WRITE_ONLY == access);
|
|
|
| - GrBufferObj *buffer = NULL;
|
| + GrBufferObj *buffer = nullptr;
|
| switch (target) {
|
| case GR_GL_ARRAY_BUFFER:
|
| buffer = GrDebugGL::getInstance()->getArrayBuffer();
|
| @@ -682,7 +682,7 @@ GrGLboolean GR_GL_FUNCTION_TYPE debugGLUnmapBuffer(GrGLenum target) {
|
| GrAlwaysAssert(GR_GL_ARRAY_BUFFER == target ||
|
| GR_GL_ELEMENT_ARRAY_BUFFER == target);
|
|
|
| - GrBufferObj *buffer = NULL;
|
| + GrBufferObj *buffer = nullptr;
|
| switch (target) {
|
| case GR_GL_ARRAY_BUFFER:
|
| buffer = GrDebugGL::getInstance()->getArrayBuffer();
|
| @@ -711,7 +711,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLFlushMappedBufferRange(GrGLenum target,
|
| GrAlwaysAssert(GR_GL_ARRAY_BUFFER == target ||
|
| GR_GL_ELEMENT_ARRAY_BUFFER == target);
|
|
|
| - GrBufferObj *buffer = NULL;
|
| + GrBufferObj *buffer = nullptr;
|
| switch (target) {
|
| case GR_GL_ARRAY_BUFFER:
|
| buffer = GrDebugGL::getInstance()->getArrayBuffer();
|
| @@ -742,7 +742,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLGetBufferParameteriv(GrGLenum target,
|
| GrAlwaysAssert(GR_GL_BUFFER_SIZE == value ||
|
| GR_GL_BUFFER_USAGE == value);
|
|
|
| - GrBufferObj *buffer = NULL;
|
| + GrBufferObj *buffer = nullptr;
|
| switch (target) {
|
| case GR_GL_ARRAY_BUFFER:
|
| buffer = GrDebugGL::getInstance()->getArrayBuffer();
|
| @@ -784,7 +784,7 @@ public:
|
|
|
|
|
| GrDebugGLInterface()
|
| - : fWrapped(NULL) {
|
| + : fWrapped(nullptr) {
|
| GrDebugGL::staticRef();
|
| }
|
|
|
|
|