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/Context.cpp b/src/libANGLE/Context.cpp
index b711081..58ed24d 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -1772,7 +1772,7 @@
}
}
-void Context::drawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
+void Context::drawElements(GLenum mode, GLsizei count, GLenum type, const void *indices)
{
syncRendererState();
const IndexRange &indexRange = getParams<HasIndexRange>().getIndexRange().value();
@@ -1782,7 +1782,7 @@
void Context::drawElementsInstanced(GLenum mode,
GLsizei count,
GLenum type,
- const GLvoid *indices,
+ const void *indices,
GLsizei instances)
{
syncRendererState();
@@ -1796,7 +1796,7 @@
GLuint end,
GLsizei count,
GLenum type,
- const GLvoid *indices)
+ const void *indices)
{
syncRendererState();
const IndexRange &indexRange = getParams<HasIndexRange>().getIndexRange().value();
@@ -1804,13 +1804,13 @@
mImplementation->drawRangeElements(mode, start, end, count, type, indices, indexRange));
}
-void Context::drawArraysIndirect(GLenum mode, const GLvoid *indirect)
+void Context::drawArraysIndirect(GLenum mode, const void *indirect)
{
syncRendererState();
handleError(mImplementation->drawArraysIndirect(mode, indirect));
}
-void Context::drawElementsIndirect(GLenum mode, GLenum type, const GLvoid *indirect)
+void Context::drawElementsIndirect(GLenum mode, GLenum type, const void *indirect)
{
syncRendererState();
handleError(mImplementation->drawElementsIndirect(mode, type, indirect));
@@ -2763,7 +2763,7 @@
GLsizei height,
GLenum format,
GLenum type,
- GLvoid *pixels)
+ void *pixels)
{
if (width == 0 || height == 0)
{
@@ -3026,7 +3026,7 @@
GLint border,
GLenum format,
GLenum type,
- const GLvoid *pixels)
+ const void *pixels)
{
syncStateForTexImage();
@@ -3046,7 +3046,7 @@
GLint border,
GLenum format,
GLenum type,
- const GLvoid *pixels)
+ const void *pixels)
{
syncStateForTexImage();
@@ -3064,7 +3064,7 @@
GLsizei height,
GLenum format,
GLenum type,
- const GLvoid *pixels)
+ const void *pixels)
{
// Zero sized uploads are valid but no-ops
if (width == 0 || height == 0)
@@ -3091,7 +3091,7 @@
GLsizei depth,
GLenum format,
GLenum type,
- const GLvoid *pixels)
+ const void *pixels)
{
// Zero sized uploads are valid but no-ops
if (width == 0 || height == 0 || depth == 0)
@@ -3114,7 +3114,7 @@
GLsizei height,
GLint border,
GLsizei imageSize,
- const GLvoid *data)
+ const void *data)
{
syncStateForTexImage();
@@ -3134,7 +3134,7 @@
GLsizei depth,
GLint border,
GLsizei imageSize,
- const GLvoid *data)
+ const void *data)
{
syncStateForTexImage();
@@ -3153,7 +3153,7 @@
GLsizei height,
GLenum format,
GLsizei imageSize,
- const GLvoid *data)
+ const void *data)
{
syncStateForTexImage();
@@ -3175,7 +3175,7 @@
GLsizei depth,
GLenum format,
GLsizei imageSize,
- const GLvoid *data)
+ const void *data)
{
// Zero sized uploads are valid but no-ops
if (width == 0 || height == 0)
@@ -3267,7 +3267,7 @@
QueryBufferPointerv(buffer, pname, params);
}
-GLvoid *Context::mapBuffer(GLenum target, GLenum access)
+void *Context::mapBuffer(GLenum target, GLenum access)
{
Buffer *buffer = mGLState.getTargetBuffer(target);
ASSERT(buffer);
@@ -3298,10 +3298,7 @@
return result;
}
-GLvoid *Context::mapBufferRange(GLenum target,
- GLintptr offset,
- GLsizeiptr length,
- GLbitfield access)
+void *Context::mapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
{
Buffer *buffer = mGLState.getTargetBuffer(target);
ASSERT(buffer);
@@ -3346,7 +3343,7 @@
mGLState.setActiveSampler(texture - GL_TEXTURE0);
}
-void Context::blendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
+void Context::blendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
{
mGLState.setBlendColor(clamp01(red), clamp01(green), clamp01(blue), clamp01(alpha));
}
@@ -3371,12 +3368,12 @@
mGLState.setBlendFactors(srcRGB, dstRGB, srcAlpha, dstAlpha);
}
-void Context::clearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
+void Context::clearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
{
mGLState.setColorClearValue(red, green, blue, alpha);
}
-void Context::clearDepthf(GLclampf depth)
+void Context::clearDepthf(GLfloat depth)
{
mGLState.setDepthClearValue(depth);
}
@@ -3406,7 +3403,7 @@
mGLState.setDepthMask(flag != GL_FALSE);
}
-void Context::depthRangef(GLclampf zNear, GLclampf zFar)
+void Context::depthRangef(GLfloat zNear, GLfloat zFar)
{
mGLState.setDepthRange(zNear, zFar);
}
@@ -3526,7 +3523,7 @@
mGLState.setPolygonOffsetParams(factor, units);
}
-void Context::sampleCoverage(GLclampf value, GLboolean invert)
+void Context::sampleCoverage(GLfloat value, GLboolean invert)
{
mGLState.setSampleCoverageParams(clamp01(value), invert == GL_TRUE);
}
@@ -3627,7 +3624,7 @@
GLenum type,
GLboolean normalized,
GLsizei stride,
- const GLvoid *ptr)
+ const void *ptr)
{
mGLState.setVertexAttribState(index, mGLState.getTargetBuffer(GL_ARRAY_BUFFER), size, type,
normalized == GL_TRUE, false, stride, ptr);
@@ -3670,7 +3667,7 @@
GLint size,
GLenum type,
GLsizei stride,
- const GLvoid *pointer)
+ const void *pointer)
{
mGLState.setVertexAttribState(index, mGLState.getTargetBuffer(GL_ARRAY_BUFFER), size, type,
false, true, stride, pointer);
@@ -3734,7 +3731,7 @@
currentValues, pname, params);
}
-void Context::getVertexAttribPointerv(GLuint index, GLenum pname, GLvoid **pointer)
+void Context::getVertexAttribPointerv(GLuint index, GLenum pname, void **pointer)
{
const VertexAttribute &attrib = getGLState().getVertexArray()->getVertexAttribute(index);
QueryVertexAttribPointerv(attrib, pname, pointer);
@@ -3792,14 +3789,14 @@
mGLState.getDebug().popGroup();
}
-void Context::bufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)
+void Context::bufferData(GLenum target, GLsizeiptr size, const void *data, GLenum usage)
{
Buffer *buffer = mGLState.getTargetBuffer(target);
ASSERT(buffer);
handleError(buffer->bufferData(this, target, data, size, usage));
}
-void Context::bufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)
+void Context::bufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const void *data)
{
if (data == nullptr)
{
@@ -4445,7 +4442,7 @@
void Context::shaderBinary(GLsizei n,
const GLuint *shaders,
GLenum binaryformat,
- const GLvoid *binary,
+ const void *binary,
GLsizei length)
{
// No binary shader formats are supported.