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/validationES.cpp

diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index a85f29e..fd4c53d 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -235,7 +235,7 @@
                             GLsizei *length,
                             GLsizei *columns,
                             GLsizei *rows,
-                            GLvoid *pixels)
+                            void *pixels)
 {
     if (length != nullptr)
     {
@@ -2228,7 +2228,7 @@
                         GLsizei depth,
                         GLenum internalFormat,
                         GLenum type,
-                        const GLvoid *pixels,
+                        const void *pixels,
                         GLsizei imageSize)
 {
     gl::Buffer *pixelUnpackBuffer = context->getGLState().getTargetBuffer(GL_PIXEL_UNPACK_BUFFER);
@@ -2316,7 +2316,7 @@
                                       GLenum type,
                                       GLboolean normalized,
                                       GLsizei stride,
-                                      const GLvoid *ptr,
+                                      const void *ptr,
                                       bool pureInteger)
 {
     ASSERT(context->getExtensions().webglCompatibility);
@@ -2786,7 +2786,7 @@
                         GLsizei height,
                         GLenum format,
                         GLenum type,
-                        GLvoid *pixels)
+                        void *pixels)
 {
     return ValidateReadPixelsBase(context, x, y, width, height, format, type, -1, nullptr, nullptr,
                                   nullptr, pixels);
@@ -2803,7 +2803,7 @@
                                    GLsizei *length,
                                    GLsizei *columns,
                                    GLsizei *rows,
-                                   GLvoid *pixels)
+                                   void *pixels)
 {
     if (!ValidateRobustEntryPoint(context, bufSize))
     {
@@ -2832,7 +2832,7 @@
                             GLenum format,
                             GLenum type,
                             GLsizei bufSize,
-                            GLvoid *pixels)
+                            void *pixels)
 {
     if (bufSize < 0)
     {
@@ -2855,7 +2855,7 @@
                                     GLsizei *length,
                                     GLsizei *columns,
                                     GLsizei *rows,
-                                    GLvoid *data)
+                                    void *data)
 {
     if (!ValidateRobustEntryPoint(context, bufSize))
     {
@@ -3958,7 +3958,7 @@
                                 GLenum mode,
                                 GLsizei count,
                                 GLenum type,
-                                const GLvoid *indices,
+                                const void *indices,
                                 GLsizei primcount)
 {
     if (!ValidateDrawElementsBase(context, type))
@@ -4099,7 +4099,7 @@
                                          GLenum mode,
                                          GLsizei count,
                                          GLenum type,
-                                         const GLvoid *indices,
+                                         const void *indices,
                                          GLsizei primcount)
 {
     if (context->getExtensions().webglCompatibility && !ValidateDrawInstancedANGLEAndWebGL(context))
@@ -4114,7 +4114,7 @@
                                         GLenum mode,
                                         GLsizei count,
                                         GLenum type,
-                                        const GLvoid *indices,
+                                        const void *indices,
                                         GLsizei primcount)
 {
     if (!ValidateDrawInstancedANGLEAndWebGL(context))