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

diff --git a/src/libANGLE/renderer/gl/FramebufferGL.cpp b/src/libANGLE/renderer/gl/FramebufferGL.cpp
index 9152722..cd22e88 100644
--- a/src/libANGLE/renderer/gl/FramebufferGL.cpp
+++ b/src/libANGLE/renderer/gl/FramebufferGL.cpp
@@ -261,7 +261,7 @@
                                 const gl::Rectangle &area,
                                 GLenum format,
                                 GLenum type,
-                                GLvoid *pixels) const
+                                void *pixels) const
 {
     // TODO: don't sync the pixel pack state here once the dirty bits contain the pixel pack buffer
     // binding
@@ -582,7 +582,7 @@
                                                       GLenum format,
                                                       GLenum type,
                                                       const gl::PixelPackState &pack,
-                                                      GLvoid *pixels) const
+                                                      void *pixels) const
 {
     intptr_t offset = reinterpret_cast<intptr_t>(pixels);
 
@@ -603,7 +603,7 @@
     for (GLint row = 0; row < area.height; ++row)
     {
         mFunctions->readPixels(area.x, row + area.y, area.width, 1, format, type,
-                               reinterpret_cast<GLvoid *>(offset));
+                               reinterpret_cast<void *>(offset));
         offset += row * rowBytes;
     }
 
@@ -614,7 +614,7 @@
                                                      GLenum format,
                                                      GLenum type,
                                                      const gl::PixelPackState &pack,
-                                                     GLvoid *pixels) const
+                                                     void *pixels) const
 {
     const gl::InternalFormat &glFormat = gl::GetInternalFormatInfo(format, type);
     GLuint rowBytes = 0;
@@ -639,7 +639,7 @@
     intptr_t lastRowOffset =
         reinterpret_cast<intptr_t>(pixels) + skipBytes + (area.height - 1) * rowBytes;
     mFunctions->readPixels(area.x, area.y + area.height - 1, area.width, 1, format, type,
-                           reinterpret_cast<GLvoid *>(lastRowOffset));
+                           reinterpret_cast<void *>(lastRowOffset));
 
     return gl::NoError();
 }