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>
diff --git a/src/libANGLE/validationES3.cpp b/src/libANGLE/validationES3.cpp
index 1b1961f..f37e60e 100644
--- a/src/libANGLE/validationES3.cpp
+++ b/src/libANGLE/validationES3.cpp
@@ -101,7 +101,7 @@
GLenum format,
GLenum type,
GLsizei imageSize,
- const GLvoid *pixels)
+ const void *pixels)
{
// Validate image size
if (!ValidImageSizeParameters(context, target, level, width, height, depth, isSubImage))
@@ -350,7 +350,7 @@
GLenum format,
GLenum type,
GLsizei imageSize,
- const GLvoid *pixels)
+ const void *pixels)
{
if (!ValidTexture2DDestinationTarget(context, target))
{
@@ -379,7 +379,7 @@
GLenum format,
GLenum type,
GLsizei bufSize,
- const GLvoid *pixels)
+ const void *pixels)
{
if (!ValidTexture3DDestinationTarget(context, target))
{
@@ -1080,7 +1080,7 @@
GLuint end,
GLsizei count,
GLenum type,
- const GLvoid *indices)
+ const void *indices)
{
if (context->getClientMajorVersion() < 3)
{
@@ -1190,7 +1190,7 @@
GLsizei depth,
GLint border,
GLsizei imageSize,
- const GLvoid *data)
+ const void *data)
{
if (context->getClientMajorVersion() < 3)
{
@@ -1260,7 +1260,7 @@
GLint border,
GLsizei imageSize,
GLsizei dataSize,
- const GLvoid *data)
+ const void *data)
{
if (!ValidateRobustCompressedTexImageBase(context, imageSize, dataSize))
{
@@ -1726,7 +1726,7 @@
GLint border,
GLenum format,
GLenum type,
- const GLvoid *pixels)
+ const void *pixels)
{
if (context->getClientMajorVersion() < 3)
{
@@ -1750,7 +1750,7 @@
GLenum format,
GLenum type,
GLsizei bufSize,
- const GLvoid *pixels)
+ const void *pixels)
{
if (context->getClientMajorVersion() < 3)
{
@@ -1779,7 +1779,7 @@
GLsizei depth,
GLenum format,
GLenum type,
- const GLvoid *pixels)
+ const void *pixels)
{
if (context->getClientMajorVersion() < 3)
{
@@ -1804,7 +1804,7 @@
GLenum format,
GLenum type,
GLsizei bufSize,
- const GLvoid *pixels)
+ const void *pixels)
{
if (context->getClientMajorVersion() < 3)
{
@@ -1833,7 +1833,7 @@
GLsizei depth,
GLenum format,
GLsizei imageSize,
- const GLvoid *data)
+ const void *data)
{
if (context->getClientMajorVersion() < 3)
{
@@ -1882,7 +1882,7 @@
GLenum format,
GLsizei imageSize,
GLsizei dataSize,
- const GLvoid *data)
+ const void *data)
{
if (!ValidateRobustCompressedTexImageBase(context, imageSize, dataSize))
{
@@ -2003,7 +2003,7 @@
return true;
}
-bool ValidateGetBufferPointerv(Context *context, GLenum target, GLenum pname, GLvoid **params)
+bool ValidateGetBufferPointerv(Context *context, GLenum target, GLenum pname, void **params)
{
return ValidateGetBufferPointervBase(context, target, pname, nullptr, params);
}
@@ -2013,7 +2013,7 @@
GLenum pname,
GLsizei bufSize,
GLsizei *length,
- GLvoid **params)
+ void **params)
{
if (!ValidateRobustEntryPoint(context, bufSize))
{
@@ -2455,7 +2455,7 @@
GLint size,
GLenum type,
GLsizei stride,
- const GLvoid *pointer)
+ const void *pointer)
{
if (context->getClientMajorVersion() < 3)
{
@@ -2567,7 +2567,7 @@
GLenum mode,
GLsizei count,
GLenum type,
- const GLvoid *indices,
+ const void *indices,
GLsizei instanceCount)
{
if (context->getClientMajorVersion() < 3)