Skip to content

A
angle
Commit 59770806 by Brandon Jones Committed by Commit Bot
Options

Refactor ANGLE Extensions Context Calls

Refactors ANGLE extensions context calls into a common format for future autogeneration. Any work that occurred in the entry point has been moved into its own context member function. Bug:angleproject:2263 Change-Id: I91cb3aca6a8c135ed3ae80a723d6cf16b54aeda6 Reviewed-on: https://chromium-review.googlesource.com/990809Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent b8e39660
Showing with 841 additions and 114 deletions
src/libANGLE/Context.cpp
...@@ -625,7 +625,7 @@ GLuint Context::createRenderbuffer() ...@@ -625,7 +625,7 @@ GLuint Context::createRenderbuffer()
return mState.mRenderbuffers->createRenderbuffer(); return mState.mRenderbuffers->createRenderbuffer();
} }
GLuint Context::createPaths(GLsizei range) GLuint Context::genPaths(GLsizei range)
{ {
auto resultOrError = mState.mPaths->createPaths(mImplementation.get(), range); auto resultOrError = mState.mPaths->createPaths(mImplementation.get(), range);
if (resultOrError.isError()) if (resultOrError.isError())
...@@ -728,7 +728,7 @@ void Context::deletePaths(GLuint first, GLsizei range) ...@@ -728,7 +728,7 @@ void Context::deletePaths(GLuint first, GLsizei range)
mState.mPaths->deletePaths(first, range); mState.mPaths->deletePaths(first, range);
} }
bool Context::hasPathData(GLuint path) const bool Context::isPath(GLuint path) const
{ {
const auto *pathObj = mState.mPaths->getPath(path); const auto *pathObj = mState.mPaths->getPath(path);
if (pathObj == nullptr) if (pathObj == nullptr)
...@@ -737,12 +737,12 @@ bool Context::hasPathData(GLuint path) const ...@@ -737,12 +737,12 @@ bool Context::hasPathData(GLuint path) const
return pathObj->hasPathData(); return pathObj->hasPathData();
} }
bool Context::hasPath(GLuint path) const bool Context::isPathGenerated(GLuint path) const
{ {
return mState.mPaths->hasPath(path); return mState.mPaths->hasPath(path);
} }
void Context::setPathCommands(GLuint path, void Context::pathCommands(GLuint path,
GLsizei numCommands, GLsizei numCommands,
const GLubyte *commands, const GLubyte *commands,
GLsizei numCoords, GLsizei numCoords,
...@@ -822,7 +822,7 @@ void Context::getPathParameteriv(GLuint path, GLenum pname, GLint *value) ...@@ -822,7 +822,7 @@ void Context::getPathParameteriv(GLuint path, GLenum pname, GLint *value)
*value = static_cast<GLint>(val); *value = static_cast<GLint>(val);
} }
void Context::setPathStencilFunc(GLenum func, GLint ref, GLuint mask) void Context::pathStencilFunc(GLenum func, GLint ref, GLuint mask)
{ {
mGLState.setPathStencilFunc(func, ref, mask); mGLState.setPathStencilFunc(func, ref, mask);
} }
...@@ -1131,26 +1131,71 @@ void Context::getQueryiv(GLenum target, GLenum pname, GLint *params) ...@@ -1131,26 +1131,71 @@ void Context::getQueryiv(GLenum target, GLenum pname, GLint *params)
} }
} }
void Context::getQueryivRobust(GLenum target,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params)
{
getQueryiv(target, pname, params);
}
void Context::getQueryObjectiv(GLuint id, GLenum pname, GLint *params) void Context::getQueryObjectiv(GLuint id, GLenum pname, GLint *params)
{ {
handleError(GetQueryObjectParameter(getQuery(id), pname, params)); handleError(GetQueryObjectParameter(getQuery(id), pname, params));
} }
void Context::getQueryObjectivRobust(GLuint id,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params)
{
getQueryObjectiv(id, pname, params);
}
void Context::getQueryObjectuiv(GLuint id, GLenum pname, GLuint *params) void Context::getQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
{ {
handleError(GetQueryObjectParameter(getQuery(id), pname, params)); handleError(GetQueryObjectParameter(getQuery(id), pname, params));
} }
void Context::getQueryObjectuivRobust(GLuint id,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLuint *params)
{
getQueryObjectuiv(id, pname, params);
}
void Context::getQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params) void Context::getQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params)
{ {
handleError(GetQueryObjectParameter(getQuery(id), pname, params)); handleError(GetQueryObjectParameter(getQuery(id), pname, params));
} }
void Context::getQueryObjecti64vRobust(GLuint id,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint64 *params)
{
getQueryObjecti64v(id, pname, params);
}
void Context::getQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params) void Context::getQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
{ {
handleError(GetQueryObjectParameter(getQuery(id), pname, params)); handleError(GetQueryObjectParameter(getQuery(id), pname, params));
} }
void Context::getQueryObjectui64vRobust(GLuint id,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLuint64 *params)
{
getQueryObjectui64v(id, pname, params);
}
Framebuffer *Context::getFramebuffer(GLuint handle) const Framebuffer *Context::getFramebuffer(GLuint handle) const
{ {
return mState.mFramebuffers->getFramebuffer(handle); return mState.mFramebuffers->getFramebuffer(handle);
...@@ -1681,6 +1726,15 @@ void Context::getIntegeri_v(GLenum target, GLuint index, GLint *data) ...@@ -1681,6 +1726,15 @@ void Context::getIntegeri_v(GLenum target, GLuint index, GLint *data)
} }
} }
void Context::getIntegeri_vRobust(GLenum target,
GLuint index,
GLsizei bufSize,
GLsizei *length,
GLint *data)
{
getIntegeri_v(target, index, data);
}
void Context::getInteger64i_v(GLenum target, GLuint index, GLint64 *data) void Context::getInteger64i_v(GLenum target, GLuint index, GLint64 *data)
{ {
// Queries about context capabilities and maximums are answered by Context. // Queries about context capabilities and maximums are answered by Context.
...@@ -1701,6 +1755,15 @@ void Context::getInteger64i_v(GLenum target, GLuint index, GLint64 *data) ...@@ -1701,6 +1755,15 @@ void Context::getInteger64i_v(GLenum target, GLuint index, GLint64 *data)
} }
} }
void Context::getInteger64i_vRobust(GLenum target,
GLuint index,
GLsizei bufSize,
GLsizei *length,
GLint64 *data)
{
getInteger64i_v(target, index, data);
}
void Context::getBooleani_v(GLenum target, GLuint index, GLboolean *data) void Context::getBooleani_v(GLenum target, GLuint index, GLboolean *data)
{ {
// Queries about context capabilities and maximums are answered by Context. // Queries about context capabilities and maximums are answered by Context.
...@@ -1721,12 +1784,30 @@ void Context::getBooleani_v(GLenum target, GLuint index, GLboolean *data) ...@@ -1721,12 +1784,30 @@ void Context::getBooleani_v(GLenum target, GLuint index, GLboolean *data)
} }
} }
void Context::getBooleani_vRobust(GLenum target,
GLuint index,
GLsizei bufSize,
GLsizei *length,
GLboolean *data)
{
getBooleani_v(target, index, data);
}
void Context::getBufferParameteriv(BufferBinding target, GLenum pname, GLint *params) void Context::getBufferParameteriv(BufferBinding target, GLenum pname, GLint *params)
{ {
Buffer *buffer = mGLState.getTargetBuffer(target); Buffer *buffer = mGLState.getTargetBuffer(target);
QueryBufferParameteriv(buffer, pname, params); QueryBufferParameteriv(buffer, pname, params);
} }
void Context::getBufferParameterivRobust(BufferBinding target,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params)
{
getBufferParameteriv(target, pname, params);
}
void Context::getFramebufferAttachmentParameteriv(GLenum target, void Context::getFramebufferAttachmentParameteriv(GLenum target,
GLenum attachment, GLenum attachment,
GLenum pname, GLenum pname,
...@@ -1736,24 +1817,61 @@ void Context::getFramebufferAttachmentParameteriv(GLenum target, ...@@ -1736,24 +1817,61 @@ void Context::getFramebufferAttachmentParameteriv(GLenum target,
QueryFramebufferAttachmentParameteriv(this, framebuffer, attachment, pname, params); QueryFramebufferAttachmentParameteriv(this, framebuffer, attachment, pname, params);
} }
void Context::getFramebufferAttachmentParameterivRobust(GLenum target,
GLenum attachment,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params)
{
getFramebufferAttachmentParameteriv(target, attachment, pname, params);
}
void Context::getRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params) void Context::getRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
{ {
Renderbuffer *renderbuffer = mGLState.getCurrentRenderbuffer(); Renderbuffer *renderbuffer = mGLState.getCurrentRenderbuffer();
QueryRenderbufferiv(this, renderbuffer, pname, params); QueryRenderbufferiv(this, renderbuffer, pname, params);
} }
void Context::getRenderbufferParameterivRobust(GLenum target,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params)
{
getRenderbufferParameteriv(target, pname, params);
}
void Context::getTexParameterfv(TextureType target, GLenum pname, GLfloat *params) void Context::getTexParameterfv(TextureType target, GLenum pname, GLfloat *params)
{ {
Texture *texture = getTargetTexture(target); Texture *texture = getTargetTexture(target);
QueryTexParameterfv(texture, pname, params); QueryTexParameterfv(texture, pname, params);
} }
void Context::getTexParameterfvRobust(TextureType target,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLfloat *params)
{
getTexParameterfv(target, pname, params);
}
void Context::getTexParameteriv(TextureType target, GLenum pname, GLint *params) void Context::getTexParameteriv(TextureType target, GLenum pname, GLint *params)
{ {
Texture *texture = getTargetTexture(target); Texture *texture = getTargetTexture(target);
QueryTexParameteriv(texture, pname, params); QueryTexParameteriv(texture, pname, params);
} }
void Context::getTexParameterivRobust(TextureType target,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params)
{
getTexParameteriv(target, pname, params);
}
void Context::getTexLevelParameteriv(TextureTarget target, GLint level, GLenum pname, GLint *params) void Context::getTexLevelParameteriv(TextureTarget target, GLint level, GLenum pname, GLint *params)
{ {
Texture *texture = getTargetTexture(TextureTargetToType(target)); Texture *texture = getTargetTexture(TextureTargetToType(target));
...@@ -1783,6 +1901,14 @@ void Context::texParameterfv(TextureType target, GLenum pname, const GLfloat *pa ...@@ -1783,6 +1901,14 @@ void Context::texParameterfv(TextureType target, GLenum pname, const GLfloat *pa
onTextureChange(texture); onTextureChange(texture);
} }
void Context::texParameterfvRobust(TextureType target,
GLenum pname,
GLsizei bufSize,
const GLfloat *params)
{
texParameterfv(target, pname, params);
}
void Context::texParameteri(TextureType target, GLenum pname, GLint param) void Context::texParameteri(TextureType target, GLenum pname, GLint param)
{ {
Texture *texture = getTargetTexture(target); Texture *texture = getTargetTexture(target);
...@@ -1797,6 +1923,14 @@ void Context::texParameteriv(TextureType target, GLenum pname, const GLint *para ...@@ -1797,6 +1923,14 @@ void Context::texParameteriv(TextureType target, GLenum pname, const GLint *para
onTextureChange(texture); onTextureChange(texture);
} }
void Context::texParameterivRobust(TextureType target,
GLenum pname,
GLsizei bufSize,
const GLint *params)
{
texParameteriv(target, pname, params);
}
void Context::drawArrays(GLenum mode, GLint first, GLsizei count) void Context::drawArrays(GLenum mode, GLint first, GLsizei count)
{ {
// No-op if zero count // No-op if zero count
...@@ -1930,17 +2064,17 @@ void Context::bindUniformLocation(GLuint program, GLint location, const GLchar * ...@@ -1930,17 +2064,17 @@ void Context::bindUniformLocation(GLuint program, GLint location, const GLchar *
programObject->bindUniformLocation(location, name); programObject->bindUniformLocation(location, name);
} }
void Context::setCoverageModulation(GLenum components) void Context::coverageModulation(GLenum components)
{ {
mGLState.setCoverageModulation(components); mGLState.setCoverageModulation(components);
} }
void Context::loadPathRenderingMatrix(GLenum matrixMode, const GLfloat *matrix) void Context::matrixLoadf(GLenum matrixMode, const GLfloat *matrix)
{ {
mGLState.loadPathRenderingMatrix(matrixMode, matrix); mGLState.loadPathRenderingMatrix(matrixMode, matrix);
} }
void Context::loadPathRenderingIdentityMatrix(GLenum matrixMode) void Context::matrixLoadIdentity(GLenum matrixMode)
{ {
GLfloat I[16]; GLfloat I[16];
angle::Matrix<GLfloat>::setToIdentity(I); angle::Matrix<GLfloat>::setToIdentity(I);
...@@ -2466,6 +2600,14 @@ void Context::samplerParameteriv(GLuint sampler, GLenum pname, const GLint *para ...@@ -2466,6 +2600,14 @@ void Context::samplerParameteriv(GLuint sampler, GLenum pname, const GLint *para
mGLState.setObjectDirty(GL_SAMPLER); mGLState.setObjectDirty(GL_SAMPLER);
} }
void Context::samplerParameterivRobust(GLuint sampler,
GLenum pname,
GLsizei bufSize,
const GLint *param)
{
samplerParameteriv(sampler, pname, param);
}
void Context::samplerParameterf(GLuint sampler, GLenum pname, GLfloat param) void Context::samplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
{ {
Sampler *samplerObject = Sampler *samplerObject =
...@@ -2482,6 +2624,14 @@ void Context::samplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *pa ...@@ -2482,6 +2624,14 @@ void Context::samplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *pa
mGLState.setObjectDirty(GL_SAMPLER); mGLState.setObjectDirty(GL_SAMPLER);
} }
void Context::samplerParameterfvRobust(GLuint sampler,
GLenum pname,
GLsizei bufSize,
const GLfloat *param)
{
samplerParameterfv(sampler, pname, param);
}
void Context::getSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params) void Context::getSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
{ {
const Sampler *samplerObject = const Sampler *samplerObject =
...@@ -2490,6 +2640,15 @@ void Context::getSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params) ...@@ -2490,6 +2640,15 @@ void Context::getSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
mGLState.setObjectDirty(GL_SAMPLER); mGLState.setObjectDirty(GL_SAMPLER);
} }
void Context::getSamplerParameterivRobust(GLuint sampler,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params)
{
getSamplerParameteriv(sampler, pname, params);
}
void Context::getSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params) void Context::getSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
{ {
const Sampler *samplerObject = const Sampler *samplerObject =
...@@ -2498,6 +2657,15 @@ void Context::getSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *param ...@@ -2498,6 +2657,15 @@ void Context::getSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *param
mGLState.setObjectDirty(GL_SAMPLER); mGLState.setObjectDirty(GL_SAMPLER);
} }
void Context::getSamplerParameterfvRobust(GLuint sampler,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLfloat *params)
{
getSamplerParameterfv(sampler, pname, params);
}
void Context::programParameteri(GLuint program, GLenum pname, GLint value) void Context::programParameteri(GLuint program, GLenum pname, GLint value)
{ {
gl::Program *programObject = getProgram(program); gl::Program *programObject = getProgram(program);
...@@ -3088,6 +3256,36 @@ void Context::readPixels(GLint x, ...@@ -3088,6 +3256,36 @@ void Context::readPixels(GLint x,
handleError(readFBO->readPixels(this, area, format, type, pixels)); handleError(readFBO->readPixels(this, area, format, type, pixels));
} }
void Context::readPixelsRobust(GLint x,
GLint y,
GLsizei width,
GLsizei height,
GLenum format,
GLenum type,
GLsizei bufSize,
GLsizei *length,
GLsizei *columns,
GLsizei *rows,
void *pixels)
{
readPixels(x, y, width, height, format, type, pixels);
}
void Context::readnPixelsRobust(GLint x,
GLint y,
GLsizei width,
GLsizei height,
GLenum format,
GLenum type,
GLsizei bufSize,
GLsizei *length,
GLsizei *columns,
GLsizei *rows,
void *data)
{
readPixels(x, y, width, height, format, type, data);
}
void Context::copyTexImage2D(TextureTarget target, void Context::copyTexImage2D(TextureTarget target,
GLint level, GLint level,
GLenum internalformat, GLenum internalformat,
...@@ -3261,7 +3459,7 @@ void Context::framebufferTextureLayer(GLenum target, ...@@ -3261,7 +3459,7 @@ void Context::framebufferTextureLayer(GLenum target,
mGLState.setObjectDirty(target); mGLState.setObjectDirty(target);
} }
void Context::framebufferTextureMultiviewLayeredANGLE(GLenum target, void Context::framebufferTextureMultiviewLayered(GLenum target,
GLenum attachment, GLenum attachment,
GLuint texture, GLuint texture,
GLint level, GLint level,
...@@ -3287,7 +3485,7 @@ void Context::framebufferTextureMultiviewLayeredANGLE(GLenum target, ...@@ -3287,7 +3485,7 @@ void Context::framebufferTextureMultiviewLayeredANGLE(GLenum target,
mGLState.setObjectDirty(target); mGLState.setObjectDirty(target);
} }
void Context::framebufferTextureMultiviewSideBySideANGLE(GLenum target, void Context::framebufferTextureMultiviewSideBySide(GLenum target,
GLenum attachment, GLenum attachment,
GLuint texture, GLuint texture,
GLint level, GLint level,
...@@ -3404,6 +3602,20 @@ void Context::texImage2D(TextureTarget target, ...@@ -3404,6 +3602,20 @@ void Context::texImage2D(TextureTarget target,
size, format, type, reinterpret_cast<const uint8_t *>(pixels))); size, format, type, reinterpret_cast<const uint8_t *>(pixels)));
} }
void Context::texImage2DRobust(TextureTarget target,
GLint level,
GLint internalformat,
GLsizei width,
GLsizei height,
GLint border,
GLenum format,
GLenum type,
GLsizei bufSize,
const void *pixels)
{
texImage2D(target, level, internalformat, width, height, border, format, type, pixels);
}
void Context::texImage3D(TextureType target, void Context::texImage3D(TextureType target,
GLint level, GLint level,
GLint internalformat, GLint internalformat,
...@@ -3424,6 +3636,21 @@ void Context::texImage3D(TextureType target, ...@@ -3424,6 +3636,21 @@ void Context::texImage3D(TextureType target,
format, type, reinterpret_cast<const uint8_t *>(pixels))); format, type, reinterpret_cast<const uint8_t *>(pixels)));
} }
void Context::texImage3DRobust(TextureType target,
GLint level,
GLint internalformat,
GLsizei width,
GLsizei height,
GLsizei depth,
GLint border,
GLenum format,
GLenum type,
GLsizei bufSize,
const void *pixels)
{
texImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
}
void Context::texSubImage2D(TextureTarget target, void Context::texSubImage2D(TextureTarget target,
GLint level, GLint level,
GLint xoffset, GLint xoffset,
...@@ -3448,6 +3675,20 @@ void Context::texSubImage2D(TextureTarget target, ...@@ -3448,6 +3675,20 @@ void Context::texSubImage2D(TextureTarget target,
type, reinterpret_cast<const uint8_t *>(pixels))); type, reinterpret_cast<const uint8_t *>(pixels)));
} }
void Context::texSubImage2DRobust(TextureTarget target,
GLint level,
GLint xoffset,
GLint yoffset,
GLsizei width,
GLsizei height,
GLenum format,
GLenum type,
GLsizei bufSize,
const void *pixels)
{
texSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
}
void Context::texSubImage3D(TextureType target, void Context::texSubImage3D(TextureType target,
GLint level, GLint level,
GLint xoffset, GLint xoffset,
...@@ -3475,6 +3716,23 @@ void Context::texSubImage3D(TextureType target, ...@@ -3475,6 +3716,23 @@ void Context::texSubImage3D(TextureType target,
reinterpret_cast<const uint8_t *>(pixels))); reinterpret_cast<const uint8_t *>(pixels)));
} }
void Context::texSubImage3DRobust(TextureType target,
GLint level,
GLint xoffset,
GLint yoffset,
GLint zoffset,
GLsizei width,
GLsizei height,
GLsizei depth,
GLenum format,
GLenum type,
GLsizei bufSize,
const void *pixels)
{
texSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type,
pixels);
}
void Context::compressedTexImage2D(TextureTarget target, void Context::compressedTexImage2D(TextureTarget target,
GLint level, GLint level,
GLenum internalformat, GLenum internalformat,
...@@ -3493,6 +3751,19 @@ void Context::compressedTexImage2D(TextureTarget target, ...@@ -3493,6 +3751,19 @@ void Context::compressedTexImage2D(TextureTarget target,
reinterpret_cast<const uint8_t *>(data))); reinterpret_cast<const uint8_t *>(data)));
} }
void Context::compressedTexImage2DRobust(TextureTarget target,
GLint level,
GLenum internalformat,
GLsizei width,
GLsizei height,
GLint border,
GLsizei imageSize,
GLsizei dataSize,
const GLvoid *data)
{
compressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
}
void Context::compressedTexImage3D(TextureType target, void Context::compressedTexImage3D(TextureType target,
GLint level, GLint level,
GLenum internalformat, GLenum internalformat,
...@@ -3512,6 +3783,21 @@ void Context::compressedTexImage3D(TextureType target, ...@@ -3512,6 +3783,21 @@ void Context::compressedTexImage3D(TextureType target,
size, imageSize, reinterpret_cast<const uint8_t *>(data))); size, imageSize, reinterpret_cast<const uint8_t *>(data)));
} }
void Context::compressedTexImage3DRobust(TextureType target,
GLint level,
GLenum internalformat,
GLsizei width,
GLsizei height,
GLsizei depth,
GLint border,
GLsizei imageSize,
GLsizei dataSize,
const GLvoid *data)
{
compressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize,
data);
}
void Context::compressedTexSubImage2D(TextureTarget target, void Context::compressedTexSubImage2D(TextureTarget target,
GLint level, GLint level,
GLint xoffset, GLint xoffset,
...@@ -3531,6 +3817,21 @@ void Context::compressedTexSubImage2D(TextureTarget target, ...@@ -3531,6 +3817,21 @@ void Context::compressedTexSubImage2D(TextureTarget target,
reinterpret_cast<const uint8_t *>(data))); reinterpret_cast<const uint8_t *>(data)));
} }
void Context::compressedTexSubImage2DRobust(TextureTarget target,
GLint level,
GLint xoffset,
GLint yoffset,
GLsizei width,
GLsizei height,
GLenum format,
GLsizei imageSize,
GLsizei dataSize,
const GLvoid *data)
{
compressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize,
data);
}
void Context::compressedTexSubImage3D(TextureType target, void Context::compressedTexSubImage3D(TextureType target,
GLint level, GLint level,
GLint xoffset, GLint xoffset,
...@@ -3558,6 +3859,23 @@ void Context::compressedTexSubImage3D(TextureType target, ...@@ -3558,6 +3859,23 @@ void Context::compressedTexSubImage3D(TextureType target,
imageSize, reinterpret_cast<const uint8_t *>(data))); imageSize, reinterpret_cast<const uint8_t *>(data)));
} }
void Context::compressedTexSubImage3DRobust(TextureType target,
GLint level,
GLint xoffset,
GLint yoffset,
GLint zoffset,
GLsizei width,
GLsizei height,
GLsizei depth,
GLenum format,
GLsizei imageSize,
GLsizei dataSize,
const GLvoid *data)
{
compressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format,
imageSize, data);
}
void Context::generateMipmap(TextureType target) void Context::generateMipmap(TextureType target)
{ {
Texture *texture = getTargetTexture(target); Texture *texture = getTargetTexture(target);
...@@ -3635,6 +3953,15 @@ void Context::getBufferPointerv(BufferBinding target, GLenum pname, void **param ...@@ -3635,6 +3953,15 @@ void Context::getBufferPointerv(BufferBinding target, GLenum pname, void **param
QueryBufferPointerv(buffer, pname, params); QueryBufferPointerv(buffer, pname, params);
} }
void Context::getBufferPointervRobust(BufferBinding target,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
void **params)
{
getBufferPointerv(target, pname, params);
}
void *Context::mapBuffer(BufferBinding target, GLenum access) void *Context::mapBuffer(BufferBinding target, GLenum access)
{ {
Buffer *buffer = mGLState.getTargetBuffer(target); Buffer *buffer = mGLState.getTargetBuffer(target);
...@@ -4083,6 +4410,15 @@ void Context::getVertexAttribiv(GLuint index, GLenum pname, GLint *params) ...@@ -4083,6 +4410,15 @@ void Context::getVertexAttribiv(GLuint index, GLenum pname, GLint *params)
currentValues, pname, params); currentValues, pname, params);
} }
void Context::getVertexAttribivRobust(GLuint index,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params)
{
getVertexAttribiv(index, pname, params);
}
void Context::getVertexAttribfv(GLuint index, GLenum pname, GLfloat *params) void Context::getVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
{ {
const VertexAttribCurrentValueData &currentValues = const VertexAttribCurrentValueData &currentValues =
...@@ -4092,6 +4428,15 @@ void Context::getVertexAttribfv(GLuint index, GLenum pname, GLfloat *params) ...@@ -4092,6 +4428,15 @@ void Context::getVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
currentValues, pname, params); currentValues, pname, params);
} }
void Context::getVertexAttribfvRobust(GLuint index,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLfloat *params)
{
getVertexAttribfv(index, pname, params);
}
void Context::getVertexAttribIiv(GLuint index, GLenum pname, GLint *params) void Context::getVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
{ {
const VertexAttribCurrentValueData &currentValues = const VertexAttribCurrentValueData &currentValues =
...@@ -4101,6 +4446,15 @@ void Context::getVertexAttribIiv(GLuint index, GLenum pname, GLint *params) ...@@ -4101,6 +4446,15 @@ void Context::getVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
currentValues, pname, params); currentValues, pname, params);
} }
void Context::getVertexAttribIivRobust(GLuint index,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params)
{
getVertexAttribIiv(index, pname, params);
}
void Context::getVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params) void Context::getVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
{ {
const VertexAttribCurrentValueData &currentValues = const VertexAttribCurrentValueData &currentValues =
...@@ -4110,12 +4464,30 @@ void Context::getVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params) ...@@ -4110,12 +4464,30 @@ void Context::getVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
currentValues, pname, params); currentValues, pname, params);
} }
void Context::getVertexAttribIuivRobust(GLuint index,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLuint *params)
{
getVertexAttribIuiv(index, pname, params);
}
void Context::getVertexAttribPointerv(GLuint index, GLenum pname, void **pointer) void Context::getVertexAttribPointerv(GLuint index, GLenum pname, void **pointer)
{ {
const VertexAttribute &attrib = getGLState().getVertexArray()->getVertexAttribute(index); const VertexAttribute &attrib = getGLState().getVertexArray()->getVertexAttribute(index);
QueryVertexAttribPointerv(attrib, pname, pointer); QueryVertexAttribPointerv(attrib, pname, pointer);
} }
void Context::getVertexAttribPointervRobust(GLuint index,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
void **pointer)
{
getVertexAttribPointerv(index, pname, pointer);
}
void Context::debugMessageControl(GLenum source, void Context::debugMessageControl(GLenum source,
GLenum type, GLenum type,
GLenum severity, GLenum severity,
...@@ -4592,6 +4964,11 @@ void Context::getBooleanv(GLenum pname, GLboolean *params) ...@@ -4592,6 +4964,11 @@ void Context::getBooleanv(GLenum pname, GLboolean *params)
} }
} }
void Context::getBooleanvRobust(GLenum pname, GLsizei bufSize, GLsizei *length, GLboolean *params)
{
getBooleanv(pname, params);
}
void Context::getFloatv(GLenum pname, GLfloat *params) void Context::getFloatv(GLenum pname, GLfloat *params)
{ {
GLenum nativeType; GLenum nativeType;
...@@ -4608,6 +4985,11 @@ void Context::getFloatv(GLenum pname, GLfloat *params) ...@@ -4608,6 +4985,11 @@ void Context::getFloatv(GLenum pname, GLfloat *params)
} }
} }
void Context::getFloatvRobust(GLenum pname, GLsizei bufSize, GLsizei *length, GLfloat *params)
{
getFloatv(pname, params);
}
void Context::getIntegerv(GLenum pname, GLint *params) void Context::getIntegerv(GLenum pname, GLint *params)
{ {
GLenum nativeType; GLenum nativeType;
...@@ -4624,6 +5006,11 @@ void Context::getIntegerv(GLenum pname, GLint *params) ...@@ -4624,6 +5006,11 @@ void Context::getIntegerv(GLenum pname, GLint *params)
} }
} }
void Context::getIntegervRobust(GLenum pname, GLsizei bufSize, GLsizei *length, GLint *data)
{
getIntegerv(pname, data);
}
void Context::getProgramiv(GLuint program, GLenum pname, GLint *params) void Context::getProgramiv(GLuint program, GLenum pname, GLint *params)
{ {
Program *programObject = getProgram(program); Program *programObject = getProgram(program);
...@@ -4631,6 +5018,15 @@ void Context::getProgramiv(GLuint program, GLenum pname, GLint *params) ...@@ -4631,6 +5018,15 @@ void Context::getProgramiv(GLuint program, GLenum pname, GLint *params)
QueryProgramiv(this, programObject, pname, params); QueryProgramiv(this, programObject, pname, params);
} }
void Context::getProgramivRobust(GLuint program,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params)
{
getProgramiv(program, pname, params);
}
void Context::getProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params) void Context::getProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
...@@ -4658,6 +5054,15 @@ void Context::getShaderiv(GLuint shader, GLenum pname, GLint *params) ...@@ -4658,6 +5054,15 @@ void Context::getShaderiv(GLuint shader, GLenum pname, GLint *params)
QueryShaderiv(this, shaderObject, pname, params); QueryShaderiv(this, shaderObject, pname, params);
} }
void Context::getShaderivRobust(GLuint shader,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params)
{
getShaderiv(shader, pname, params);
}
void Context::getShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *infolog) void Context::getShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *infolog)
{ {
Shader *shaderObject = getShader(shader); Shader *shaderObject = getShader(shader);
...@@ -4752,6 +5157,15 @@ void Context::getUniformfv(GLuint program, GLint location, GLfloat *params) ...@@ -4752,6 +5157,15 @@ void Context::getUniformfv(GLuint program, GLint location, GLfloat *params)
programObject->getUniformfv(this, location, params); programObject->getUniformfv(this, location, params);
} }
void Context::getUniformfvRobust(GLuint program,
GLint location,
GLsizei bufSize,
GLsizei *length,
GLfloat *params)
{
getUniformfv(program, location, params);
}
void Context::getUniformiv(GLuint program, GLint location, GLint *params) void Context::getUniformiv(GLuint program, GLint location, GLint *params)
{ {
Program *programObject = getProgram(program); Program *programObject = getProgram(program);
...@@ -4759,6 +5173,15 @@ void Context::getUniformiv(GLuint program, GLint location, GLint *params) ...@@ -4759,6 +5173,15 @@ void Context::getUniformiv(GLuint program, GLint location, GLint *params)
programObject->getUniformiv(this, location, params); programObject->getUniformiv(this, location, params);
} }
void Context::getUniformivRobust(GLuint program,
GLint location,
GLsizei bufSize,
GLsizei *length,
GLint *params)
{
getUniformiv(program, location, params);
}
GLint Context::getUniformLocation(GLuint program, const GLchar *name) GLint Context::getUniformLocation(GLuint program, const GLchar *name)
{ {
Program *programObject = getProgram(program); Program *programObject = getProgram(program);
...@@ -5321,6 +5744,15 @@ void Context::getUniformuiv(GLuint program, GLint location, GLuint *params) ...@@ -5321,6 +5744,15 @@ void Context::getUniformuiv(GLuint program, GLint location, GLuint *params)
programObject->getUniformuiv(this, location, params); programObject->getUniformuiv(this, location, params);
} }
void Context::getUniformuivRobust(GLuint program,
GLint location,
GLsizei bufSize,
GLsizei *length,
GLuint *params)
{
getUniformuiv(program, location, params);
}
GLint Context::getFragDataLocation(GLuint program, const GLchar *name) GLint Context::getFragDataLocation(GLuint program, const GLchar *name)
{ {
const Program *programObject = getProgram(program); const Program *programObject = getProgram(program);
...@@ -5378,6 +5810,16 @@ void Context::getActiveUniformBlockiv(GLuint program, ...@@ -5378,6 +5810,16 @@ void Context::getActiveUniformBlockiv(GLuint program,
QueryActiveUniformBlockiv(programObject, uniformBlockIndex, pname, params); QueryActiveUniformBlockiv(programObject, uniformBlockIndex, pname, params);
} }
void Context::getActiveUniformBlockivRobust(GLuint program,
GLuint uniformBlockIndex,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params)
{
getActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
}
void Context::getActiveUniformBlockName(GLuint program, void Context::getActiveUniformBlockName(GLuint program,
GLuint uniformBlockIndex, GLuint uniformBlockIndex,
GLsizei bufSize, GLsizei bufSize,
...@@ -5449,12 +5891,26 @@ void Context::getInteger64v(GLenum pname, GLint64 *params) ...@@ -5449,12 +5891,26 @@ void Context::getInteger64v(GLenum pname, GLint64 *params)
} }
} }
void Context::getInteger64vRobust(GLenum pname, GLsizei bufSize, GLsizei *length, GLint64 *data)
{
getInteger64v(pname, data);
}
void Context::getBufferParameteri64v(BufferBinding target, GLenum pname, GLint64 *params) void Context::getBufferParameteri64v(BufferBinding target, GLenum pname, GLint64 *params)
{ {
Buffer *buffer = mGLState.getTargetBuffer(target); Buffer *buffer = mGLState.getTargetBuffer(target);
QueryBufferParameteri64v(buffer, pname, params); QueryBufferParameteri64v(buffer, pname, params);
} }
void Context::getBufferParameteri64vRobust(BufferBinding target,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint64 *params)
{
getBufferParameteri64v(target, pname, params);
}
void Context::genSamplers(GLsizei count, GLuint *samplers) void Context::genSamplers(GLsizei count, GLuint *samplers)
{ {
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
...@@ -5488,6 +5944,16 @@ void Context::getInternalformativ(GLenum target, ...@@ -5488,6 +5944,16 @@ void Context::getInternalformativ(GLenum target,
QueryInternalFormativ(formatCaps, pname, bufSize, params); QueryInternalFormativ(formatCaps, pname, bufSize, params);
} }
void Context::getInternalformativRobust(GLenum target,
GLenum internalformat,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params)
{
getInternalformativ(target, internalformat, pname, bufSize, params);
}
void Context::programUniform1i(GLuint program, GLint location, GLint v0) void Context::programUniform1i(GLuint program, GLint location, GLint v0)
{ {
programUniform1iv(program, location, 1, &v0); programUniform1iv(program, location, 1, &v0);
......
src/libANGLE/Context.h
...@@ -86,7 +86,7 @@ class Context final : angle::NonCopyable ...@@ -86,7 +86,7 @@ class Context final : angle::NonCopyable
GLuint createProgram(); GLuint createProgram();
GLuint createTexture(); GLuint createTexture();
GLuint createRenderbuffer(); GLuint createRenderbuffer();
GLuint createPaths(GLsizei range); GLuint genPaths(GLsizei range);
GLuint createProgramPipeline(); GLuint createProgramPipeline();
GLuint createShaderProgramv(ShaderType type, GLsizei count, const GLchar *const *strings); GLuint createShaderProgramv(ShaderType type, GLsizei count, const GLchar *const *strings);
...@@ -99,9 +99,9 @@ class Context final : angle::NonCopyable ...@@ -99,9 +99,9 @@ class Context final : angle::NonCopyable
void deleteProgramPipeline(GLuint pipeline); void deleteProgramPipeline(GLuint pipeline);
// CHROMIUM_path_rendering // CHROMIUM_path_rendering
bool hasPathData(GLuint path) const; bool isPath(GLuint path) const;
bool hasPath(GLuint path) const; bool isPathGenerated(GLuint path) const;
void setPathCommands(GLuint path, void pathCommands(GLuint path,
GLsizei numCommands, GLsizei numCommands,
const GLubyte *commands, const GLubyte *commands,
GLsizei numCoords, GLsizei numCoords,
...@@ -111,7 +111,7 @@ class Context final : angle::NonCopyable ...@@ -111,7 +111,7 @@ class Context final : angle::NonCopyable
void pathParameteri(GLuint path, GLenum pname, GLint value); void pathParameteri(GLuint path, GLenum pname, GLint value);
void getPathParameterfv(GLuint path, GLenum pname, GLfloat *value); void getPathParameterfv(GLuint path, GLenum pname, GLfloat *value);
void getPathParameteriv(GLuint path, GLenum pname, GLint *value); void getPathParameteriv(GLuint path, GLenum pname, GLint *value);
void setPathStencilFunc(GLenum func, GLint ref, GLuint mask); void pathStencilFunc(GLenum func, GLint ref, GLuint mask);
// Framebuffers are owned by the Context, so these methods do not pass through // Framebuffers are owned by the Context, so these methods do not pass through
GLuint createFramebuffer(); GLuint createFramebuffer();
...@@ -155,37 +155,116 @@ class Context final : angle::NonCopyable ...@@ -155,37 +155,116 @@ class Context final : angle::NonCopyable
void endQuery(GLenum target); void endQuery(GLenum target);
void queryCounter(GLuint id, GLenum target); void queryCounter(GLuint id, GLenum target);
void getQueryiv(GLenum target, GLenum pname, GLint *params); void getQueryiv(GLenum target, GLenum pname, GLint *params);
void getQueryivRobust(GLenum target,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params);
void getQueryObjectiv(GLuint id, GLenum pname, GLint *params); void getQueryObjectiv(GLuint id, GLenum pname, GLint *params);
void getQueryObjectivRobust(GLuint id,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params);
void getQueryObjectuiv(GLuint id, GLenum pname, GLuint *params); void getQueryObjectuiv(GLuint id, GLenum pname, GLuint *params);
void getQueryObjectuivRobust(GLuint id,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLuint *params);
void getQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params); void getQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params);
void getQueryObjecti64vRobust(GLuint id,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint64 *params);
void getQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params); void getQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params);
void getQueryObjectui64vRobust(GLuint id,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLuint64 *params);
void vertexAttribDivisor(GLuint index, GLuint divisor); void vertexAttribDivisor(GLuint index, GLuint divisor);
void vertexBindingDivisor(GLuint bindingIndex, GLuint divisor); void vertexBindingDivisor(GLuint bindingIndex, GLuint divisor);
void getBufferParameteriv(BufferBinding target, GLenum pname, GLint *params); void getBufferParameteriv(BufferBinding target, GLenum pname, GLint *params);
void getBufferParameterivRobust(BufferBinding target,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params);
void getFramebufferAttachmentParameteriv(GLenum target, void getFramebufferAttachmentParameteriv(GLenum target,
GLenum attachment, GLenum attachment,
GLenum pname, GLenum pname,
GLint *params); GLint *params);
void getFramebufferAttachmentParameterivRobust(GLenum target,
GLenum attachment,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params);
void getRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params); void getRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params);
void getRenderbufferParameterivRobust(GLenum target,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params);
void getTexParameterfv(TextureType target, GLenum pname, GLfloat *params); void getTexParameterfv(TextureType target, GLenum pname, GLfloat *params);
void getTexParameterfvRobust(TextureType target,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLfloat *params);
void getTexParameteriv(TextureType target, GLenum pname, GLint *params); void getTexParameteriv(TextureType target, GLenum pname, GLint *params);
void getTexParameterivRobust(TextureType target,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params);
void getTexLevelParameteriv(TextureTarget target, GLint level, GLenum pname, GLint *params); void getTexLevelParameteriv(TextureTarget target, GLint level, GLenum pname, GLint *params);
void getTexLevelParameterfv(TextureTarget target, GLint level, GLenum pname, GLfloat *params); void getTexLevelParameterfv(TextureTarget target, GLint level, GLenum pname, GLfloat *params);
void texParameterf(TextureType target, GLenum pname, GLfloat param); void texParameterf(TextureType target, GLenum pname, GLfloat param);
void texParameterfv(TextureType target, GLenum pname, const GLfloat *params); void texParameterfv(TextureType target, GLenum pname, const GLfloat *params);
void texParameterfvRobust(TextureType target,
GLenum pname,
GLsizei bufSize,
const GLfloat *params);
void texParameteri(TextureType target, GLenum pname, GLint param); void texParameteri(TextureType target, GLenum pname, GLint param);
void texParameteriv(TextureType target, GLenum pname, const GLint *params); void texParameteriv(TextureType target, GLenum pname, const GLint *params);
void texParameterivRobust(TextureType target,
GLenum pname,
GLsizei bufSize,
const GLint *params);
void samplerParameteri(GLuint sampler, GLenum pname, GLint param); void samplerParameteri(GLuint sampler, GLenum pname, GLint param);
void samplerParameteriv(GLuint sampler, GLenum pname, const GLint *param); void samplerParameteriv(GLuint sampler, GLenum pname, const GLint *param);
void samplerParameterivRobust(GLuint sampler,
GLenum pname,
GLsizei bufSize,
const GLint *param);
void samplerParameterf(GLuint sampler, GLenum pname, GLfloat param); void samplerParameterf(GLuint sampler, GLenum pname, GLfloat param);
void samplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param); void samplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param);
void samplerParameterfvRobust(GLuint sampler,
GLenum pname,
GLsizei bufSize,
const GLfloat *param);
void getSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params); void getSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params);
void getSamplerParameterivRobust(GLuint sampler,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params);
void getSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params); void getSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params);
void getSamplerParameterfvRobust(GLuint sampler,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLfloat *params);
void programParameteri(GLuint program, GLenum pname, GLint value); void programParameteri(GLuint program, GLenum pname, GLint value);
...@@ -244,16 +323,34 @@ class Context final : angle::NonCopyable ...@@ -244,16 +323,34 @@ class Context final : angle::NonCopyable
bool isTransformFeedbackGenerated(GLuint vertexArray); bool isTransformFeedbackGenerated(GLuint vertexArray);
void getBooleanv(GLenum pname, GLboolean *params); void getBooleanv(GLenum pname, GLboolean *params);
void getBooleanvRobust(GLenum pname, GLsizei bufSize, GLsizei *length, GLboolean *params);
void getBooleanvImpl(GLenum pname, GLboolean *params); void getBooleanvImpl(GLenum pname, GLboolean *params);
void getFloatv(GLenum pname, GLfloat *params); void getFloatv(GLenum pname, GLfloat *params);
void getFloatvRobust(GLenum pname, GLsizei bufSize, GLsizei *length, GLfloat *params);
void getFloatvImpl(GLenum pname, GLfloat *params); void getFloatvImpl(GLenum pname, GLfloat *params);
void getIntegerv(GLenum pname, GLint *params); void getIntegerv(GLenum pname, GLint *params);
void getIntegervRobust(GLenum pname, GLsizei bufSize, GLsizei *length, GLint *data);
void getIntegervImpl(GLenum pname, GLint *params); void getIntegervImpl(GLenum pname, GLint *params);
void getInteger64vImpl(GLenum pname, GLint64 *params); void getInteger64vImpl(GLenum pname, GLint64 *params);
void getPointerv(GLenum pname, void **params) const; void getPointerv(GLenum pname, void **params) const;
void getBooleani_v(GLenum target, GLuint index, GLboolean *data); void getBooleani_v(GLenum target, GLuint index, GLboolean *data);
void getBooleani_vRobust(GLenum target,
GLuint index,
GLsizei bufSize,
GLsizei *length,
GLboolean *data);
void getIntegeri_v(GLenum target, GLuint index, GLint *data); void getIntegeri_v(GLenum target, GLuint index, GLint *data);
void getIntegeri_vRobust(GLenum target,
GLuint index,
GLsizei bufSize,
GLsizei *length,
GLint *data);
void getInteger64i_v(GLenum target, GLuint index, GLint64 *data); void getInteger64i_v(GLenum target, GLuint index, GLint64 *data);
void getInteger64i_vRobust(GLenum target,
GLuint index,
GLsizei bufSize,
GLsizei *length,
GLint64 *data);
void activeShaderProgram(GLuint pipeline, GLuint program); void activeShaderProgram(GLuint pipeline, GLuint program);
void activeTexture(GLenum texture); void activeTexture(GLenum texture);
...@@ -318,10 +415,35 @@ class Context final : angle::NonCopyable ...@@ -318,10 +415,35 @@ class Context final : angle::NonCopyable
void vertexAttribI4iv(GLuint index, const GLint *v); void vertexAttribI4iv(GLuint index, const GLint *v);
void vertexAttribI4uiv(GLuint index, const GLuint *v); void vertexAttribI4uiv(GLuint index, const GLuint *v);
void getVertexAttribiv(GLuint index, GLenum pname, GLint *params); void getVertexAttribiv(GLuint index, GLenum pname, GLint *params);
void getVertexAttribivRobust(GLuint index,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params);
void getVertexAttribfv(GLuint index, GLenum pname, GLfloat *params); void getVertexAttribfv(GLuint index, GLenum pname, GLfloat *params);
void getVertexAttribfvRobust(GLuint index,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLfloat *params);
void getVertexAttribIiv(GLuint index, GLenum pname, GLint *params); void getVertexAttribIiv(GLuint index, GLenum pname, GLint *params);
void getVertexAttribIivRobust(GLuint index,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params);
void getVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params); void getVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params);
void getVertexAttribIuivRobust(GLuint index,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLuint *params);
void getVertexAttribPointerv(GLuint index, GLenum pname, void **pointer); void getVertexAttribPointerv(GLuint index, GLenum pname, void **pointer);
void getVertexAttribPointervRobust(GLuint index,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
void **pointer);
void debugMessageControl(GLenum source, void debugMessageControl(GLenum source,
GLenum type, GLenum type,
...@@ -389,6 +511,28 @@ class Context final : angle::NonCopyable ...@@ -389,6 +511,28 @@ class Context final : angle::NonCopyable
GLenum format, GLenum format,
GLenum type, GLenum type,
void *pixels); void *pixels);
void readPixelsRobust(GLint x,
GLint y,
GLsizei width,
GLsizei height,
GLenum format,
GLenum type,
GLsizei bufSize,
GLsizei *length,
GLsizei *columns,
GLsizei *rows,
void *pixels);
void readnPixelsRobust(GLint x,
GLint y,
GLsizei width,
GLsizei height,
GLenum format,
GLenum type,
GLsizei bufSize,
GLsizei *length,
GLsizei *columns,
GLsizei *rows,
void *data);
void copyTexImage2D(TextureTarget target, void copyTexImage2D(TextureTarget target,
GLint level, GLint level,
...@@ -434,13 +578,13 @@ class Context final : angle::NonCopyable ...@@ -434,13 +578,13 @@ class Context final : angle::NonCopyable
GLuint texture, GLuint texture,
GLint level, GLint level,
GLint layer); GLint layer);
void framebufferTextureMultiviewLayeredANGLE(GLenum target, void framebufferTextureMultiviewLayered(GLenum target,
GLenum attachment, GLenum attachment,
GLuint texture, GLuint texture,
GLint level, GLint level,
GLint baseViewIndex, GLint baseViewIndex,
GLsizei numViews); GLsizei numViews);
void framebufferTextureMultiviewSideBySideANGLE(GLenum target, void framebufferTextureMultiviewSideBySide(GLenum target,
GLenum attachment, GLenum attachment,
GLuint texture, GLuint texture,
GLint level, GLint level,
...@@ -469,6 +613,16 @@ class Context final : angle::NonCopyable ...@@ -469,6 +613,16 @@ class Context final : angle::NonCopyable
GLenum format, GLenum format,
GLenum type, GLenum type,
const void *pixels); const void *pixels);
void texImage2DRobust(TextureTarget target,
GLint level,
GLint internalformat,
GLsizei width,
GLsizei height,
GLint border,
GLenum format,
GLenum type,
GLsizei bufSize,
const void *pixels);
void texImage3D(TextureType target, void texImage3D(TextureType target,
GLint level, GLint level,
GLint internalformat, GLint internalformat,
...@@ -479,6 +633,17 @@ class Context final : angle::NonCopyable ...@@ -479,6 +633,17 @@ class Context final : angle::NonCopyable
GLenum format, GLenum format,
GLenum type, GLenum type,
const void *pixels); const void *pixels);
void texImage3DRobust(TextureType target,
GLint level,
GLint internalformat,
GLsizei width,
GLsizei height,
GLsizei depth,
GLint border,
GLenum format,
GLenum type,
GLsizei bufSize,
const void *pixels);
void texSubImage2D(TextureTarget target, void texSubImage2D(TextureTarget target,
GLint level, GLint level,
GLint xoffset, GLint xoffset,
...@@ -488,6 +653,16 @@ class Context final : angle::NonCopyable ...@@ -488,6 +653,16 @@ class Context final : angle::NonCopyable
GLenum format, GLenum format,
GLenum type, GLenum type,
const void *pixels); const void *pixels);
void texSubImage2DRobust(TextureTarget target,
GLint level,
GLint xoffset,
GLint yoffset,
GLsizei width,
GLsizei height,
GLenum format,
GLenum type,
GLsizei bufSize,
const void *pixels);
void texSubImage3D(TextureType target, void texSubImage3D(TextureType target,
GLint level, GLint level,
GLint xoffset, GLint xoffset,
...@@ -499,6 +674,18 @@ class Context final : angle::NonCopyable ...@@ -499,6 +674,18 @@ class Context final : angle::NonCopyable
GLenum format, GLenum format,
GLenum type, GLenum type,
const void *pixels); const void *pixels);
void texSubImage3DRobust(TextureType target,
GLint level,
GLint xoffset,
GLint yoffset,
GLint zoffset,
GLsizei width,
GLsizei height,
GLsizei depth,
GLenum format,
GLenum type,
GLsizei bufSize,
const void *pixels);
void compressedTexImage2D(TextureTarget target, void compressedTexImage2D(TextureTarget target,
GLint level, GLint level,
GLenum internalformat, GLenum internalformat,
...@@ -507,6 +694,15 @@ class Context final : angle::NonCopyable ...@@ -507,6 +694,15 @@ class Context final : angle::NonCopyable
GLint border, GLint border,
GLsizei imageSize, GLsizei imageSize,
const void *data); const void *data);
void compressedTexImage2DRobust(TextureTarget target,
GLint level,
GLenum internalformat,
GLsizei width,
GLsizei height,
GLint border,
GLsizei imageSize,
GLsizei dataSize,
const GLvoid *data);
void compressedTexImage3D(TextureType target, void compressedTexImage3D(TextureType target,
GLint level, GLint level,
GLenum internalformat, GLenum internalformat,
...@@ -516,6 +712,16 @@ class Context final : angle::NonCopyable ...@@ -516,6 +712,16 @@ class Context final : angle::NonCopyable
GLint border, GLint border,
GLsizei imageSize, GLsizei imageSize,
const void *data); const void *data);
void compressedTexImage3DRobust(TextureType target,
GLint level,
GLenum internalformat,
GLsizei width,
GLsizei height,
GLsizei depth,
GLint border,
GLsizei imageSize,
GLsizei dataSize,
const GLvoid *data);
void compressedTexSubImage2D(TextureTarget target, void compressedTexSubImage2D(TextureTarget target,
GLint level, GLint level,
GLint xoffset, GLint xoffset,
...@@ -525,6 +731,16 @@ class Context final : angle::NonCopyable ...@@ -525,6 +731,16 @@ class Context final : angle::NonCopyable
GLenum format, GLenum format,
GLsizei imageSize, GLsizei imageSize,
const void *data); const void *data);
void compressedTexSubImage2DRobust(TextureTarget target,
GLint level,
GLint xoffset,
GLint yoffset,
GLsizei width,
GLsizei height,
GLenum format,
GLsizei imageSize,
GLsizei dataSize,
const GLvoid *data);
void compressedTexSubImage3D(TextureType target, void compressedTexSubImage3D(TextureType target,
GLint level, GLint level,
GLint xoffset, GLint xoffset,
...@@ -536,6 +752,18 @@ class Context final : angle::NonCopyable ...@@ -536,6 +752,18 @@ class Context final : angle::NonCopyable
GLenum format, GLenum format,
GLsizei imageSize, GLsizei imageSize,
const void *data); const void *data);
void compressedTexSubImage3DRobust(TextureType target,
GLint level,
GLint xoffset,
GLint yoffset,
GLint zoffset,
GLsizei width,
GLsizei height,
GLsizei depth,
GLenum format,
GLsizei imageSize,
GLsizei dataSize,
const GLvoid *data);
void copyTexture(GLuint sourceId, void copyTexture(GLuint sourceId,
GLint sourceLevel, GLint sourceLevel,
TextureTarget destTarget, TextureTarget destTarget,
...@@ -568,6 +796,11 @@ class Context final : angle::NonCopyable ...@@ -568,6 +796,11 @@ class Context final : angle::NonCopyable
void finish(); void finish();
void getBufferPointerv(BufferBinding target, GLenum pname, void **params); void getBufferPointerv(BufferBinding target, GLenum pname, void **params);
void getBufferPointervRobust(BufferBinding target,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
void **params);
void *mapBuffer(BufferBinding target, GLenum access); void *mapBuffer(BufferBinding target, GLenum access);
GLboolean unmapBuffer(BufferBinding target); GLboolean unmapBuffer(BufferBinding target);
void *mapBufferRange(BufferBinding target, void *mapBufferRange(BufferBinding target,
...@@ -595,11 +828,11 @@ class Context final : angle::NonCopyable ...@@ -595,11 +828,11 @@ class Context final : angle::NonCopyable
void getSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); void getSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
// CHROMIUM_framebuffer_mixed_samples // CHROMIUM_framebuffer_mixed_samples
void setCoverageModulation(GLenum components); void coverageModulation(GLenum components);
// CHROMIUM_path_rendering // CHROMIUM_path_rendering
void loadPathRenderingMatrix(GLenum matrixMode, const GLfloat *matrix); void matrixLoadf(GLenum matrixMode, const GLfloat *matrix);
void loadPathRenderingIdentityMatrix(GLenum matrixMode); void matrixLoadIdentity(GLenum matrixMode);
void stencilFillPath(GLuint path, GLenum fillMode, GLuint mask); void stencilFillPath(GLuint path, GLenum fillMode, GLuint mask);
void stencilStrokePath(GLuint path, GLint reference, GLuint mask); void stencilStrokePath(GLuint path, GLint reference, GLuint mask);
void coverFillPath(GLuint path, GLenum coverMode); void coverFillPath(GLuint path, GLenum coverMode);
...@@ -718,6 +951,11 @@ class Context final : angle::NonCopyable ...@@ -718,6 +951,11 @@ class Context final : angle::NonCopyable
void getAttachedShaders(GLuint program, GLsizei maxcount, GLsizei *count, GLuint *shaders); void getAttachedShaders(GLuint program, GLsizei maxcount, GLsizei *count, GLuint *shaders);
GLint getAttribLocation(GLuint program, const GLchar *name); GLint getAttribLocation(GLuint program, const GLchar *name);
void getProgramiv(GLuint program, GLenum pname, GLint *params); void getProgramiv(GLuint program, GLenum pname, GLint *params);
void getProgramivRobust(GLuint program,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params);
void getProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params); void getProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params);
void getProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei *length, GLchar *infolog); void getProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei *length, GLchar *infolog);
void getProgramPipelineInfoLog(GLuint pipeline, void getProgramPipelineInfoLog(GLuint pipeline,
...@@ -725,6 +963,12 @@ class Context final : angle::NonCopyable ...@@ -725,6 +963,12 @@ class Context final : angle::NonCopyable
GLsizei *length, GLsizei *length,
GLchar *infoLog); GLchar *infoLog);
void getShaderiv(GLuint shader, GLenum pname, GLint *params); void getShaderiv(GLuint shader, GLenum pname, GLint *params);
void getShaderivRobust(GLuint shader,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params);
void getShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *infolog); void getShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *infolog);
void getShaderPrecisionFormat(GLenum shadertype, void getShaderPrecisionFormat(GLenum shadertype,
GLenum precisiontype, GLenum precisiontype,
...@@ -732,7 +976,17 @@ class Context final : angle::NonCopyable ...@@ -732,7 +976,17 @@ class Context final : angle::NonCopyable
GLint *precision); GLint *precision);
void getShaderSource(GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source); void getShaderSource(GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source);
void getUniformfv(GLuint program, GLint location, GLfloat *params); void getUniformfv(GLuint program, GLint location, GLfloat *params);
void getUniformfvRobust(GLuint program,
GLint location,
GLsizei bufSize,
GLsizei *length,
GLfloat *params);
void getUniformiv(GLuint program, GLint location, GLint *params); void getUniformiv(GLuint program, GLint location, GLint *params);
void getUniformivRobust(GLuint program,
GLint location,
GLsizei bufSize,
GLsizei *length,
GLint *params);
GLint getUniformLocation(GLuint program, const GLchar *name); GLint getUniformLocation(GLuint program, const GLchar *name);
GLboolean isBuffer(GLuint buffer); GLboolean isBuffer(GLuint buffer);
GLboolean isEnabled(GLenum cap); GLboolean isEnabled(GLenum cap);
...@@ -846,6 +1100,11 @@ class Context final : angle::NonCopyable ...@@ -846,6 +1100,11 @@ class Context final : angle::NonCopyable
void programBinary(GLuint program, GLenum binaryFormat, const void *binary, GLsizei length); void programBinary(GLuint program, GLenum binaryFormat, const void *binary, GLsizei length);
void getUniformuiv(GLuint program, GLint location, GLuint *params); void getUniformuiv(GLuint program, GLint location, GLuint *params);
void getUniformuivRobust(GLuint program,
GLint location,
GLsizei bufSize,
GLsizei *length,
GLuint *params);
GLint getFragDataLocation(GLuint program, const GLchar *name); GLint getFragDataLocation(GLuint program, const GLchar *name);
void getUniformIndices(GLuint program, void getUniformIndices(GLuint program,
GLsizei uniformCount, GLsizei uniformCount,
...@@ -861,6 +1120,12 @@ class Context final : angle::NonCopyable ...@@ -861,6 +1120,12 @@ class Context final : angle::NonCopyable
GLuint uniformBlockIndex, GLuint uniformBlockIndex,
GLenum pname, GLenum pname,
GLint *params); GLint *params);
void getActiveUniformBlockivRobust(GLuint program,
GLuint uniformBlockIndex,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params);
void getActiveUniformBlockName(GLuint program, void getActiveUniformBlockName(GLuint program,
GLuint uniformBlockIndex, GLuint uniformBlockIndex,
GLsizei bufSize, GLsizei bufSize,
...@@ -874,8 +1139,14 @@ class Context final : angle::NonCopyable ...@@ -874,8 +1139,14 @@ class Context final : angle::NonCopyable
GLenum clientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout); GLenum clientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
void waitSync(GLsync sync, GLbitfield flags, GLuint64 timeout); void waitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
void getInteger64v(GLenum pname, GLint64 *params); void getInteger64v(GLenum pname, GLint64 *params);
void getInteger64vRobust(GLenum pname, GLsizei bufSize, GLsizei *length, GLint64 *data);
void getBufferParameteri64v(BufferBinding target, GLenum pname, GLint64 *params); void getBufferParameteri64v(BufferBinding target, GLenum pname, GLint64 *params);
void getBufferParameteri64vRobust(BufferBinding target,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint64 *params);
void genSamplers(GLsizei count, GLuint *samplers); void genSamplers(GLsizei count, GLuint *samplers);
void deleteSamplers(GLsizei count, const GLuint *samplers); void deleteSamplers(GLsizei count, const GLuint *samplers);
void getInternalformativ(GLenum target, void getInternalformativ(GLenum target,
...@@ -883,6 +1154,12 @@ class Context final : angle::NonCopyable ...@@ -883,6 +1154,12 @@ class Context final : angle::NonCopyable
GLenum pname, GLenum pname,
GLsizei bufSize, GLsizei bufSize,
GLint *params); GLint *params);
void getInternalformativRobust(GLenum target,
GLenum internalformat,
GLenum pname,
GLsizei bufSize,
GLsizei *length,
GLint *params);
void programUniform1i(GLuint program, GLint location, GLint v0); void programUniform1i(GLuint program, GLint location, GLint v0);
void programUniform2i(GLuint program, GLint location, GLint v0, GLint v1); void programUniform2i(GLuint program, GLint location, GLint v0, GLint v1);
......
src/libANGLE/validationES2.cpp
...@@ -75,7 +75,7 @@ bool ValidatePathInstances(gl::Context *context, ...@@ -75,7 +75,7 @@ bool ValidatePathInstances(gl::Context *context,
for (GLsizei i = 0; i < numPaths; ++i) for (GLsizei i = 0; i < numPaths; ++i)
{ {
const GLuint pathName = array[i] + pathBase; const GLuint pathName = array[i] + pathBase;
if (context->hasPath(pathName) && !context->hasPathData(pathName)) if (context->isPathGenerated(pathName) && !context->isPath(pathName))
{ {
ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoSuchPath); ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoSuchPath);
return false; return false;
...@@ -3181,7 +3181,7 @@ bool ValidatePathCommandsCHROMIUM(Context *context, ...@@ -3181,7 +3181,7 @@ bool ValidatePathCommandsCHROMIUM(Context *context,
context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available."); context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
return false; return false;
} }
if (!context->hasPath(path)) if (!context->isPathGenerated(path))
{ {
ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoSuchPath); ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoSuchPath);
return false; return false;
...@@ -3296,7 +3296,7 @@ bool ValidatePathParameterfCHROMIUM(Context *context, GLuint path, GLenum pname, ...@@ -3296,7 +3296,7 @@ bool ValidatePathParameterfCHROMIUM(Context *context, GLuint path, GLenum pname,
context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available."); context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
return false; return false;
} }
if (!context->hasPath(path)) if (!context->isPathGenerated(path))
{ {
ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoSuchPath); ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoSuchPath);
return false; return false;
...@@ -3368,7 +3368,7 @@ bool ValidateGetPathParameterfvCHROMIUM(Context *context, GLuint path, GLenum pn ...@@ -3368,7 +3368,7 @@ bool ValidateGetPathParameterfvCHROMIUM(Context *context, GLuint path, GLenum pn
return false; return false;
} }
if (!context->hasPath(path)) if (!context->isPathGenerated(path))
{ {
ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoSuchPath); ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoSuchPath);
return false; return false;
...@@ -3442,7 +3442,7 @@ bool ValidateStencilFillPathCHROMIUM(Context *context, GLuint path, GLenum fillM ...@@ -3442,7 +3442,7 @@ bool ValidateStencilFillPathCHROMIUM(Context *context, GLuint path, GLenum fillM
context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available."); context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
return false; return false;
} }
if (context->hasPath(path) && !context->hasPathData(path)) if (context->isPathGenerated(path) && !context->isPath(path))
{ {
ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoSuchPath); ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoSuchPath);
return false; return false;
...@@ -3474,7 +3474,7 @@ bool ValidateStencilStrokePathCHROMIUM(Context *context, GLuint path, GLint refe ...@@ -3474,7 +3474,7 @@ bool ValidateStencilStrokePathCHROMIUM(Context *context, GLuint path, GLint refe
context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available."); context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
return false; return false;
} }
if (context->hasPath(path) && !context->hasPathData(path)) if (context->isPathGenerated(path) && !context->isPath(path))
{ {
context->handleError(InvalidOperation() << "No such path or path has no data."); context->handleError(InvalidOperation() << "No such path or path has no data.");
return false; return false;
...@@ -3500,7 +3500,7 @@ bool ValidateCoverPathCHROMIUM(Context *context, GLuint path, GLenum coverMode) ...@@ -3500,7 +3500,7 @@ bool ValidateCoverPathCHROMIUM(Context *context, GLuint path, GLenum coverMode)
context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available."); context->handleError(InvalidOperation() << "GL_CHROMIUM_path_rendering is not available.");
return false; return false;
} }
if (context->hasPath(path) && !context->hasPathData(path)) if (context->isPathGenerated(path) && !context->isPath(path))
{ {
ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoSuchPath); ANGLE_VALIDATION_ERR(context, InvalidOperation(), NoSuchPath);
return false; return false;
......
src/libGLESv2/entry_points_gles_2_0_ext.cpp
...@@ -64,7 +64,7 @@ ANGLE_EXPORT void GL_APIENTRY CoverageModulationCHROMIUM(GLenum components) ...@@ -64,7 +64,7 @@ ANGLE_EXPORT void GL_APIENTRY CoverageModulationCHROMIUM(GLenum components)
{ {
return; return;
} }
context->setCoverageModulation(components); context->coverageModulation(components);
} }
} }
...@@ -80,7 +80,7 @@ ANGLE_EXPORT void GL_APIENTRY MatrixLoadfCHROMIUM(GLenum matrixMode, const GLflo ...@@ -80,7 +80,7 @@ ANGLE_EXPORT void GL_APIENTRY MatrixLoadfCHROMIUM(GLenum matrixMode, const GLflo
{ {
return; return;
} }
context->loadPathRenderingMatrix(matrixMode, matrix); context->matrixLoadf(matrixMode, matrix);
} }
} }
...@@ -95,7 +95,7 @@ ANGLE_EXPORT void GL_APIENTRY MatrixLoadIdentityCHROMIUM(GLenum matrixMode) ...@@ -95,7 +95,7 @@ ANGLE_EXPORT void GL_APIENTRY MatrixLoadIdentityCHROMIUM(GLenum matrixMode)
{ {
return; return;
} }
context->loadPathRenderingIdentityMatrix(matrixMode); context->matrixLoadIdentity(matrixMode);
} }
} }
...@@ -110,7 +110,7 @@ ANGLE_EXPORT GLuint GL_APIENTRY GenPathsCHROMIUM(GLsizei range) ...@@ -110,7 +110,7 @@ ANGLE_EXPORT GLuint GL_APIENTRY GenPathsCHROMIUM(GLsizei range)
{ {
return 0; return 0;
} }
return context->createPaths(range); return context->genPaths(range);
} }
return 0; return 0;
} }
...@@ -141,7 +141,7 @@ ANGLE_EXPORT GLboolean GL_APIENTRY IsPathCHROMIUM(GLuint path) ...@@ -141,7 +141,7 @@ ANGLE_EXPORT GLboolean GL_APIENTRY IsPathCHROMIUM(GLuint path)
{ {
return GL_FALSE; return GL_FALSE;
} }
return context->hasPathData(path); return context->isPath(path);
} }
return GL_FALSE; return GL_FALSE;
} }
...@@ -167,7 +167,7 @@ ANGLE_EXPORT void GL_APIENTRY PathCommandsCHROMIUM(GLuint path, ...@@ -167,7 +167,7 @@ ANGLE_EXPORT void GL_APIENTRY PathCommandsCHROMIUM(GLuint path,
{ {
return; return;
} }
context->setPathCommands(path, numCommands, commands, numCoords, coordType, coords); context->pathCommands(path, numCommands, commands, numCoords, coordType, coords);
} }
} }
...@@ -249,7 +249,7 @@ ANGLE_EXPORT void GL_APIENTRY PathStencilFuncCHROMIUM(GLenum func, GLint ref, GL ...@@ -249,7 +249,7 @@ ANGLE_EXPORT void GL_APIENTRY PathStencilFuncCHROMIUM(GLenum func, GLint ref, GL
{ {
return; return;
} }
context->setPathStencilFunc(func, ref, mask); context->pathStencilFunc(func, ref, mask);
} }
} }
...@@ -711,7 +711,7 @@ ANGLE_EXPORT void GL_APIENTRY GetBooleanvRobustANGLE(GLenum pname, ...@@ -711,7 +711,7 @@ ANGLE_EXPORT void GL_APIENTRY GetBooleanvRobustANGLE(GLenum pname,
return; return;
} }
context->getBooleanv(pname, params); context->getBooleanvRobust(pname, bufSize, length, params);
} }
} }
...@@ -735,8 +735,7 @@ ANGLE_EXPORT void GL_APIENTRY GetBufferParameterivRobustANGLE(GLenum target, ...@@ -735,8 +735,7 @@ ANGLE_EXPORT void GL_APIENTRY GetBufferParameterivRobustANGLE(GLenum target,
return; return;
} }
Buffer *buffer = context->getGLState().getTargetBuffer(targetPacked); context->getBufferParameterivRobust(targetPacked, pname, bufSize, length, params);
QueryBufferParameteriv(buffer, pname, params);
} }
} }
...@@ -758,7 +757,7 @@ ANGLE_EXPORT void GL_APIENTRY GetFloatvRobustANGLE(GLenum pname, ...@@ -758,7 +757,7 @@ ANGLE_EXPORT void GL_APIENTRY GetFloatvRobustANGLE(GLenum pname,
return; return;
} }
context->getFloatv(pname, params); context->getFloatvRobust(pname, bufSize, length, params);
} }
} }
...@@ -783,8 +782,8 @@ ANGLE_EXPORT void GL_APIENTRY GetFramebufferAttachmentParameterivRobustANGLE(GLe ...@@ -783,8 +782,8 @@ ANGLE_EXPORT void GL_APIENTRY GetFramebufferAttachmentParameterivRobustANGLE(GLe
return; return;
} }
const Framebuffer *framebuffer = context->getGLState().getTargetFramebuffer(target); context->getFramebufferAttachmentParameterivRobust(target, attachment, pname, bufSize,
QueryFramebufferAttachmentParameteriv(context, framebuffer, attachment, pname, params); length, params);
} }
} }
...@@ -806,7 +805,7 @@ ANGLE_EXPORT void GL_APIENTRY GetIntegervRobustANGLE(GLenum pname, ...@@ -806,7 +805,7 @@ ANGLE_EXPORT void GL_APIENTRY GetIntegervRobustANGLE(GLenum pname,
return; return;
} }
context->getIntegerv(pname, data); context->getIntegervRobust(pname, bufSize, length, data);
} }
} }
...@@ -829,8 +828,7 @@ ANGLE_EXPORT void GL_APIENTRY GetProgramivRobustANGLE(GLuint program, ...@@ -829,8 +828,7 @@ ANGLE_EXPORT void GL_APIENTRY GetProgramivRobustANGLE(GLuint program,
return; return;
} }
Program *programObject = context->getProgram(program); context->getProgramivRobust(program, pname, bufSize, length, params);
QueryProgramiv(context, programObject, pname, params);
} }
} }
...@@ -854,8 +852,7 @@ ANGLE_EXPORT void GL_APIENTRY GetRenderbufferParameterivRobustANGLE(GLenum targe ...@@ -854,8 +852,7 @@ ANGLE_EXPORT void GL_APIENTRY GetRenderbufferParameterivRobustANGLE(GLenum targe
return; return;
} }
Renderbuffer *renderbuffer = context->getGLState().getCurrentRenderbuffer(); context->getRenderbufferParameterivRobust(target, pname, bufSize, length, params);
QueryRenderbufferiv(context, renderbuffer, pname, params);
} }
} }
...@@ -875,8 +872,7 @@ GetShaderivRobustANGLE(GLuint shader, GLenum pname, GLsizei bufSize, GLsizei *le ...@@ -875,8 +872,7 @@ GetShaderivRobustANGLE(GLuint shader, GLenum pname, GLsizei bufSize, GLsizei *le
return; return;
} }
Shader *shaderObject = context->getShader(shader); context->getShaderivRobust(shader, pname, bufSize, length, params);
QueryShaderiv(context, shaderObject, pname, params);
} }
} }
...@@ -901,8 +897,7 @@ ANGLE_EXPORT void GL_APIENTRY GetTexParameterfvRobustANGLE(GLenum target, ...@@ -901,8 +897,7 @@ ANGLE_EXPORT void GL_APIENTRY GetTexParameterfvRobustANGLE(GLenum target,
return; return;
} }
Texture *texture = context->getTargetTexture(targetPacked); context->getTexParameterfvRobust(targetPacked, pname, bufSize, length, params);
QueryTexParameterfv(texture, pname, params);
} }
} }
...@@ -927,8 +922,7 @@ ANGLE_EXPORT void GL_APIENTRY GetTexParameterivRobustANGLE(GLenum target, ...@@ -927,8 +922,7 @@ ANGLE_EXPORT void GL_APIENTRY GetTexParameterivRobustANGLE(GLenum target,
return; return;
} }
Texture *texture = context->getTargetTexture(targetPacked); context->getTexParameterivRobust(targetPacked, pname, bufSize, length, params);
QueryTexParameteriv(texture, pname, params);
} }
} }
...@@ -951,10 +945,7 @@ ANGLE_EXPORT void GL_APIENTRY GetUniformfvRobustANGLE(GLuint program, ...@@ -951,10 +945,7 @@ ANGLE_EXPORT void GL_APIENTRY GetUniformfvRobustANGLE(GLuint program,
return; return;
} }
Program *programObject = context->getProgram(program); context->getUniformfvRobust(program, location, bufSize, length, params);
ASSERT(programObject);
programObject->getUniformfv(context, location, params);
} }
} }
...@@ -977,10 +968,7 @@ ANGLE_EXPORT void GL_APIENTRY GetUniformivRobustANGLE(GLuint program, ...@@ -977,10 +968,7 @@ ANGLE_EXPORT void GL_APIENTRY GetUniformivRobustANGLE(GLuint program,
return; return;
} }
Program *programObject = context->getProgram(program); context->getUniformivRobust(program, location, bufSize, length, params);
ASSERT(programObject);
programObject->getUniformiv(context, location, params);
} }
} }
...@@ -1003,7 +991,7 @@ ANGLE_EXPORT void GL_APIENTRY GetVertexAttribfvRobustANGLE(GLuint index, ...@@ -1003,7 +991,7 @@ ANGLE_EXPORT void GL_APIENTRY GetVertexAttribfvRobustANGLE(GLuint index,
return; return;
} }
context->getVertexAttribfv(index, pname, params); context->getVertexAttribfvRobust(index, pname, bufSize, length, params);
} }
} }
...@@ -1026,7 +1014,7 @@ ANGLE_EXPORT void GL_APIENTRY GetVertexAttribivRobustANGLE(GLuint index, ...@@ -1026,7 +1014,7 @@ ANGLE_EXPORT void GL_APIENTRY GetVertexAttribivRobustANGLE(GLuint index,
return; return;
} }
context->getVertexAttribiv(index, pname, params); context->getVertexAttribivRobust(index, pname, bufSize, length, params);
} }
} }
...@@ -1050,7 +1038,7 @@ ANGLE_EXPORT void GL_APIENTRY GetVertexAttribPointervRobustANGLE(GLuint index, ...@@ -1050,7 +1038,7 @@ ANGLE_EXPORT void GL_APIENTRY GetVertexAttribPointervRobustANGLE(GLuint index,
return; return;
} }
context->getVertexAttribPointerv(index, pname, pointer); context->getVertexAttribPointervRobust(index, pname, bufSize, length, pointer);
} }
} }
...@@ -1081,7 +1069,8 @@ ANGLE_EXPORT void GL_APIENTRY ReadPixelsRobustANGLE(GLint x, ...@@ -1081,7 +1069,8 @@ ANGLE_EXPORT void GL_APIENTRY ReadPixelsRobustANGLE(GLint x,
return; return;
} }
context->readPixels(x, y, width, height, format, type, pixels); context->readPixelsRobust(x, y, width, height, format, type, bufSize, length, columns, rows,
pixels);
} }
} }
...@@ -1112,8 +1101,8 @@ ANGLE_EXPORT void GL_APIENTRY TexImage2DRobustANGLE(GLenum target, ...@@ -1112,8 +1101,8 @@ ANGLE_EXPORT void GL_APIENTRY TexImage2DRobustANGLE(GLenum target,
return; return;
} }
context->texImage2D(targetPacked, level, internalformat, width, height, border, format, context->texImage2DRobust(targetPacked, level, internalformat, width, height, border,
type, pixels); format, type, bufSize, pixels);
} }
} }
...@@ -1136,8 +1125,7 @@ ANGLE_EXPORT void GL_APIENTRY TexParameterfvRobustANGLE(GLenum target, ...@@ -1136,8 +1125,7 @@ ANGLE_EXPORT void GL_APIENTRY TexParameterfvRobustANGLE(GLenum target,
return; return;
} }
Texture *texture = context->getTargetTexture(targetPacked); context->texParameterfvRobust(targetPacked, pname, bufSize, params);
SetTexParameterfv(context, texture, pname, params);
} }
} }
...@@ -1160,8 +1148,7 @@ ANGLE_EXPORT void GL_APIENTRY TexParameterivRobustANGLE(GLenum target, ...@@ -1160,8 +1148,7 @@ ANGLE_EXPORT void GL_APIENTRY TexParameterivRobustANGLE(GLenum target,
return; return;
} }
Texture *texture = context->getTargetTexture(targetPacked); context->texParameterivRobust(targetPacked, pname, bufSize, params);
SetTexParameteriv(context, texture, pname, params);
} }
} }
...@@ -1192,8 +1179,8 @@ ANGLE_EXPORT void GL_APIENTRY TexSubImage2DRobustANGLE(GLenum target, ...@@ -1192,8 +1179,8 @@ ANGLE_EXPORT void GL_APIENTRY TexSubImage2DRobustANGLE(GLenum target,
return; return;
} }
context->texSubImage2D(targetPacked, level, xoffset, yoffset, width, height, format, type, context->texSubImage2DRobust(targetPacked, level, xoffset, yoffset, width, height, format,
pixels); type, bufSize, pixels);
} }
} }
...@@ -1225,8 +1212,8 @@ ANGLE_EXPORT void GL_APIENTRY TexImage3DRobustANGLE(GLenum target, ...@@ -1225,8 +1212,8 @@ ANGLE_EXPORT void GL_APIENTRY TexImage3DRobustANGLE(GLenum target,
return; return;
} }
context->texImage3D(targetPacked, level, internalformat, width, height, depth, border, context->texImage3DRobust(targetPacked, level, internalformat, width, height, depth, border,
format, type, pixels); format, type, bufSize, pixels);
} }
} }
...@@ -1262,8 +1249,8 @@ ANGLE_EXPORT void GL_APIENTRY TexSubImage3DRobustANGLE(GLenum target, ...@@ -1262,8 +1249,8 @@ ANGLE_EXPORT void GL_APIENTRY TexSubImage3DRobustANGLE(GLenum target,
return; return;
} }
context->texSubImage3D(targetPacked, level, xoffset, yoffset, zoffset, width, height, depth, context->texSubImage3DRobust(targetPacked, level, xoffset, yoffset, zoffset, width, height,
format, type, pixels); depth, format, type, bufSize, pixels);
} }
} }
...@@ -1295,8 +1282,8 @@ void GL_APIENTRY CompressedTexImage2DRobustANGLE(GLenum target, ...@@ -1295,8 +1282,8 @@ void GL_APIENTRY CompressedTexImage2DRobustANGLE(GLenum target,
return; return;
} }
context->compressedTexImage2D(targetPacked, level, internalformat, width, height, border, context->compressedTexImage2DRobust(targetPacked, level, internalformat, width, height,
imageSize, data); border, imageSize, dataSize, data);
} }
} }
...@@ -1328,8 +1315,8 @@ void GL_APIENTRY CompressedTexSubImage2DRobustANGLE(GLenum target, ...@@ -1328,8 +1315,8 @@ void GL_APIENTRY CompressedTexSubImage2DRobustANGLE(GLenum target,
return; return;
} }
context->compressedTexSubImage2D(targetPacked, level, xoffset, yoffset, width, height, context->compressedTexSubImage2DRobust(targetPacked, level, xoffset, yoffset, width, height,
format, imageSize, data); format, imageSize, dataSize, data);
} }
} }
...@@ -1362,8 +1349,8 @@ void GL_APIENTRY CompressedTexImage3DRobustANGLE(GLenum target, ...@@ -1362,8 +1349,8 @@ void GL_APIENTRY CompressedTexImage3DRobustANGLE(GLenum target,
return; return;
} }
context->compressedTexImage3D(targetPacked, level, internalformat, width, height, depth, context->compressedTexImage3DRobust(targetPacked, level, internalformat, width, height,
border, imageSize, data); depth, border, imageSize, dataSize, data);
} }
} }
...@@ -1400,8 +1387,9 @@ void GL_APIENTRY CompressedTexSubImage3DRobustANGLE(GLenum target, ...@@ -1400,8 +1387,9 @@ void GL_APIENTRY CompressedTexSubImage3DRobustANGLE(GLenum target,
return; return;
} }
context->compressedTexSubImage3D(targetPacked, level, xoffset, yoffset, zoffset, width, context->compressedTexSubImage3DRobust(targetPacked, level, xoffset, yoffset, zoffset,
height, depth, format, imageSize, data); width, height, depth, format, imageSize, dataSize,
data);
} }
} }
...@@ -1421,7 +1409,7 @@ GetQueryivRobustANGLE(GLenum target, GLenum pname, GLsizei bufSize, GLsizei *len ...@@ -1421,7 +1409,7 @@ GetQueryivRobustANGLE(GLenum target, GLenum pname, GLsizei bufSize, GLsizei *len
return; return;
} }
context->getQueryiv(target, pname, params); context->getQueryivRobust(target, pname, bufSize, length, params);
} }
} }
...@@ -1444,7 +1432,7 @@ ANGLE_EXPORT void GL_APIENTRY GetQueryObjectuivRobustANGLE(GLuint id, ...@@ -1444,7 +1432,7 @@ ANGLE_EXPORT void GL_APIENTRY GetQueryObjectuivRobustANGLE(GLuint id,
return; return;
} }
context->getQueryObjectuiv(id, pname, params); context->getQueryObjectuivRobust(id, pname, bufSize, length, params);
} }
} }
...@@ -1470,7 +1458,7 @@ ANGLE_EXPORT void GL_APIENTRY GetBufferPointervRobustANGLE(GLenum target, ...@@ -1470,7 +1458,7 @@ ANGLE_EXPORT void GL_APIENTRY GetBufferPointervRobustANGLE(GLenum target,
return; return;
} }
context->getBufferPointerv(targetPacked, pname, params); context->getBufferPointervRobust(targetPacked, pname, bufSize, length, params);
} }
} }
...@@ -1490,7 +1478,7 @@ GetIntegeri_vRobustANGLE(GLenum target, GLuint index, GLsizei bufSize, GLsizei * ...@@ -1490,7 +1478,7 @@ GetIntegeri_vRobustANGLE(GLenum target, GLuint index, GLsizei bufSize, GLsizei *
return; return;
} }
context->getIntegeri_v(target, index, data); context->getIntegeri_vRobust(target, index, bufSize, length, data);
} }
} }
...@@ -1515,8 +1503,7 @@ ANGLE_EXPORT void GL_APIENTRY GetInternalformativRobustANGLE(GLenum target, ...@@ -1515,8 +1503,7 @@ ANGLE_EXPORT void GL_APIENTRY GetInternalformativRobustANGLE(GLenum target,
return; return;
} }
const TextureCaps &formatCaps = context->getTextureCaps().get(internalformat); context->getInternalformativRobust(target, internalformat, pname, bufSize, length, params);
QueryInternalFormativ(formatCaps, pname, bufSize, params);
} }
} }
...@@ -1539,7 +1526,7 @@ ANGLE_EXPORT void GL_APIENTRY GetVertexAttribIivRobustANGLE(GLuint index, ...@@ -1539,7 +1526,7 @@ ANGLE_EXPORT void GL_APIENTRY GetVertexAttribIivRobustANGLE(GLuint index,
return; return;
} }
context->getVertexAttribIiv(index, pname, params); context->getVertexAttribIivRobust(index, pname, bufSize, length, params);
} }
} }
...@@ -1562,7 +1549,7 @@ ANGLE_EXPORT void GL_APIENTRY GetVertexAttribIuivRobustANGLE(GLuint index, ...@@ -1562,7 +1549,7 @@ ANGLE_EXPORT void GL_APIENTRY GetVertexAttribIuivRobustANGLE(GLuint index,
return; return;
} }
context->getVertexAttribIuiv(index, pname, params); context->getVertexAttribIuivRobust(index, pname, bufSize, length, params);
} }
} }
...@@ -1585,10 +1572,7 @@ ANGLE_EXPORT void GL_APIENTRY GetUniformuivRobustANGLE(GLuint program, ...@@ -1585,10 +1572,7 @@ ANGLE_EXPORT void GL_APIENTRY GetUniformuivRobustANGLE(GLuint program,
return; return;
} }
Program *programObject = context->getProgram(program); context->getUniformuivRobust(program, location, bufSize, length, params);
ASSERT(programObject);
programObject->getUniformuiv(context, location, params);
} }
} }
...@@ -1613,8 +1597,8 @@ ANGLE_EXPORT void GL_APIENTRY GetActiveUniformBlockivRobustANGLE(GLuint program, ...@@ -1613,8 +1597,8 @@ ANGLE_EXPORT void GL_APIENTRY GetActiveUniformBlockivRobustANGLE(GLuint program,
return; return;
} }
const Program *programObject = context->getProgram(program); context->getActiveUniformBlockivRobust(program, uniformBlockIndex, pname, bufSize, length,
QueryActiveUniformBlockiv(programObject, uniformBlockIndex, pname, params); params);
} }
} }
...@@ -1636,7 +1620,7 @@ ANGLE_EXPORT void GL_APIENTRY GetInteger64vRobustANGLE(GLenum pname, ...@@ -1636,7 +1620,7 @@ ANGLE_EXPORT void GL_APIENTRY GetInteger64vRobustANGLE(GLenum pname,
return; return;
} }
context->getInteger64v(pname, data); context->getInteger64vRobust(pname, bufSize, length, data);
} }
} }
...@@ -1659,7 +1643,7 @@ ANGLE_EXPORT void GL_APIENTRY GetInteger64i_vRobustANGLE(GLenum target, ...@@ -1659,7 +1643,7 @@ ANGLE_EXPORT void GL_APIENTRY GetInteger64i_vRobustANGLE(GLenum target,
return; return;
} }
context->getInteger64i_v(target, index, data); context->getInteger64i_vRobust(target, index, bufSize, length, data);
} }
} }
...@@ -1683,8 +1667,7 @@ ANGLE_EXPORT void GL_APIENTRY GetBufferParameteri64vRobustANGLE(GLenum target, ...@@ -1683,8 +1667,7 @@ ANGLE_EXPORT void GL_APIENTRY GetBufferParameteri64vRobustANGLE(GLenum target,
return; return;
} }
Buffer *buffer = context->getGLState().getTargetBuffer(targetPacked); context->getBufferParameteri64vRobust(targetPacked, pname, bufSize, length, params);
QueryBufferParameteri64v(buffer, pname, params);
} }
} }
...@@ -1706,7 +1689,7 @@ ANGLE_EXPORT void GL_APIENTRY SamplerParameterivRobustANGLE(GLuint sampler, ...@@ -1706,7 +1689,7 @@ ANGLE_EXPORT void GL_APIENTRY SamplerParameterivRobustANGLE(GLuint sampler,
return; return;
} }
context->samplerParameteriv(sampler, pname, param); context->samplerParameterivRobust(sampler, pname, bufSize, param);
} }
} }
...@@ -1728,7 +1711,7 @@ ANGLE_EXPORT void GL_APIENTRY SamplerParameterfvRobustANGLE(GLuint sampler, ...@@ -1728,7 +1711,7 @@ ANGLE_EXPORT void GL_APIENTRY SamplerParameterfvRobustANGLE(GLuint sampler,
return; return;
} }
context->samplerParameterfv(sampler, pname, param); context->samplerParameterfvRobust(sampler, pname, bufSize, param);
} }
} }
...@@ -1752,7 +1735,7 @@ ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterivRobustANGLE(GLuint sampler, ...@@ -1752,7 +1735,7 @@ ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterivRobustANGLE(GLuint sampler,
return; return;
} }
context->getSamplerParameteriv(sampler, pname, params); context->getSamplerParameterivRobust(sampler, pname, bufSize, length, params);
} }
} }
...@@ -1776,7 +1759,7 @@ ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterfvRobustANGLE(GLuint sampler, ...@@ -1776,7 +1759,7 @@ ANGLE_EXPORT void GL_APIENTRY GetSamplerParameterfvRobustANGLE(GLuint sampler,
return; return;
} }
context->getSamplerParameterfv(sampler, pname, params); context->getSamplerParameterfvRobust(sampler, pname, bufSize, length, params);
} }
} }
...@@ -1825,7 +1808,7 @@ ANGLE_EXPORT void GL_APIENTRY GetBooleani_vRobustANGLE(GLenum target, ...@@ -1825,7 +1808,7 @@ ANGLE_EXPORT void GL_APIENTRY GetBooleani_vRobustANGLE(GLenum target,
return; return;
} }
context->getBooleani_v(target, index, data); context->getBooleani_vRobust(target, index, bufSize, length, data);
} }
} }
...@@ -1909,7 +1892,8 @@ ANGLE_EXPORT void GL_APIENTRY ReadnPixelsRobustANGLE(GLint x, ...@@ -1909,7 +1892,8 @@ ANGLE_EXPORT void GL_APIENTRY ReadnPixelsRobustANGLE(GLint x,
return; return;
} }
context->readPixels(x, y, width, height, format, type, data); context->readnPixelsRobust(x, y, width, height, format, type, bufSize, length, columns,
rows, data);
} }
} }
...@@ -2071,7 +2055,7 @@ ANGLE_EXPORT void GL_APIENTRY GetQueryObjectivRobustANGLE(GLuint id, ...@@ -2071,7 +2055,7 @@ ANGLE_EXPORT void GL_APIENTRY GetQueryObjectivRobustANGLE(GLuint id,
return; return;
} }
context->getQueryObjectiv(id, pname, params); context->getQueryObjectivRobust(id, pname, bufSize, length, params);
} }
} }
...@@ -2094,7 +2078,7 @@ ANGLE_EXPORT void GL_APIENTRY GetQueryObjecti64vRobustANGLE(GLuint id, ...@@ -2094,7 +2078,7 @@ ANGLE_EXPORT void GL_APIENTRY GetQueryObjecti64vRobustANGLE(GLuint id,
return; return;
} }
context->getQueryObjecti64v(id, pname, params); context->getQueryObjecti64vRobust(id, pname, bufSize, length, params);
} }
} }
...@@ -2117,7 +2101,7 @@ ANGLE_EXPORT void GL_APIENTRY GetQueryObjectui64vRobustANGLE(GLuint id, ...@@ -2117,7 +2101,7 @@ ANGLE_EXPORT void GL_APIENTRY GetQueryObjectui64vRobustANGLE(GLuint id,
return; return;
} }
context->getQueryObjectui64v(id, pname, params); context->getQueryObjectui64vRobust(id, pname, bufSize, length, params);
} }
} }
...@@ -2141,7 +2125,7 @@ GL_APICALL void GL_APIENTRY FramebufferTextureMultiviewLayeredANGLE(GLenum targe ...@@ -2141,7 +2125,7 @@ GL_APICALL void GL_APIENTRY FramebufferTextureMultiviewLayeredANGLE(GLenum targe
{ {
return; return;
} }
context->framebufferTextureMultiviewLayeredANGLE(target, attachment, texture, level, context->framebufferTextureMultiviewLayered(target, attachment, texture, level,
baseViewIndex, numViews); baseViewIndex, numViews);
} }
} }
...@@ -2166,8 +2150,8 @@ GL_APICALL void GL_APIENTRY FramebufferTextureMultiviewSideBySideANGLE(GLenum ta ...@@ -2166,8 +2150,8 @@ GL_APICALL void GL_APIENTRY FramebufferTextureMultiviewSideBySideANGLE(GLenum ta
{ {
return; return;
} }
context->framebufferTextureMultiviewSideBySideANGLE(target, attachment, texture, level, context->framebufferTextureMultiviewSideBySide(target, attachment, texture, level, numViews,
numViews, viewportOffsets); viewportOffsets);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment