Skip to content

A
angle
Commit 851edac7 by Jamie Madill Committed by Commit Bot
Options

GLES3: Use more compact entry point style.

This migrates to the new generation style used in GLES2. BUG=angleproject:1309 Change-Id: I43e9d33a0d7c5b1786452895855ff2bfbf82f139 Reviewed-on: https://chromium-review.googlesource.com/638311Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent fa08cae7
Showing with 484 additions and 477 deletions
scripts/generate_entry_points.py
......@@ -237,7 +237,7 @@ for cmd_name in gles3_commands:
proto = "".join(command.find("./proto").itertext())
cmd_names += [cmd_name]
entry_point_decls_gles_3_0 += [format_entry_point_decl(cmd_name, proto, params)]
entry_point_defs_gles_3_0 += [format_entry_point_def_oldstyle(cmd_name, proto, params)]
entry_point_defs_gles_3_0 += [format_entry_point_def(cmd_name, proto, params)]
gles_2_0_header = template_entry_point_header.format(
script_name = os.path.basename(sys.argv[0]),
......
src/libGLESv2/entry_points_gles_3_0_autogen.cpp
......@@ -21,13 +21,13 @@ void GL_APIENTRY ReadBuffer(GLenum src)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateReadBuffer(context, src))
{
return;
}
context->gatherParams<EntryPoint::ReadBuffer>(src);
if (context->skipValidation() || ValidateReadBuffer(context, src))
{
context->readBuffer(src);
}
}
}
void GL_APIENTRY DrawRangeElements(GLenum mode,
......@@ -48,14 +48,12 @@ void GL_APIENTRY DrawRangeElements(GLenum mode,
context->gatherParams<EntryPoint::DrawRangeElements>(mode, start, end, count, type,
indices);
if (!context->skipValidation() &&
!ValidateDrawRangeElements(context, mode, start, end, count, type, indices))
if (context->skipValidation() ||
ValidateDrawRangeElements(context, mode, start, end, count, type, indices))
{
return;
}
context->drawRangeElements(mode, start, end, count, type, indices);
}
}
}
void GL_APIENTRY TexImage3D(GLenum target,
......@@ -78,16 +76,17 @@ void GL_APIENTRY TexImage3D(GLenum target,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateTexImage3D(context, target, level, internalformat, width, height, depth,
border, format, type, pixels))
{
return;
}
context->gatherParams<EntryPoint::TexImage3D>(target, level, internalformat, width, height,
depth, border, format, type, pixels);
if (context->skipValidation() ||
ValidateTexImage3D(context, target, level, internalformat, width, height, depth, border,
format, type, pixels))
{
context->texImage3D(target, level, internalformat, width, height, depth, border, format,
type, pixels);
}
}
}
void GL_APIENTRY TexSubImage3D(GLenum target,
......@@ -111,16 +110,17 @@ void GL_APIENTRY TexSubImage3D(GLenum target,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateTexSubImage3D(context, target, level, xoffset, yoffset, zoffset, width, height,
context->gatherParams<EntryPoint::TexSubImage3D>(
target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
if (context->skipValidation() ||
ValidateTexSubImage3D(context, target, level, xoffset, yoffset, zoffset, width, height,
depth, format, type, pixels))
{
return;
}
context->texSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth,
format, type, pixels);
}
}
}
void GL_APIENTRY CopyTexSubImage3D(GLenum target,
......@@ -141,14 +141,16 @@ void GL_APIENTRY CopyTexSubImage3D(GLenum target,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateCopyTexSubImage3D(context, target, level, xoffset, yoffset, zoffset, x, y,
context->gatherParams<EntryPoint::CopyTexSubImage3D>(target, level, xoffset, yoffset,
zoffset, x, y, width, height);
if (context->skipValidation() ||
ValidateCopyTexSubImage3D(context, target, level, xoffset, yoffset, zoffset, x, y,
width, height))
{
return;
context->copyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width,
height);
}
context->copyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
}
}
......@@ -171,15 +173,16 @@ void GL_APIENTRY CompressedTexImage3D(GLenum target,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateCompressedTexImage3D(context, target, level, internalformat, width, height,
context->gatherParams<EntryPoint::CompressedTexImage3D>(
target, level, internalformat, width, height, depth, border, imageSize, data);
if (context->skipValidation() ||
ValidateCompressedTexImage3D(context, target, level, internalformat, width, height,
depth, border, imageSize, data))
{
return;
context->compressedTexImage3D(target, level, internalformat, width, height, depth,
border, imageSize, data);
}
context->compressedTexImage3D(target, level, internalformat, width, height, depth, border,
imageSize, data);
}
}
......@@ -204,15 +207,17 @@ void GL_APIENTRY CompressedTexSubImage3D(GLenum target,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateCompressedTexSubImage3D(context, target, level, xoffset, yoffset, zoffset,
context->gatherParams<EntryPoint::CompressedTexSubImage3D>(target, level, xoffset, yoffset,
zoffset, width, height, depth,
format, imageSize, data);
if (context->skipValidation() ||
ValidateCompressedTexSubImage3D(context, target, level, xoffset, yoffset, zoffset,
width, height, depth, format, imageSize, data))
{
return;
context->compressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width,
height, depth, format, imageSize, data);
}
context->compressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height,
depth, format, imageSize, data);
}
}
......@@ -223,13 +228,13 @@ void GL_APIENTRY GenQueries(GLsizei n, GLuint *ids)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateGenQueries(context, n, ids))
{
return;
}
context->gatherParams<EntryPoint::GenQueries>(n, ids);
if (context->skipValidation() || ValidateGenQueries(context, n, ids))
{
context->genQueries(n, ids);
}
}
}
void GL_APIENTRY DeleteQueries(GLsizei n, const GLuint *ids)
......@@ -239,13 +244,13 @@ void GL_APIENTRY DeleteQueries(GLsizei n, const GLuint *ids)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateDeleteQueries(context, n, ids))
{
return;
}
context->gatherParams<EntryPoint::DeleteQueries>(n, ids);
if (context->skipValidation() || ValidateDeleteQueries(context, n, ids))
{
context->deleteQueries(n, ids);
}
}
}
GLboolean GL_APIENTRY IsQuery(GLuint id)
......@@ -255,13 +260,13 @@ GLboolean GL_APIENTRY IsQuery(GLuint id)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateIsQuery(context, id))
{
return GetDefaultReturnValue<EntryPoint::IsQuery, GLboolean>();
}
context->gatherParams<EntryPoint::IsQuery>(id);
if (context->skipValidation() || ValidateIsQuery(context, id))
{
return context->isQuery(id);
}
}
return GetDefaultReturnValue<EntryPoint::IsQuery, GLboolean>();
}
......@@ -273,13 +278,13 @@ void GL_APIENTRY BeginQuery(GLenum target, GLuint id)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateBeginQuery(context, target, id))
{
return;
}
context->gatherParams<EntryPoint::BeginQuery>(target, id);
if (context->skipValidation() || ValidateBeginQuery(context, target, id))
{
context->beginQuery(target, id);
}
}
}
void GL_APIENTRY EndQuery(GLenum target)
......@@ -289,13 +294,13 @@ void GL_APIENTRY EndQuery(GLenum target)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateEndQuery(context, target))
{
return;
}
context->gatherParams<EntryPoint::EndQuery>(target);
if (context->skipValidation() || ValidateEndQuery(context, target))
{
context->endQuery(target);
}
}
}
void GL_APIENTRY GetQueryiv(GLenum target, GLenum pname, GLint *params)
......@@ -306,13 +311,13 @@ void GL_APIENTRY GetQueryiv(GLenum target, GLenum pname, GLint *params)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateGetQueryiv(context, target, pname, params))
{
return;
}
context->gatherParams<EntryPoint::GetQueryiv>(target, pname, params);
if (context->skipValidation() || ValidateGetQueryiv(context, target, pname, params))
{
context->getQueryiv(target, pname, params);
}
}
}
void GL_APIENTRY GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
......@@ -322,13 +327,13 @@ void GL_APIENTRY GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateGetQueryObjectuiv(context, id, pname, params))
{
return;
}
context->gatherParams<EntryPoint::GetQueryObjectuiv>(id, pname, params);
if (context->skipValidation() || ValidateGetQueryObjectuiv(context, id, pname, params))
{
context->getQueryObjectuiv(id, pname, params);
}
}
}
GLboolean GL_APIENTRY UnmapBuffer(GLenum target)
......@@ -338,13 +343,13 @@ GLboolean GL_APIENTRY UnmapBuffer(GLenum target)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateUnmapBuffer(context, target))
{
return GetDefaultReturnValue<EntryPoint::UnmapBuffer, GLboolean>();
}
context->gatherParams<EntryPoint::UnmapBuffer>(target);
if (context->skipValidation() || ValidateUnmapBuffer(context, target))
{
return context->unmapBuffer(target);
}
}
return GetDefaultReturnValue<EntryPoint::UnmapBuffer, GLboolean>();
}
......@@ -357,14 +362,13 @@ void GL_APIENTRY GetBufferPointerv(GLenum target, GLenum pname, void **params)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateGetBufferPointerv(context, target, pname, params))
{
return;
}
context->gatherParams<EntryPoint::GetBufferPointerv>(target, pname, params);
if (context->skipValidation() || ValidateGetBufferPointerv(context, target, pname, params))
{
context->getBufferPointerv(target, pname, params);
}
}
}
void GL_APIENTRY DrawBuffers(GLsizei n, const GLenum *bufs)
......@@ -374,13 +378,13 @@ void GL_APIENTRY DrawBuffers(GLsizei n, const GLenum *bufs)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateDrawBuffers(context, n, bufs))
{
return;
}
context->gatherParams<EntryPoint::DrawBuffers>(n, bufs);
if (context->skipValidation() || ValidateDrawBuffers(context, n, bufs))
{
context->drawBuffers(n, bufs);
}
}
}
void GL_APIENTRY UniformMatrix2x3fv(GLint location,
......@@ -396,14 +400,14 @@ void GL_APIENTRY UniformMatrix2x3fv(GLint location,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateUniformMatrix2x3fv(context, location, count, transpose, value))
{
return;
}
context->gatherParams<EntryPoint::UniformMatrix2x3fv>(location, count, transpose, value);
if (context->skipValidation() ||
ValidateUniformMatrix2x3fv(context, location, count, transpose, value))
{
context->uniformMatrix2x3fv(location, count, transpose, value);
}
}
}
void GL_APIENTRY UniformMatrix3x2fv(GLint location,
......@@ -419,14 +423,14 @@ void GL_APIENTRY UniformMatrix3x2fv(GLint location,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateUniformMatrix3x2fv(context, location, count, transpose, value))
{
return;
}
context->gatherParams<EntryPoint::UniformMatrix3x2fv>(location, count, transpose, value);
if (context->skipValidation() ||
ValidateUniformMatrix3x2fv(context, location, count, transpose, value))
{
context->uniformMatrix3x2fv(location, count, transpose, value);
}
}
}
void GL_APIENTRY UniformMatrix2x4fv(GLint location,
......@@ -442,14 +446,14 @@ void GL_APIENTRY UniformMatrix2x4fv(GLint location,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateUniformMatrix2x4fv(context, location, count, transpose, value))
{
return;
}
context->gatherParams<EntryPoint::UniformMatrix2x4fv>(location, count, transpose, value);
if (context->skipValidation() ||
ValidateUniformMatrix2x4fv(context, location, count, transpose, value))
{
context->uniformMatrix2x4fv(location, count, transpose, value);
}
}
}
void GL_APIENTRY UniformMatrix4x2fv(GLint location,
......@@ -465,14 +469,14 @@ void GL_APIENTRY UniformMatrix4x2fv(GLint location,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateUniformMatrix4x2fv(context, location, count, transpose, value))
{
return;
}
context->gatherParams<EntryPoint::UniformMatrix4x2fv>(location, count, transpose, value);
if (context->skipValidation() ||
ValidateUniformMatrix4x2fv(context, location, count, transpose, value))
{
context->uniformMatrix4x2fv(location, count, transpose, value);
}
}
}
void GL_APIENTRY UniformMatrix3x4fv(GLint location,
......@@ -488,14 +492,14 @@ void GL_APIENTRY UniformMatrix3x4fv(GLint location,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateUniformMatrix3x4fv(context, location, count, transpose, value))
{
return;
}
context->gatherParams<EntryPoint::UniformMatrix3x4fv>(location, count, transpose, value);
if (context->skipValidation() ||
ValidateUniformMatrix3x4fv(context, location, count, transpose, value))
{
context->uniformMatrix3x4fv(location, count, transpose, value);
}
}
}
void GL_APIENTRY UniformMatrix4x3fv(GLint location,
......@@ -511,14 +515,14 @@ void GL_APIENTRY UniformMatrix4x3fv(GLint location,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateUniformMatrix4x3fv(context, location, count, transpose, value))
{
return;
}
context->gatherParams<EntryPoint::UniformMatrix4x3fv>(location, count, transpose, value);
if (context->skipValidation() ||
ValidateUniformMatrix4x3fv(context, location, count, transpose, value))
{
context->uniformMatrix4x3fv(location, count, transpose, value);
}
}
}
void GL_APIENTRY BlitFramebuffer(GLint srcX0,
......@@ -541,16 +545,17 @@ void GL_APIENTRY BlitFramebuffer(GLint srcX0,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateBlitFramebuffer(context, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1,
dstY1, mask, filter))
{
return;
}
context->gatherParams<EntryPoint::BlitFramebuffer>(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0,
dstX1, dstY1, mask, filter);
if (context->skipValidation() ||
ValidateBlitFramebuffer(context, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1,
mask, filter))
{
context->blitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask,
filter);
}
}
}
void GL_APIENTRY RenderbufferStorageMultisample(GLenum target,
......@@ -567,15 +572,16 @@ void GL_APIENTRY RenderbufferStorageMultisample(GLenum target,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateRenderbufferStorageMultisample(context, target, samples, internalformat, width,
context->gatherParams<EntryPoint::RenderbufferStorageMultisample>(
target, samples, internalformat, width, height);
if (context->skipValidation() ||
ValidateRenderbufferStorageMultisample(context, target, samples, internalformat, width,
height))
{
return;
}
context->renderbufferStorageMultisample(target, samples, internalformat, width, height);
}
}
}
void GL_APIENTRY
......@@ -589,14 +595,15 @@ FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateFramebufferTextureLayer(context, target, attachment, texture, level, layer))
{
return;
}
context->gatherParams<EntryPoint::FramebufferTextureLayer>(target, attachment, texture,
level, layer);
if (context->skipValidation() ||
ValidateFramebufferTextureLayer(context, target, attachment, texture, level, layer))
{
context->framebufferTextureLayer(target, attachment, texture, level, layer);
}
}
}
void *GL_APIENTRY MapBufferRange(GLenum target,
......@@ -612,14 +619,14 @@ void *GL_APIENTRY MapBufferRange(GLenum target,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateMapBufferRange(context, target, offset, length, access))
{
return GetDefaultReturnValue<EntryPoint::MapBufferRange, void *>();
}
context->gatherParams<EntryPoint::MapBufferRange>(target, offset, length, access);
if (context->skipValidation() ||
ValidateMapBufferRange(context, target, offset, length, access))
{
return context->mapBufferRange(target, offset, length, access);
}
}
return GetDefaultReturnValue<EntryPoint::MapBufferRange, void *>();
}
......@@ -632,14 +639,14 @@ void GL_APIENTRY FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeip
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateFlushMappedBufferRange(context, target, offset, length))
{
return;
}
context->gatherParams<EntryPoint::FlushMappedBufferRange>(target, offset, length);
if (context->skipValidation() ||
ValidateFlushMappedBufferRange(context, target, offset, length))
{
context->flushMappedBufferRange(target, offset, length);
}
}
}
void GL_APIENTRY BindVertexArray(GLuint array)
......@@ -649,13 +656,13 @@ void GL_APIENTRY BindVertexArray(GLuint array)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateBindVertexArray(context, array))
{
return;
}
context->gatherParams<EntryPoint::BindVertexArray>(array);
if (context->skipValidation() || ValidateBindVertexArray(context, array))
{
context->bindVertexArray(array);
}
}
}
void GL_APIENTRY DeleteVertexArrays(GLsizei n, const GLuint *arrays)
......@@ -665,13 +672,13 @@ void GL_APIENTRY DeleteVertexArrays(GLsizei n, const GLuint *arrays)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateDeleteVertexArrays(context, n, arrays))
{
return;
}
context->gatherParams<EntryPoint::DeleteVertexArrays>(n, arrays);
if (context->skipValidation() || ValidateDeleteVertexArrays(context, n, arrays))
{
context->deleteVertexArrays(n, arrays);
}
}
}
void GL_APIENTRY GenVertexArrays(GLsizei n, GLuint *arrays)
......@@ -681,13 +688,13 @@ void GL_APIENTRY GenVertexArrays(GLsizei n, GLuint *arrays)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateGenVertexArrays(context, n, arrays))
{
return;
}
context->gatherParams<EntryPoint::GenVertexArrays>(n, arrays);
if (context->skipValidation() || ValidateGenVertexArrays(context, n, arrays))
{
context->genVertexArrays(n, arrays);
}
}
}
GLboolean GL_APIENTRY IsVertexArray(GLuint array)
......@@ -697,13 +704,13 @@ GLboolean GL_APIENTRY IsVertexArray(GLuint array)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateIsVertexArray(context, array))
{
return GetDefaultReturnValue<EntryPoint::IsVertexArray, GLboolean>();
}
context->gatherParams<EntryPoint::IsVertexArray>(array);
if (context->skipValidation() || ValidateIsVertexArray(context, array))
{
return context->isVertexArray(array);
}
}
return GetDefaultReturnValue<EntryPoint::IsVertexArray, GLboolean>();
}
......@@ -715,13 +722,13 @@ void GL_APIENTRY GetIntegeri_v(GLenum target, GLuint index, GLint *data)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateGetIntegeri_v(context, target, index, data))
{
return;
}
context->gatherParams<EntryPoint::GetIntegeri_v>(target, index, data);
if (context->skipValidation() || ValidateGetIntegeri_v(context, target, index, data))
{
context->getIntegeri_v(target, index, data);
}
}
}
void GL_APIENTRY BeginTransformFeedback(GLenum primitiveMode)
......@@ -731,13 +738,13 @@ void GL_APIENTRY BeginTransformFeedback(GLenum primitiveMode)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateBeginTransformFeedback(context, primitiveMode))
{
return;
}
context->gatherParams<EntryPoint::BeginTransformFeedback>(primitiveMode);
if (context->skipValidation() || ValidateBeginTransformFeedback(context, primitiveMode))
{
context->beginTransformFeedback(primitiveMode);
}
}
}
void GL_APIENTRY EndTransformFeedback()
......@@ -747,13 +754,13 @@ void GL_APIENTRY EndTransformFeedback()
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateEndTransformFeedback(context))
{
return;
}
context->gatherParams<EntryPoint::EndTransformFeedback>();
if (context->skipValidation() || ValidateEndTransformFeedback(context))
{
context->endTransformFeedback();
}
}
}
void GL_APIENTRY
......@@ -767,14 +774,14 @@ BindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLs
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateBindBufferRange(context, target, index, buffer, offset, size))
{
return;
}
context->gatherParams<EntryPoint::BindBufferRange>(target, index, buffer, offset, size);
if (context->skipValidation() ||
ValidateBindBufferRange(context, target, index, buffer, offset, size))
{
context->bindBufferRange(target, index, buffer, offset, size);
}
}
}
void GL_APIENTRY BindBufferBase(GLenum target, GLuint index, GLuint buffer)
......@@ -784,13 +791,13 @@ void GL_APIENTRY BindBufferBase(GLenum target, GLuint index, GLuint buffer)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateBindBufferBase(context, target, index, buffer))
{
return;
}
context->gatherParams<EntryPoint::BindBufferBase>(target, index, buffer);
if (context->skipValidation() || ValidateBindBufferBase(context, target, index, buffer))
{
context->bindBufferBase(target, index, buffer);
}
}
}
void GL_APIENTRY TransformFeedbackVaryings(GLuint program,
......@@ -806,14 +813,15 @@ void GL_APIENTRY TransformFeedbackVaryings(GLuint program,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateTransformFeedbackVaryings(context, program, count, varyings, bufferMode))
{
return;
}
context->gatherParams<EntryPoint::TransformFeedbackVaryings>(program, count, varyings,
bufferMode);
if (context->skipValidation() ||
ValidateTransformFeedbackVaryings(context, program, count, varyings, bufferMode))
{
context->transformFeedbackVaryings(program, count, varyings, bufferMode);
}
}
}
void GL_APIENTRY GetTransformFeedbackVarying(GLuint program,
......@@ -832,15 +840,16 @@ void GL_APIENTRY GetTransformFeedbackVarying(GLuint program,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateGetTransformFeedbackVarying(context, program, index, bufSize, length, size,
context->gatherParams<EntryPoint::GetTransformFeedbackVarying>(program, index, bufSize,
length, size, type, name);
if (context->skipValidation() ||
ValidateGetTransformFeedbackVarying(context, program, index, bufSize, length, size,
type, name))
{
return;
}
context->getTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
}
}
}
void GL_APIENTRY
......@@ -854,14 +863,14 @@ VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, cons
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateVertexAttribIPointer(context, index, size, type, stride, pointer))
{
return;
}
context->gatherParams<EntryPoint::VertexAttribIPointer>(index, size, type, stride, pointer);
if (context->skipValidation() ||
ValidateVertexAttribIPointer(context, index, size, type, stride, pointer))
{
context->vertexAttribIPointer(index, size, type, stride, pointer);
}
}
}
void GL_APIENTRY GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
......@@ -872,14 +881,13 @@ void GL_APIENTRY GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateGetVertexAttribIiv(context, index, pname, params))
{
return;
}
context->gatherParams<EntryPoint::GetVertexAttribIiv>(index, pname, params);
if (context->skipValidation() || ValidateGetVertexAttribIiv(context, index, pname, params))
{
context->getVertexAttribIiv(index, pname, params);
}
}
}
void GL_APIENTRY GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
......@@ -890,14 +898,13 @@ void GL_APIENTRY GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateGetVertexAttribIuiv(context, index, pname, params))
{
return;
}
context->gatherParams<EntryPoint::GetVertexAttribIuiv>(index, pname, params);
if (context->skipValidation() || ValidateGetVertexAttribIuiv(context, index, pname, params))
{
context->getVertexAttribIuiv(index, pname, params);
}
}
}
void GL_APIENTRY VertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
......@@ -908,13 +915,13 @@ void GL_APIENTRY VertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateVertexAttribI4i(context, index, x, y, z, w))
{
return;
}
context->gatherParams<EntryPoint::VertexAttribI4i>(index, x, y, z, w);
if (context->skipValidation() || ValidateVertexAttribI4i(context, index, x, y, z, w))
{
context->vertexAttribI4i(index, x, y, z, w);
}
}
}
void GL_APIENTRY VertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
......@@ -925,13 +932,13 @@ void GL_APIENTRY VertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GL
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateVertexAttribI4ui(context, index, x, y, z, w))
{
return;
}
context->gatherParams<EntryPoint::VertexAttribI4ui>(index, x, y, z, w);
if (context->skipValidation() || ValidateVertexAttribI4ui(context, index, x, y, z, w))
{
context->vertexAttribI4ui(index, x, y, z, w);
}
}
}
void GL_APIENTRY VertexAttribI4iv(GLuint index, const GLint *v)
......@@ -941,13 +948,13 @@ void GL_APIENTRY VertexAttribI4iv(GLuint index, const GLint *v)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateVertexAttribI4iv(context, index, v))
{
return;
}
context->gatherParams<EntryPoint::VertexAttribI4iv>(index, v);
if (context->skipValidation() || ValidateVertexAttribI4iv(context, index, v))
{
context->vertexAttribI4iv(index, v);
}
}
}
void GL_APIENTRY VertexAttribI4uiv(GLuint index, const GLuint *v)
......@@ -957,13 +964,13 @@ void GL_APIENTRY VertexAttribI4uiv(GLuint index, const GLuint *v)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateVertexAttribI4uiv(context, index, v))
{
return;
}
context->gatherParams<EntryPoint::VertexAttribI4uiv>(index, v);
if (context->skipValidation() || ValidateVertexAttribI4uiv(context, index, v))
{
context->vertexAttribI4uiv(index, v);
}
}
}
void GL_APIENTRY GetUniformuiv(GLuint program, GLint location, GLuint *params)
......@@ -974,14 +981,13 @@ void GL_APIENTRY GetUniformuiv(GLuint program, GLint location, GLuint *params)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateGetUniformuiv(context, program, location, params))
{
return;
}
context->gatherParams<EntryPoint::GetUniformuiv>(program, location, params);
if (context->skipValidation() || ValidateGetUniformuiv(context, program, location, params))
{
context->getUniformuiv(program, location, params);
}
}
}
GLint GL_APIENTRY GetFragDataLocation(GLuint program, const GLchar *name)
......@@ -991,13 +997,13 @@ GLint GL_APIENTRY GetFragDataLocation(GLuint program, const GLchar *name)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateGetFragDataLocation(context, program, name))
{
return GetDefaultReturnValue<EntryPoint::GetFragDataLocation, GLint>();
}
context->gatherParams<EntryPoint::GetFragDataLocation>(program, name);
if (context->skipValidation() || ValidateGetFragDataLocation(context, program, name))
{
return context->getFragDataLocation(program, name);
}
}
return GetDefaultReturnValue<EntryPoint::GetFragDataLocation, GLint>();
}
......@@ -1009,13 +1015,13 @@ void GL_APIENTRY Uniform1ui(GLint location, GLuint v0)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateUniform1ui(context, location, v0))
{
return;
}
context->gatherParams<EntryPoint::Uniform1ui>(location, v0);
if (context->skipValidation() || ValidateUniform1ui(context, location, v0))
{
context->uniform1ui(location, v0);
}
}
}
void GL_APIENTRY Uniform2ui(GLint location, GLuint v0, GLuint v1)
......@@ -1025,13 +1031,13 @@ void GL_APIENTRY Uniform2ui(GLint location, GLuint v0, GLuint v1)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateUniform2ui(context, location, v0, v1))
{
return;
}
context->gatherParams<EntryPoint::Uniform2ui>(location, v0, v1);
if (context->skipValidation() || ValidateUniform2ui(context, location, v0, v1))
{
context->uniform2ui(location, v0, v1);
}
}
}
void GL_APIENTRY Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
......@@ -1042,13 +1048,13 @@ void GL_APIENTRY Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateUniform3ui(context, location, v0, v1, v2))
{
return;
}
context->gatherParams<EntryPoint::Uniform3ui>(location, v0, v1, v2);
if (context->skipValidation() || ValidateUniform3ui(context, location, v0, v1, v2))
{
context->uniform3ui(location, v0, v1, v2);
}
}
}
void GL_APIENTRY Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
......@@ -1059,13 +1065,13 @@ void GL_APIENTRY Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLu
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateUniform4ui(context, location, v0, v1, v2, v3))
{
return;
}
context->gatherParams<EntryPoint::Uniform4ui>(location, v0, v1, v2, v3);
if (context->skipValidation() || ValidateUniform4ui(context, location, v0, v1, v2, v3))
{
context->uniform4ui(location, v0, v1, v2, v3);
}
}
}
void GL_APIENTRY Uniform1uiv(GLint location, GLsizei count, const GLuint *value)
......@@ -1076,13 +1082,13 @@ void GL_APIENTRY Uniform1uiv(GLint location, GLsizei count, const GLuint *value)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateUniform1uiv(context, location, count, value))
{
return;
}
context->gatherParams<EntryPoint::Uniform1uiv>(location, count, value);
if (context->skipValidation() || ValidateUniform1uiv(context, location, count, value))
{
context->uniform1uiv(location, count, value);
}
}
}
void GL_APIENTRY Uniform2uiv(GLint location, GLsizei count, const GLuint *value)
......@@ -1093,13 +1099,13 @@ void GL_APIENTRY Uniform2uiv(GLint location, GLsizei count, const GLuint *value)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateUniform2uiv(context, location, count, value))
{
return;
}
context->gatherParams<EntryPoint::Uniform2uiv>(location, count, value);
if (context->skipValidation() || ValidateUniform2uiv(context, location, count, value))
{
context->uniform2uiv(location, count, value);
}
}
}
void GL_APIENTRY Uniform3uiv(GLint location, GLsizei count, const GLuint *value)
......@@ -1110,13 +1116,13 @@ void GL_APIENTRY Uniform3uiv(GLint location, GLsizei count, const GLuint *value)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateUniform3uiv(context, location, count, value))
{
return;
}
context->gatherParams<EntryPoint::Uniform3uiv>(location, count, value);
if (context->skipValidation() || ValidateUniform3uiv(context, location, count, value))
{
context->uniform3uiv(location, count, value);
}
}
}
void GL_APIENTRY Uniform4uiv(GLint location, GLsizei count, const GLuint *value)
......@@ -1127,13 +1133,13 @@ void GL_APIENTRY Uniform4uiv(GLint location, GLsizei count, const GLuint *value)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateUniform4uiv(context, location, count, value))
{
return;
}
context->gatherParams<EntryPoint::Uniform4uiv>(location, count, value);
if (context->skipValidation() || ValidateUniform4uiv(context, location, count, value))
{
context->uniform4uiv(location, count, value);
}
}
}
void GL_APIENTRY ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
......@@ -1144,14 +1150,13 @@ void GL_APIENTRY ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *val
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateClearBufferiv(context, buffer, drawbuffer, value))
{
return;
}
context->gatherParams<EntryPoint::ClearBufferiv>(buffer, drawbuffer, value);
if (context->skipValidation() || ValidateClearBufferiv(context, buffer, drawbuffer, value))
{
context->clearBufferiv(buffer, drawbuffer, value);
}
}
}
void GL_APIENTRY ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
......@@ -1162,14 +1167,13 @@ void GL_APIENTRY ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *v
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateClearBufferuiv(context, buffer, drawbuffer, value))
{
return;
}
context->gatherParams<EntryPoint::ClearBufferuiv>(buffer, drawbuffer, value);
if (context->skipValidation() || ValidateClearBufferuiv(context, buffer, drawbuffer, value))
{
context->clearBufferuiv(buffer, drawbuffer, value);
}
}
}
void GL_APIENTRY ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
......@@ -1180,14 +1184,13 @@ void GL_APIENTRY ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *v
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateClearBufferfv(context, buffer, drawbuffer, value))
{
return;
}
context->gatherParams<EntryPoint::ClearBufferfv>(buffer, drawbuffer, value);
if (context->skipValidation() || ValidateClearBufferfv(context, buffer, drawbuffer, value))
{
context->clearBufferfv(buffer, drawbuffer, value);
}
}
}
void GL_APIENTRY ClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
......@@ -1198,14 +1201,14 @@ void GL_APIENTRY ClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, G
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateClearBufferfi(context, buffer, drawbuffer, depth, stencil))
{
return;
}
context->gatherParams<EntryPoint::ClearBufferfi>(buffer, drawbuffer, depth, stencil);
if (context->skipValidation() ||
ValidateClearBufferfi(context, buffer, drawbuffer, depth, stencil))
{
context->clearBufferfi(buffer, drawbuffer, depth, stencil);
}
}
}
const GLubyte *GL_APIENTRY GetStringi(GLenum name, GLuint index)
......@@ -1215,13 +1218,13 @@ const GLubyte *GL_APIENTRY GetStringi(GLenum name, GLuint index)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateGetStringi(context, name, index))
{
return GetDefaultReturnValue<EntryPoint::GetStringi, const GLubyte *>();
}
context->gatherParams<EntryPoint::GetStringi>(name, index);
if (context->skipValidation() || ValidateGetStringi(context, name, index))
{
return context->getStringi(name, index);
}
}
return GetDefaultReturnValue<EntryPoint::GetStringi, const GLubyte *>();
}
......@@ -1240,15 +1243,15 @@ void GL_APIENTRY CopyBufferSubData(GLenum readTarget,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateCopyBufferSubData(context, readTarget, writeTarget, readOffset, writeOffset,
size))
{
return;
}
context->gatherParams<EntryPoint::CopyBufferSubData>(readTarget, writeTarget, readOffset,
writeOffset, size);
if (context->skipValidation() || ValidateCopyBufferSubData(context, readTarget, writeTarget,
readOffset, writeOffset, size))
{
context->copyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
}
}
}
void GL_APIENTRY GetUniformIndices(GLuint program,
......@@ -1264,14 +1267,15 @@ void GL_APIENTRY GetUniformIndices(GLuint program,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateGetUniformIndices(context, program, uniformCount,
uniformNames, uniformIndices))
{
return;
}
context->gatherParams<EntryPoint::GetUniformIndices>(program, uniformCount, uniformNames,
uniformIndices);
if (context->skipValidation() ||
ValidateGetUniformIndices(context, program, uniformCount, uniformNames, uniformIndices))
{
context->getUniformIndices(program, uniformCount, uniformNames, uniformIndices);
}
}
}
void GL_APIENTRY GetActiveUniformsiv(GLuint program,
......@@ -1288,15 +1292,15 @@ void GL_APIENTRY GetActiveUniformsiv(GLuint program,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateGetActiveUniformsiv(context, program, uniformCount, uniformIndices, pname,
params))
{
return;
}
context->gatherParams<EntryPoint::GetActiveUniformsiv>(program, uniformCount,
uniformIndices, pname, params);
if (context->skipValidation() || ValidateGetActiveUniformsiv(context, program, uniformCount,
uniformIndices, pname, params))
{
context->getActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
}
}
}
GLuint GL_APIENTRY GetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
......@@ -1307,14 +1311,14 @@ GLuint GL_APIENTRY GetUniformBlockIndex(GLuint program, const GLchar *uniformBlo
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateGetUniformBlockIndex(context, program, uniformBlockName))
{
return GetDefaultReturnValue<EntryPoint::GetUniformBlockIndex, GLuint>();
}
context->gatherParams<EntryPoint::GetUniformBlockIndex>(program, uniformBlockName);
if (context->skipValidation() ||
ValidateGetUniformBlockIndex(context, program, uniformBlockName))
{
return context->getUniformBlockIndex(program, uniformBlockName);
}
}
return GetDefaultReturnValue<EntryPoint::GetUniformBlockIndex, GLuint>();
}
......@@ -1332,14 +1336,15 @@ void GL_APIENTRY GetActiveUniformBlockiv(GLuint program,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateGetActiveUniformBlockiv(context, program, uniformBlockIndex, pname, params))
{
return;
}
context->gatherParams<EntryPoint::GetActiveUniformBlockiv>(program, uniformBlockIndex,
pname, params);
if (context->skipValidation() ||
ValidateGetActiveUniformBlockiv(context, program, uniformBlockIndex, pname, params))
{
context->getActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
}
}
}
void GL_APIENTRY GetActiveUniformBlockName(GLuint program,
......@@ -1356,16 +1361,17 @@ void GL_APIENTRY GetActiveUniformBlockName(GLuint program,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateGetActiveUniformBlockName(context, program, uniformBlockIndex, bufSize, length,
context->gatherParams<EntryPoint::GetActiveUniformBlockName>(
program, uniformBlockIndex, bufSize, length, uniformBlockName);
if (context->skipValidation() ||
ValidateGetActiveUniformBlockName(context, program, uniformBlockIndex, bufSize, length,
uniformBlockName))
{
return;
}
context->getActiveUniformBlockName(program, uniformBlockIndex, bufSize, length,
uniformBlockName);
}
}
}
void GL_APIENTRY UniformBlockBinding(GLuint program,
......@@ -1378,14 +1384,15 @@ void GL_APIENTRY UniformBlockBinding(GLuint program,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateUniformBlockBinding(context, program, uniformBlockIndex, uniformBlockBinding))
{
return;
}
context->gatherParams<EntryPoint::UniformBlockBinding>(program, uniformBlockIndex,
uniformBlockBinding);
if (context->skipValidation() ||
ValidateUniformBlockBinding(context, program, uniformBlockIndex, uniformBlockBinding))
{
context->uniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
}
}
}
void GL_APIENTRY DrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
......@@ -1396,14 +1403,14 @@ void GL_APIENTRY DrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GL
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateDrawArraysInstanced(context, mode, first, count, instancecount))
{
return;
}
context->gatherParams<EntryPoint::DrawArraysInstanced>(mode, first, count, instancecount);
if (context->skipValidation() ||
ValidateDrawArraysInstanced(context, mode, first, count, instancecount))
{
context->drawArraysInstanced(mode, first, count, instancecount);
}
}
}
void GL_APIENTRY DrawElementsInstanced(GLenum mode,
......@@ -1423,14 +1430,12 @@ void GL_APIENTRY DrawElementsInstanced(GLenum mode,
context->gatherParams<EntryPoint::DrawElementsInstanced>(mode, count, type, indices,
instancecount);
if (!context->skipValidation() &&
!ValidateDrawElementsInstanced(context, mode, count, type, indices, instancecount))
if (context->skipValidation() ||
ValidateDrawElementsInstanced(context, mode, count, type, indices, instancecount))
{
return;
}
context->drawElementsInstanced(mode, count, type, indices, instancecount);
}
}
}
GLsync GL_APIENTRY FenceSync(GLenum condition, GLbitfield flags)
......@@ -1440,13 +1445,13 @@ GLsync GL_APIENTRY FenceSync(GLenum condition, GLbitfield flags)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateFenceSync(context, condition, flags))
{
return GetDefaultReturnValue<EntryPoint::FenceSync, GLsync>();
}
context->gatherParams<EntryPoint::FenceSync>(condition, flags);
if (context->skipValidation() || ValidateFenceSync(context, condition, flags))
{
return context->fenceSync(condition, flags);
}
}
return GetDefaultReturnValue<EntryPoint::FenceSync, GLsync>();
}
......@@ -1458,13 +1463,13 @@ GLboolean GL_APIENTRY IsSync(GLsync sync)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateIsSync(context, sync))
{
return GetDefaultReturnValue<EntryPoint::IsSync, GLboolean>();
}
context->gatherParams<EntryPoint::IsSync>(sync);
if (context->skipValidation() || ValidateIsSync(context, sync))
{
return context->isSync(sync);
}
}
return GetDefaultReturnValue<EntryPoint::IsSync, GLboolean>();
}
......@@ -1476,13 +1481,13 @@ void GL_APIENTRY DeleteSync(GLsync sync)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateDeleteSync(context, sync))
{
return;
}
context->gatherParams<EntryPoint::DeleteSync>(sync);
if (context->skipValidation() || ValidateDeleteSync(context, sync))
{
context->deleteSync(sync);
}
}
}
GLenum GL_APIENTRY ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
......@@ -1493,13 +1498,13 @@ GLenum GL_APIENTRY ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeou
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateClientWaitSync(context, sync, flags, timeout))
{
return GetDefaultReturnValue<EntryPoint::ClientWaitSync, GLenum>();
}
context->gatherParams<EntryPoint::ClientWaitSync>(sync, flags, timeout);
if (context->skipValidation() || ValidateClientWaitSync(context, sync, flags, timeout))
{
return context->clientWaitSync(sync, flags, timeout);
}
}
return GetDefaultReturnValue<EntryPoint::ClientWaitSync, GLenum>();
}
......@@ -1512,13 +1517,13 @@ void GL_APIENTRY WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateWaitSync(context, sync, flags, timeout))
{
return;
}
context->gatherParams<EntryPoint::WaitSync>(sync, flags, timeout);
if (context->skipValidation() || ValidateWaitSync(context, sync, flags, timeout))
{
context->waitSync(sync, flags, timeout);
}
}
}
void GL_APIENTRY GetInteger64v(GLenum pname, GLint64 *data)
......@@ -1528,13 +1533,13 @@ void GL_APIENTRY GetInteger64v(GLenum pname, GLint64 *data)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateGetInteger64v(context, pname, data))
{
return;
}
context->gatherParams<EntryPoint::GetInteger64v>(pname, data);
if (context->skipValidation() || ValidateGetInteger64v(context, pname, data))
{
context->getInteger64v(pname, data);
}
}
}
void GL_APIENTRY
......@@ -1548,14 +1553,14 @@ GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *va
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateGetSynciv(context, sync, pname, bufSize, length, values))
{
return;
}
context->gatherParams<EntryPoint::GetSynciv>(sync, pname, bufSize, length, values);
if (context->skipValidation() ||
ValidateGetSynciv(context, sync, pname, bufSize, length, values))
{
context->getSynciv(sync, pname, bufSize, length, values);
}
}
}
void GL_APIENTRY GetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
......@@ -1566,13 +1571,13 @@ void GL_APIENTRY GetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateGetInteger64i_v(context, target, index, data))
{
return;
}
context->gatherParams<EntryPoint::GetInteger64i_v>(target, index, data);
if (context->skipValidation() || ValidateGetInteger64i_v(context, target, index, data))
{
context->getInteger64i_v(target, index, data);
}
}
}
void GL_APIENTRY GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
......@@ -1583,14 +1588,14 @@ void GL_APIENTRY GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *pa
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateGetBufferParameteri64v(context, target, pname, params))
{
return;
}
context->gatherParams<EntryPoint::GetBufferParameteri64v>(target, pname, params);
if (context->skipValidation() ||
ValidateGetBufferParameteri64v(context, target, pname, params))
{
context->getBufferParameteri64v(target, pname, params);
}
}
}
void GL_APIENTRY GenSamplers(GLsizei count, GLuint *samplers)
......@@ -1600,13 +1605,13 @@ void GL_APIENTRY GenSamplers(GLsizei count, GLuint *samplers)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateGenSamplers(context, count, samplers))
{
return;
}
context->gatherParams<EntryPoint::GenSamplers>(count, samplers);
if (context->skipValidation() || ValidateGenSamplers(context, count, samplers))
{
context->genSamplers(count, samplers);
}
}
}
void GL_APIENTRY DeleteSamplers(GLsizei count, const GLuint *samplers)
......@@ -1616,13 +1621,13 @@ void GL_APIENTRY DeleteSamplers(GLsizei count, const GLuint *samplers)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateDeleteSamplers(context, count, samplers))
{
return;
}
context->gatherParams<EntryPoint::DeleteSamplers>(count, samplers);
if (context->skipValidation() || ValidateDeleteSamplers(context, count, samplers))
{
context->deleteSamplers(count, samplers);
}
}
}
GLboolean GL_APIENTRY IsSampler(GLuint sampler)
......@@ -1632,13 +1637,13 @@ GLboolean GL_APIENTRY IsSampler(GLuint sampler)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateIsSampler(context, sampler))
{
return GetDefaultReturnValue<EntryPoint::IsSampler, GLboolean>();
}
context->gatherParams<EntryPoint::IsSampler>(sampler);
if (context->skipValidation() || ValidateIsSampler(context, sampler))
{
return context->isSampler(sampler);
}
}
return GetDefaultReturnValue<EntryPoint::IsSampler, GLboolean>();
}
......@@ -1650,13 +1655,13 @@ void GL_APIENTRY BindSampler(GLuint unit, GLuint sampler)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateBindSampler(context, unit, sampler))
{
return;
}
context->gatherParams<EntryPoint::BindSampler>(unit, sampler);
if (context->skipValidation() || ValidateBindSampler(context, unit, sampler))
{
context->bindSampler(unit, sampler);
}
}
}
void GL_APIENTRY SamplerParameteri(GLuint sampler, GLenum pname, GLint param)
......@@ -1666,14 +1671,13 @@ void GL_APIENTRY SamplerParameteri(GLuint sampler, GLenum pname, GLint param)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateSamplerParameteri(context, sampler, pname, param))
{
return;
}
context->gatherParams<EntryPoint::SamplerParameteri>(sampler, pname, param);
if (context->skipValidation() || ValidateSamplerParameteri(context, sampler, pname, param))
{
context->samplerParameteri(sampler, pname, param);
}
}
}
void GL_APIENTRY SamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
......@@ -1684,14 +1688,13 @@ void GL_APIENTRY SamplerParameteriv(GLuint sampler, GLenum pname, const GLint *p
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateSamplerParameteriv(context, sampler, pname, param))
{
return;
}
context->gatherParams<EntryPoint::SamplerParameteriv>(sampler, pname, param);
if (context->skipValidation() || ValidateSamplerParameteriv(context, sampler, pname, param))
{
context->samplerParameteriv(sampler, pname, param);
}
}
}
void GL_APIENTRY SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
......@@ -1701,14 +1704,13 @@ void GL_APIENTRY SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateSamplerParameterf(context, sampler, pname, param))
{
return;
}
context->gatherParams<EntryPoint::SamplerParameterf>(sampler, pname, param);
if (context->skipValidation() || ValidateSamplerParameterf(context, sampler, pname, param))
{
context->samplerParameterf(sampler, pname, param);
}
}
}
void GL_APIENTRY SamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
......@@ -1719,14 +1721,13 @@ void GL_APIENTRY SamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateSamplerParameterfv(context, sampler, pname, param))
{
return;
}
context->gatherParams<EntryPoint::SamplerParameterfv>(sampler, pname, param);
if (context->skipValidation() || ValidateSamplerParameterfv(context, sampler, pname, param))
{
context->samplerParameterfv(sampler, pname, param);
}
}
}
void GL_APIENTRY GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
......@@ -1737,14 +1738,14 @@ void GL_APIENTRY GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *para
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateGetSamplerParameteriv(context, sampler, pname, params))
{
return;
}
context->gatherParams<EntryPoint::GetSamplerParameteriv>(sampler, pname, params);
if (context->skipValidation() ||
ValidateGetSamplerParameteriv(context, sampler, pname, params))
{
context->getSamplerParameteriv(sampler, pname, params);
}
}
}
void GL_APIENTRY GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
......@@ -1755,14 +1756,14 @@ void GL_APIENTRY GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *pa
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateGetSamplerParameterfv(context, sampler, pname, params))
{
return;
}
context->gatherParams<EntryPoint::GetSamplerParameterfv>(sampler, pname, params);
if (context->skipValidation() ||
ValidateGetSamplerParameterfv(context, sampler, pname, params))
{
context->getSamplerParameterfv(sampler, pname, params);
}
}
}
void GL_APIENTRY VertexAttribDivisor(GLuint index, GLuint divisor)
......@@ -1772,13 +1773,13 @@ void GL_APIENTRY VertexAttribDivisor(GLuint index, GLuint divisor)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateVertexAttribDivisor(context, index, divisor))
{
return;
}
context->gatherParams<EntryPoint::VertexAttribDivisor>(index, divisor);
if (context->skipValidation() || ValidateVertexAttribDivisor(context, index, divisor))
{
context->vertexAttribDivisor(index, divisor);
}
}
}
void GL_APIENTRY BindTransformFeedback(GLenum target, GLuint id)
......@@ -1788,13 +1789,13 @@ void GL_APIENTRY BindTransformFeedback(GLenum target, GLuint id)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateBindTransformFeedback(context, target, id))
{
return;
}
context->gatherParams<EntryPoint::BindTransformFeedback>(target, id);
if (context->skipValidation() || ValidateBindTransformFeedback(context, target, id))
{
context->bindTransformFeedback(target, id);
}
}
}
void GL_APIENTRY DeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
......@@ -1804,13 +1805,13 @@ void GL_APIENTRY DeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateDeleteTransformFeedbacks(context, n, ids))
{
return;
}
context->gatherParams<EntryPoint::DeleteTransformFeedbacks>(n, ids);
if (context->skipValidation() || ValidateDeleteTransformFeedbacks(context, n, ids))
{
context->deleteTransformFeedbacks(n, ids);
}
}
}
void GL_APIENTRY GenTransformFeedbacks(GLsizei n, GLuint *ids)
......@@ -1820,13 +1821,13 @@ void GL_APIENTRY GenTransformFeedbacks(GLsizei n, GLuint *ids)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateGenTransformFeedbacks(context, n, ids))
{
return;
}
context->gatherParams<EntryPoint::GenTransformFeedbacks>(n, ids);
if (context->skipValidation() || ValidateGenTransformFeedbacks(context, n, ids))
{
context->genTransformFeedbacks(n, ids);
}
}
}
GLboolean GL_APIENTRY IsTransformFeedback(GLuint id)
......@@ -1836,13 +1837,13 @@ GLboolean GL_APIENTRY IsTransformFeedback(GLuint id)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateIsTransformFeedback(context, id))
{
return GetDefaultReturnValue<EntryPoint::IsTransformFeedback, GLboolean>();
}
context->gatherParams<EntryPoint::IsTransformFeedback>(id);
if (context->skipValidation() || ValidateIsTransformFeedback(context, id))
{
return context->isTransformFeedback(id);
}
}
return GetDefaultReturnValue<EntryPoint::IsTransformFeedback, GLboolean>();
}
......@@ -1854,13 +1855,13 @@ void GL_APIENTRY PauseTransformFeedback()
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidatePauseTransformFeedback(context))
{
return;
}
context->gatherParams<EntryPoint::PauseTransformFeedback>();
if (context->skipValidation() || ValidatePauseTransformFeedback(context))
{
context->pauseTransformFeedback();
}
}
}
void GL_APIENTRY ResumeTransformFeedback()
......@@ -1870,13 +1871,13 @@ void GL_APIENTRY ResumeTransformFeedback()
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() && !ValidateResumeTransformFeedback(context))
{
return;
}
context->gatherParams<EntryPoint::ResumeTransformFeedback>();
if (context->skipValidation() || ValidateResumeTransformFeedback(context))
{
context->resumeTransformFeedback();
}
}
}
void GL_APIENTRY GetProgramBinary(GLuint program,
......@@ -1893,14 +1894,15 @@ void GL_APIENTRY GetProgramBinary(GLuint program,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateGetProgramBinary(context, program, bufSize, length, binaryFormat, binary))
{
return;
}
context->gatherParams<EntryPoint::GetProgramBinary>(program, bufSize, length, binaryFormat,
binary);
if (context->skipValidation() ||
ValidateGetProgramBinary(context, program, bufSize, length, binaryFormat, binary))
{
context->getProgramBinary(program, bufSize, length, binaryFormat, binary);
}
}
}
void GL_APIENTRY ProgramBinary(GLuint program,
......@@ -1916,14 +1918,14 @@ void GL_APIENTRY ProgramBinary(GLuint program,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateProgramBinary(context, program, binaryFormat, binary, length))
{
return;
}
context->gatherParams<EntryPoint::ProgramBinary>(program, binaryFormat, binary, length);
if (context->skipValidation() ||
ValidateProgramBinary(context, program, binaryFormat, binary, length))
{
context->programBinary(program, binaryFormat, binary, length);
}
}
}
void GL_APIENTRY ProgramParameteri(GLuint program, GLenum pname, GLint value)
......@@ -1933,14 +1935,13 @@ void GL_APIENTRY ProgramParameteri(GLuint program, GLenum pname, GLint value)
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateProgramParameteri(context, program, pname, value))
{
return;
}
context->gatherParams<EntryPoint::ProgramParameteri>(program, pname, value);
if (context->skipValidation() || ValidateProgramParameteri(context, program, pname, value))
{
context->programParameteri(program, pname, value);
}
}
}
void GL_APIENTRY InvalidateFramebuffer(GLenum target,
......@@ -1954,14 +1955,15 @@ void GL_APIENTRY InvalidateFramebuffer(GLenum target,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateInvalidateFramebuffer(context, target, numAttachments, attachments))
{
return;
}
context->gatherParams<EntryPoint::InvalidateFramebuffer>(target, numAttachments,
attachments);
if (context->skipValidation() ||
ValidateInvalidateFramebuffer(context, target, numAttachments, attachments))
{
context->invalidateFramebuffer(target, numAttachments, attachments);
}
}
}
void GL_APIENTRY InvalidateSubFramebuffer(GLenum target,
......@@ -1980,14 +1982,16 @@ void GL_APIENTRY InvalidateSubFramebuffer(GLenum target,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateInvalidateSubFramebuffer(context, target, numAttachments, attachments, x, y,
context->gatherParams<EntryPoint::InvalidateSubFramebuffer>(
target, numAttachments, attachments, x, y, width, height);
if (context->skipValidation() ||
ValidateInvalidateSubFramebuffer(context, target, numAttachments, attachments, x, y,
width, height))
{
return;
context->invalidateSubFramebuffer(target, numAttachments, attachments, x, y, width,
height);
}
context->invalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
}
}
......@@ -2002,14 +2006,15 @@ TexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateTexStorage2D(context, target, levels, internalformat, width, height))
{
return;
}
context->gatherParams<EntryPoint::TexStorage2D>(target, levels, internalformat, width,
height);
if (context->skipValidation() ||
ValidateTexStorage2D(context, target, levels, internalformat, width, height))
{
context->texStorage2D(target, levels, internalformat, width, height);
}
}
}
void GL_APIENTRY TexStorage3D(GLenum target,
......@@ -2027,14 +2032,15 @@ void GL_APIENTRY TexStorage3D(GLenum target,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateTexStorage3D(context, target, levels, internalformat, width, height, depth))
{
return;
}
context->gatherParams<EntryPoint::TexStorage3D>(target, levels, internalformat, width,
height, depth);
if (context->skipValidation() ||
ValidateTexStorage3D(context, target, levels, internalformat, width, height, depth))
{
context->texStorage3D(target, levels, internalformat, width, height, depth);
}
}
}
void GL_APIENTRY GetInternalformativ(GLenum target,
......@@ -2051,13 +2057,14 @@ void GL_APIENTRY GetInternalformativ(GLenum target,
Context *context = GetValidGlobalContext();
if (context)
{
if (!context->skipValidation() &&
!ValidateGetInternalformativ(context, target, internalformat, pname, bufSize, params))
{
return;
}
context->gatherParams<EntryPoint::GetInternalformativ>(target, internalformat, pname,
bufSize, params);
if (context->skipValidation() ||
ValidateGetInternalformativ(context, target, internalformat, pname, bufSize, params))
{
context->getInternalformativ(target, internalformat, pname, bufSize, params);
}
}
}
} // namespace gl
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