commit f81ce4a37467f47ae39873fc65eb8101af1b2631
author Yunchao He <yunchao.he@intel.com> Mon Apr 24 10:49:17 2017 +0800
committer Commit Bot <commit-bot@chromium.org> Tue Apr 25 14:32:47 2017 +0000
tree cbc80e19732b7e460256aeecb6b07208088815e1
parent f58417747f869a1e6933f68618433d209fba1cc4

Refactoring: replace NULL by nullptr for pointers (3rd CL).

This CL mainly handles passing/returning NULL to/from a function.

BUG=angleproject:2001

Change-Id: I34802f792e710e3d7ff697cbe4701dc1bf5ab009
Reviewed-on: https://chromium-review.googlesource.com/485060
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/State.cpp

diff --git a/src/libANGLE/State.cpp b/src/libANGLE/State.cpp
index b29969b..2932978 100644
--- a/src/libANGLE/State.cpp
+++ b/src/libANGLE/State.cpp
@@ -228,17 +228,17 @@
         TextureBindingVector &textureVector = bindingVec->second;
         for (size_t textureIdx = 0; textureIdx < textureVector.size(); textureIdx++)
         {
-            textureVector[textureIdx].set(NULL);
+            textureVector[textureIdx].set(nullptr);
         }
     }
     for (size_t samplerIdx = 0; samplerIdx < mSamplers.size(); samplerIdx++)
     {
-        mSamplers[samplerIdx].set(NULL);
+        mSamplers[samplerIdx].set(nullptr);
     }
 
-    mArrayBuffer.set(NULL);
-    mDrawIndirectBuffer.set(NULL);
-    mRenderbuffer.set(NULL);
+    mArrayBuffer.set(nullptr);
+    mDrawIndirectBuffer.set(nullptr);
+    mRenderbuffer.set(nullptr);
 
     if (mProgram)
     {
@@ -246,24 +246,24 @@
     }
     mProgram = nullptr;
 
-    mTransformFeedback.set(NULL);
+    mTransformFeedback.set(nullptr);
 
     for (State::ActiveQueryMap::iterator i = mActiveQueries.begin(); i != mActiveQueries.end(); i++)
     {
-        i->second.set(NULL);
+        i->second.set(nullptr);
     }
 
-    mGenericUniformBuffer.set(NULL);
+    mGenericUniformBuffer.set(nullptr);
     for (BufferVector::iterator bufItr = mUniformBuffers.begin(); bufItr != mUniformBuffers.end(); ++bufItr)
     {
-        bufItr->set(NULL);
+        bufItr->set(nullptr);
     }
 
-    mCopyReadBuffer.set(NULL);
-    mCopyWriteBuffer.set(NULL);
+    mCopyReadBuffer.set(nullptr);
+    mCopyWriteBuffer.set(nullptr);
 
-    mPack.pixelBuffer.set(NULL);
-    mUnpack.pixelBuffer.set(NULL);
+    mPack.pixelBuffer.set(nullptr);
+    mUnpack.pixelBuffer.set(nullptr);
 
     mGenericAtomicCounterBuffer.set(nullptr);
     for (auto &buf : mAtomicCounterBuffers)
@@ -884,7 +884,7 @@
         BindingPointer<Sampler> &samplerBinding = mSamplers[textureUnit];
         if (samplerBinding.id() == sampler)
         {
-            samplerBinding.set(NULL);
+            samplerBinding.set(nullptr);
         }
     }
 }
@@ -912,7 +912,7 @@
 
     if (mRenderbuffer.id() == renderbuffer)
     {
-        mRenderbuffer.set(NULL);
+        mRenderbuffer.set(nullptr);
     }
 
     // [OpenGL ES 2.0.24] section 4.4 page 111:
@@ -974,7 +974,7 @@
             return mDrawFramebuffer;
         default:
             UNREACHABLE();
-            return NULL;
+            return nullptr;
     }
 }
 
@@ -1297,7 +1297,9 @@
           return mGenericShaderStorageBuffer.get();
       case GL_DRAW_INDIRECT_BUFFER:
           return mDrawIndirectBuffer.get();
-      default: UNREACHABLE();            return NULL;
+      default:
+          UNREACHABLE();
+          return nullptr;
     }
 }