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/tests/gl_tests/BufferDataTest.cpp

diff --git a/src/tests/gl_tests/BufferDataTest.cpp b/src/tests/gl_tests/BufferDataTest.cpp
index adcfc4a..e63b5b2 100644
--- a/src/tests/gl_tests/BufferDataTest.cpp
+++ b/src/tests/gl_tests/BufferDataTest.cpp
@@ -97,14 +97,14 @@
     for (int i = 0; i < numIterations; ++i)
     {
         GLsizei bufferSize = sizeof(GLfloat) * (i + 1);
-        glBufferData(GL_ARRAY_BUFFER, bufferSize, NULL, GL_STATIC_DRAW);
+        glBufferData(GL_ARRAY_BUFFER, bufferSize, nullptr, GL_STATIC_DRAW);
         EXPECT_GL_NO_ERROR();
 
         for (int j = 0; j < bufferSize; j++)
         {
             for (int k = 0; k < bufferSize - j; k++)
             {
-                glBufferSubData(GL_ARRAY_BUFFER, k, j, NULL);
+                glBufferSubData(GL_ARRAY_BUFFER, k, j, nullptr);
                 ASSERT_GL_NO_ERROR();
             }
         }
@@ -129,10 +129,10 @@
 TEST_P(BufferDataTest, NULLResolvedData)
 {
     glBindBuffer(GL_ARRAY_BUFFER, mBuffer);
-    glBufferData(GL_ARRAY_BUFFER, 128, NULL, GL_DYNAMIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, 128, nullptr, GL_DYNAMIC_DRAW);
 
     glUseProgram(mProgram);
-    glVertexAttribPointer(mAttribLocation, 1, GL_FLOAT, GL_FALSE, 4, NULL);
+    glVertexAttribPointer(mAttribLocation, 1, GL_FLOAT, GL_FALSE, 4, nullptr);
     glEnableVertexAttribArray(mAttribLocation);
     glBindBuffer(GL_ARRAY_BUFFER, 0);
 
@@ -159,7 +159,7 @@
         }
     }
 
-    ASSERT_NE(static_cast<uint8_t*>(NULL), data);
+    ASSERT_NE(static_cast<uint8_t *>(nullptr), data);
     memset(data, 0, allocSize);
 
     float * fValue = reinterpret_cast<float*>(data);
@@ -179,11 +179,11 @@
         // DISABLED because it takes a long time, but left for posterity
 
         //glUseProgram(mProgram);
-        //glVertexAttribPointer(mAttribLocation, 1, GL_FLOAT, GL_FALSE, 4, NULL);
-        //glEnableVertexAttribArray(mAttribLocation);
-        //glBindBuffer(GL_ARRAY_BUFFER, 0);
-        //drawQuad(mProgram, "position", 0.5f);
-        //swapBuffers();
+        // glVertexAttribPointer(mAttribLocation, 1, GL_FLOAT, GL_FALSE, 4, nullptr);
+        // glEnableVertexAttribArray(mAttribLocation);
+        // glBindBuffer(GL_ARRAY_BUFFER, 0);
+        // drawQuad(mProgram, "position", 0.5f);
+        // swapBuffers();
 
         //// Draw operations can also generate out-of-memory, which is in-spec
         //error = glGetError();
@@ -329,7 +329,7 @@
     glBufferData(GL_ARRAY_BUFFER, sizeof(char) * 6, vertexData, GL_STATIC_DRAW);
 
     glUseProgram(mProgram);
-    glVertexAttribPointer(mAttribLocation, 3, GL_UNSIGNED_BYTE, GL_TRUE, 3, NULL);
+    glVertexAttribPointer(mAttribLocation, 3, GL_UNSIGNED_BYTE, GL_TRUE, 3, nullptr);
     glEnableVertexAttribArray(mAttribLocation);
 
     ASSERT_GL_NO_ERROR();
@@ -341,7 +341,7 @@
 
     ASSERT_GL_NO_ERROR();
 
-    glDrawElements(GL_POINTS, 1, GL_UNSIGNED_INT, NULL);
+    glDrawElements(GL_POINTS, 1, GL_UNSIGNED_INT, nullptr);
 
     EXPECT_GL_NO_ERROR();
     EXPECT_PIXEL_EQ(0, 0, 255, 0, 0, 255);
@@ -361,7 +361,7 @@
     unsigned char newData[] = { 0, 255, 0 };
     glBufferSubData(GL_ARRAY_BUFFER, 3, 3, newData);
 
-    glDrawElements(GL_POINTS, 1, GL_UNSIGNED_INT, NULL);
+    glDrawElements(GL_POINTS, 1, GL_UNSIGNED_INT, nullptr);
 
     EXPECT_GL_NO_ERROR();
     EXPECT_PIXEL_EQ(0, 0, 0, 255, 0, 255);
@@ -387,7 +387,7 @@
     // To trigger the bug, the buffer need to be big enough because some hardware copy buffers
     // by chunks of pages instead of the minimum number of bytes neeeded.
     const size_t numBytes = 4096*4;
-    glBufferData(GL_ARRAY_BUFFER, numBytes, NULL, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, numBytes, nullptr, GL_STATIC_DRAW);
 
     // Copy the original data to the buffer
     uint8_t srcBytes[numBytes];