commit 876429b7a11f482ebc4c19e44d07ba29823a2ecb
author Jamie Madill <jmadill@chromium.org> Thu Apr 20 15:46:24 2017 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Apr 27 16:32:22 2017 +0000
tree 651060f3050227aaac80a021fd53c81d6cc19271
parent e1fd475b09bcfee3c8ab0201e4e7f683b5df3408

Update gl2.h and update entry points.

Some method signatures were updated. Types like GLclampf and GLvoid
were replaced with other equivalents.

BUG=angleproject:1309

Change-Id: I05e8e2072c5a063d87ad96a855b907424661e680
Reviewed-on: https://chromium-review.googlesource.com/475011
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/renderer/gl/VertexArrayGL.cpp

diff --git a/src/libANGLE/renderer/gl/VertexArrayGL.cpp b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
index b0552c9..5ebf1c6 100644
--- a/src/libANGLE/renderer/gl/VertexArrayGL.cpp
+++ b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
@@ -91,10 +91,10 @@
 gl::Error VertexArrayGL::syncDrawElementsState(const gl::AttributesMask &activeAttributesMask,
                                                GLsizei count,
                                                GLenum type,
-                                               const GLvoid *indices,
+                                               const void *indices,
                                                GLsizei instanceCount,
                                                bool primitiveRestartEnabled,
-                                               const GLvoid **outIndices) const
+                                               const void **outIndices) const
 {
     return syncDrawState(activeAttributesMask, 0, count, type, indices, instanceCount,
                          primitiveRestartEnabled, outIndices);
@@ -118,10 +118,10 @@
                                        GLint first,
                                        GLsizei count,
                                        GLenum type,
-                                       const GLvoid *indices,
+                                       const void *indices,
                                        GLsizei instanceCount,
                                        bool primitiveRestartEnabled,
-                                       const GLvoid **outIndices) const
+                                       const void **outIndices) const
 {
     mStateManager->bindVertexArray(mVertexArrayID, getAppliedElementArrayBufferID());
 
@@ -162,11 +162,11 @@
 
 gl::Error VertexArrayGL::syncIndexData(GLsizei count,
                                        GLenum type,
-                                       const GLvoid *indices,
+                                       const void *indices,
                                        bool primitiveRestartEnabled,
                                        bool attributesNeedStreaming,
                                        IndexRange *outIndexRange,
-                                       const GLvoid **outIndices) const
+                                       const void **outIndices) const
 {
     ASSERT(outIndices);
 
@@ -371,17 +371,15 @@
             if (attrib.pureInteger)
             {
                 ASSERT(!attrib.normalized);
-                mFunctions->vertexAttribIPointer(
-                    static_cast<GLuint>(idx), attrib.size, attrib.type,
-                    static_cast<GLsizei>(destStride),
-                    reinterpret_cast<const GLvoid *>(vertexStartOffset));
+                mFunctions->vertexAttribIPointer(static_cast<GLuint>(idx), attrib.size, attrib.type,
+                                                 static_cast<GLsizei>(destStride),
+                                                 reinterpret_cast<const void *>(vertexStartOffset));
             }
             else
             {
-                mFunctions->vertexAttribPointer(
-                    static_cast<GLuint>(idx), attrib.size, attrib.type, attrib.normalized,
-                    static_cast<GLsizei>(destStride),
-                    reinterpret_cast<const GLvoid *>(vertexStartOffset));
+                mFunctions->vertexAttribPointer(static_cast<GLuint>(idx), attrib.size, attrib.type,
+                                                attrib.normalized, static_cast<GLsizei>(destStride),
+                                                reinterpret_cast<const void *>(vertexStartOffset));
             }
 
             curBufferOffset += destStride * streamedVertexCount;
@@ -489,7 +487,7 @@
     ASSERT(arrayBuffer != nullptr);
     const BufferGL *arrayBufferGL = GetImplAs<BufferGL>(arrayBuffer);
     mStateManager->bindBuffer(GL_ARRAY_BUFFER, arrayBufferGL->getBufferID());
-    const GLvoid *inputPointer =
+    const void *inputPointer =
         reinterpret_cast<const uint8_t *>(binding.offset + attrib.relativeOffset);
 
     if (attrib.pureInteger)