Skip to content

A
angle
Commit 34dbb6f5 by Geoff Lang
Options

Capitalized the first letter of all validation function names.

TRAC #23629 Signed-off-by: Nicolas Capens Signed-off-by: Shannon Woods Author: Geoff Lang
parent e8ebe7f6
Showing with 78 additions and 78 deletions
src/libGLESv2/libGLESv2.cpp
...@@ -959,14 +959,14 @@ void __stdcall glCompressedTexImage2D(GLenum target, GLint level, GLenum interna ...@@ -959,14 +959,14 @@ void __stdcall glCompressedTexImage2D(GLenum target, GLint level, GLenum interna
if (context) if (context)
{ {
if (context->getClientVersion() < 3 && if (context->getClientVersion() < 3 &&
!validateES2TexImageParameters(context, target, level, internalformat, true, false, !ValidateES2TexImageParameters(context, target, level, internalformat, true, false,
0, 0, width, height, 0, GL_NONE, GL_NONE, data)) 0, 0, width, height, 0, GL_NONE, GL_NONE, data))
{ {
return; return;
} }
if (context->getClientVersion() >= 3 && if (context->getClientVersion() >= 3 &&
!validateES3TexImageParameters(context, target, level, internalformat, true, false, !ValidateES3TexImageParameters(context, target, level, internalformat, true, false,
0, 0, 0, width, height, 1, 0, GL_NONE, GL_NONE)) 0, 0, 0, width, height, 1, 0, GL_NONE, GL_NONE))
{ {
return; return;
...@@ -1024,14 +1024,14 @@ void __stdcall glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffs ...@@ -1024,14 +1024,14 @@ void __stdcall glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffs
if (context) if (context)
{ {
if (context->getClientVersion() < 3 && if (context->getClientVersion() < 3 &&
!validateES2TexImageParameters(context, target, level, GL_NONE, true, true, !ValidateES2TexImageParameters(context, target, level, GL_NONE, true, true,
xoffset, yoffset, width, height, 0, GL_NONE, GL_NONE, data)) xoffset, yoffset, width, height, 0, GL_NONE, GL_NONE, data))
{ {
return; return;
} }
if (context->getClientVersion() >= 3 && if (context->getClientVersion() >= 3 &&
!validateES3TexImageParameters(context, target, level, GL_NONE, true, true, !ValidateES3TexImageParameters(context, target, level, GL_NONE, true, true,
xoffset, yoffset, 0, width, height, 1, 0, GL_NONE, GL_NONE)) xoffset, yoffset, 0, width, height, 1, 0, GL_NONE, GL_NONE))
{ {
return; return;
...@@ -1087,14 +1087,14 @@ void __stdcall glCopyTexImage2D(GLenum target, GLint level, GLenum internalforma ...@@ -1087,14 +1087,14 @@ void __stdcall glCopyTexImage2D(GLenum target, GLint level, GLenum internalforma
if (context) if (context)
{ {
if (context->getClientVersion() < 3 && if (context->getClientVersion() < 3 &&
!validateES2CopyTexImageParameters(context, target, level, internalformat, false, !ValidateES2CopyTexImageParameters(context, target, level, internalformat, false,
0, 0, x, y, width, height, border)) 0, 0, x, y, width, height, border))
{ {
return; return;
} }
if (context->getClientVersion() >= 3 && if (context->getClientVersion() >= 3 &&
!validateES3CopyTexImageParameters(context, target, level, internalformat, false, !ValidateES3CopyTexImageParameters(context, target, level, internalformat, false,
0, 0, 0, x, y, width, height, border)) 0, 0, 0, x, y, width, height, border))
{ {
return; return;
...@@ -1147,14 +1147,14 @@ void __stdcall glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GL ...@@ -1147,14 +1147,14 @@ void __stdcall glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GL
if (context) if (context)
{ {
if (context->getClientVersion() < 3 && if (context->getClientVersion() < 3 &&
!validateES2CopyTexImageParameters(context, target, level, GL_NONE, true, !ValidateES2CopyTexImageParameters(context, target, level, GL_NONE, true,
xoffset, yoffset, x, y, width, height, 0)) xoffset, yoffset, x, y, width, height, 0))
{ {
return; return;
} }
if (context->getClientVersion() >= 3 && if (context->getClientVersion() >= 3 &&
!validateES3CopyTexImageParameters(context, target, level, GL_NONE, true, !ValidateES3CopyTexImageParameters(context, target, level, GL_NONE, true,
xoffset, yoffset, 0, x, y, width, height, 0)) xoffset, yoffset, 0, x, y, width, height, 0))
{ {
return; return;
...@@ -2078,13 +2078,13 @@ void __stdcall glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum t ...@@ -2078,13 +2078,13 @@ void __stdcall glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum t
if (context) if (context)
{ {
if (context->getClientVersion() < 3 && if (context->getClientVersion() < 3 &&
!validateES2FramebufferTextureParameters(context, target, attachment, textarget, texture, level)) !ValidateES2FramebufferTextureParameters(context, target, attachment, textarget, texture, level))
{ {
return; return;
} }
if (context->getClientVersion() >= 3 && if (context->getClientVersion() >= 3 &&
!validateES3FramebufferTextureParameters(context, target, attachment, textarget, texture, level, 0, false)) !ValidateES3FramebufferTextureParameters(context, target, attachment, textarget, texture, level, 0, false))
{ {
return; return;
} }
...@@ -3973,7 +3973,7 @@ void __stdcall glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params) ...@@ -3973,7 +3973,7 @@ void __stdcall glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params)
const gl::VertexAttribute &attribState = context->getVertexAttribState(index); const gl::VertexAttribute &attribState = context->getVertexAttribState(index);
if (!gl::validateGetVertexAttribParameters(pname, context->getClientVersion())) if (!gl::ValidateGetVertexAttribParameters(pname, context->getClientVersion()))
{ {
return; return;
} }
...@@ -4015,7 +4015,7 @@ void __stdcall glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params) ...@@ -4015,7 +4015,7 @@ void __stdcall glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params)
const gl::VertexAttribute &attribState = context->getVertexAttribState(index); const gl::VertexAttribute &attribState = context->getVertexAttribState(index);
if (!gl::validateGetVertexAttribParameters(pname, context->getClientVersion())) if (!gl::ValidateGetVertexAttribParameters(pname, context->getClientVersion()))
{ {
return; return;
} }
...@@ -4518,8 +4518,8 @@ void __stdcall glReadnPixelsEXT(GLint x, GLint y, GLsizei width, GLsizei height, ...@@ -4518,8 +4518,8 @@ void __stdcall glReadnPixelsEXT(GLint x, GLint y, GLsizei width, GLsizei height,
if (!context->getCurrentReadFormatType(&currentInternalFormat, &currentFormat, &currentType)) if (!context->getCurrentReadFormatType(&currentInternalFormat, &currentFormat, &currentType))
return; return;
bool validReadFormat = (context->getClientVersion() < 3) ? gl::validES2ReadFormatType(format, type) : bool validReadFormat = (context->getClientVersion() < 3) ? gl::ValidES2ReadFormatType(format, type) :
gl::validES3ReadFormatType(currentInternalFormat, format, type); gl::ValidES3ReadFormatType(currentInternalFormat, format, type);
if (!(currentFormat == format && currentType == type) && !validReadFormat) if (!(currentFormat == format && currentType == type) && !validReadFormat)
{ {
...@@ -4562,8 +4562,8 @@ void __stdcall glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, ...@@ -4562,8 +4562,8 @@ void __stdcall glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
if (!context->getCurrentReadFormatType(&currentInternalFormat, &currentFormat, &currentType)) if (!context->getCurrentReadFormatType(&currentInternalFormat, &currentFormat, &currentType))
return; return;
bool validReadFormat = (context->getClientVersion() < 3) ? gl::validES2ReadFormatType(format, type) : bool validReadFormat = (context->getClientVersion() < 3) ? gl::ValidES2ReadFormatType(format, type) :
gl::validES3ReadFormatType(currentInternalFormat, format, type); gl::ValidES3ReadFormatType(currentInternalFormat, format, type);
if (!(currentFormat == format && currentType == type) && !validReadFormat) if (!(currentFormat == format && currentType == type) && !validReadFormat)
{ {
...@@ -4604,7 +4604,7 @@ void __stdcall glRenderbufferStorageMultisampleANGLE(GLenum target, GLsizei samp ...@@ -4604,7 +4604,7 @@ void __stdcall glRenderbufferStorageMultisampleANGLE(GLenum target, GLsizei samp
if (context) if (context)
{ {
if (!validateRenderbufferStorageParameters(context, target, samples, internalformat, if (!ValidateRenderbufferStorageParameters(context, target, samples, internalformat,
width, height, true)) width, height, true))
{ {
return; return;
...@@ -4988,14 +4988,14 @@ void __stdcall glTexImage2D(GLenum target, GLint level, GLint internalformat, GL ...@@ -4988,14 +4988,14 @@ void __stdcall glTexImage2D(GLenum target, GLint level, GLint internalformat, GL
if (context) if (context)
{ {
if (context->getClientVersion() < 3 && if (context->getClientVersion() < 3 &&
!validateES2TexImageParameters(context, target, level, internalformat, false, false, !ValidateES2TexImageParameters(context, target, level, internalformat, false, false,
0, 0, width, height, border, format, type, pixels)) 0, 0, width, height, border, format, type, pixels))
{ {
return; return;
} }
if (context->getClientVersion() >= 3 && if (context->getClientVersion() >= 3 &&
!validateES3TexImageParameters(context, target, level, internalformat, false, false, !ValidateES3TexImageParameters(context, target, level, internalformat, false, false,
0, 0, 0, width, height, 1, border, format, type)) 0, 0, 0, width, height, 1, border, format, type))
{ {
return; return;
...@@ -5065,7 +5065,7 @@ void __stdcall glTexParameterf(GLenum target, GLenum pname, GLfloat param) ...@@ -5065,7 +5065,7 @@ void __stdcall glTexParameterf(GLenum target, GLenum pname, GLfloat param)
if (context) if (context)
{ {
if (!validateTexParamParameters(context, pname, static_cast<GLint>(param))) if (!ValidateTexParamParameters(context, pname, static_cast<GLint>(param)))
{ {
return; return;
} }
...@@ -5125,7 +5125,7 @@ void __stdcall glTexParameteri(GLenum target, GLenum pname, GLint param) ...@@ -5125,7 +5125,7 @@ void __stdcall glTexParameteri(GLenum target, GLenum pname, GLint param)
if (context) if (context)
{ {
if (!validateTexParamParameters(context, pname, param)) if (!ValidateTexParamParameters(context, pname, param))
{ {
return; return;
} }
...@@ -5187,13 +5187,13 @@ void __stdcall glTexStorage2DEXT(GLenum target, GLsizei levels, GLenum internalf ...@@ -5187,13 +5187,13 @@ void __stdcall glTexStorage2DEXT(GLenum target, GLsizei levels, GLenum internalf
if (context) if (context)
{ {
if (context->getClientVersion() < 3 && if (context->getClientVersion() < 3 &&
!validateES2TexStorageParameters(context, target, levels, internalformat, width, height)) !ValidateES2TexStorageParameters(context, target, levels, internalformat, width, height))
{ {
return; return;
} }
if (context->getClientVersion() >= 3 && if (context->getClientVersion() >= 3 &&
!validateES3TexStorageParameters(context, target, levels, internalformat, width, height, 1)) !ValidateES3TexStorageParameters(context, target, levels, internalformat, width, height, 1))
{ {
return; return;
} }
...@@ -5245,14 +5245,14 @@ void __stdcall glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint ...@@ -5245,14 +5245,14 @@ void __stdcall glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint
if (context) if (context)
{ {
if (context->getClientVersion() < 3 && if (context->getClientVersion() < 3 &&
!validateES2TexImageParameters(context, target, level, GL_NONE, false, true, !ValidateES2TexImageParameters(context, target, level, GL_NONE, false, true,
0, 0, width, height, 0, format, type, pixels)) 0, 0, width, height, 0, format, type, pixels))
{ {
return; return;
} }
if (context->getClientVersion() >= 3 && if (context->getClientVersion() >= 3 &&
!validateES3TexImageParameters(context, target, level, GL_NONE, false, true, !ValidateES3TexImageParameters(context, target, level, GL_NONE, false, true,
0, 0, 0, width, height, 1, 0, format, type)) 0, 0, 0, width, height, 1, 0, format, type))
{ {
return; return;
...@@ -6245,7 +6245,7 @@ void __stdcall glTexImage3D(GLenum target, GLint level, GLint internalformat, GL ...@@ -6245,7 +6245,7 @@ void __stdcall glTexImage3D(GLenum target, GLint level, GLint internalformat, GL
} }
// validateES3TexImageFormat sets the error code if there is an error // validateES3TexImageFormat sets the error code if there is an error
if (!validateES3TexImageParameters(context, target, level, internalformat, false, false, if (!ValidateES3TexImageParameters(context, target, level, internalformat, false, false,
0, 0, 0, width, height, depth, border, format, type)) 0, 0, 0, width, height, depth, border, format, type))
{ {
return; return;
...@@ -6302,7 +6302,7 @@ void __stdcall glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint ...@@ -6302,7 +6302,7 @@ void __stdcall glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint
} }
// validateES3TexImageFormat sets the error code if there is an error // validateES3TexImageFormat sets the error code if there is an error
if (!validateES3TexImageParameters(context, target, level, GL_NONE, false, true, if (!ValidateES3TexImageParameters(context, target, level, GL_NONE, false, true,
xoffset, yoffset, zoffset, width, height, depth, 0, xoffset, yoffset, zoffset, width, height, depth, 0,
format, type)) format, type))
{ {
...@@ -6353,7 +6353,7 @@ void __stdcall glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GL ...@@ -6353,7 +6353,7 @@ void __stdcall glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GL
return gl::error(GL_INVALID_OPERATION); return gl::error(GL_INVALID_OPERATION);
} }
if (!validateES3CopyTexImageParameters(context, target, level, GL_NONE, false, xoffset, yoffset, zoffset, if (!ValidateES3CopyTexImageParameters(context, target, level, GL_NONE, false, xoffset, yoffset, zoffset,
x, y, width, height, 0)) x, y, width, height, 0))
{ {
return; return;
...@@ -6408,7 +6408,7 @@ void __stdcall glCompressedTexImage3D(GLenum target, GLint level, GLenum interna ...@@ -6408,7 +6408,7 @@ void __stdcall glCompressedTexImage3D(GLenum target, GLint level, GLenum interna
} }
// validateES3TexImageFormat sets the error code if there is an error // validateES3TexImageFormat sets the error code if there is an error
if (!validateES3TexImageParameters(context, target, level, internalformat, true, false, if (!ValidateES3TexImageParameters(context, target, level, internalformat, true, false,
0, 0, 0, width, height, depth, border, GL_NONE, GL_NONE)) 0, 0, 0, width, height, depth, border, GL_NONE, GL_NONE))
{ {
return; return;
...@@ -6470,7 +6470,7 @@ void __stdcall glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffs ...@@ -6470,7 +6470,7 @@ void __stdcall glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffs
} }
// validateES3TexImageFormat sets the error code if there is an error // validateES3TexImageFormat sets the error code if there is an error
if (!validateES3TexImageParameters(context, target, level, GL_NONE, true, true, if (!ValidateES3TexImageParameters(context, target, level, GL_NONE, true, true,
0, 0, 0, width, height, depth, 0, GL_NONE, GL_NONE)) 0, 0, 0, width, height, depth, 0, GL_NONE, GL_NONE))
{ {
return; return;
...@@ -7070,7 +7070,7 @@ void __stdcall glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint sr ...@@ -7070,7 +7070,7 @@ void __stdcall glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint sr
return gl::error(GL_INVALID_OPERATION); return gl::error(GL_INVALID_OPERATION);
} }
if (!validateBlitFramebufferParameters(context, srcX0, srcY0, srcX1, srcY1, if (!ValidateBlitFramebufferParameters(context, srcX0, srcY0, srcX1, srcY1,
dstX0, dstY0, dstX1, dstY1, mask, filter, dstX0, dstY0, dstX1, dstY1, mask, filter,
false)) false))
{ {
...@@ -7103,7 +7103,7 @@ void __stdcall glRenderbufferStorageMultisample(GLenum target, GLsizei samples, ...@@ -7103,7 +7103,7 @@ void __stdcall glRenderbufferStorageMultisample(GLenum target, GLsizei samples,
return gl::error(GL_INVALID_OPERATION); return gl::error(GL_INVALID_OPERATION);
} }
if (!validateRenderbufferStorageParameters(context, target, samples, internalformat, if (!ValidateRenderbufferStorageParameters(context, target, samples, internalformat,
width, height, false)) width, height, false))
{ {
return; return;
...@@ -7134,7 +7134,7 @@ void __stdcall glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuin ...@@ -7134,7 +7134,7 @@ void __stdcall glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuin
return gl::error(GL_INVALID_OPERATION); return gl::error(GL_INVALID_OPERATION);
} }
if (!validateES3FramebufferTextureParameters(context, target, attachment, GL_NONE, texture, level, layer, true)) if (!ValidateES3FramebufferTextureParameters(context, target, attachment, GL_NONE, texture, level, layer, true))
{ {
return; return;
} }
...@@ -7722,7 +7722,7 @@ void __stdcall glGetVertexAttribIiv(GLuint index, GLenum pname, GLint* params) ...@@ -7722,7 +7722,7 @@ void __stdcall glGetVertexAttribIiv(GLuint index, GLenum pname, GLint* params)
const gl::VertexAttribute &attribState = context->getVertexAttribState(index); const gl::VertexAttribute &attribState = context->getVertexAttribState(index);
if (!gl::validateGetVertexAttribParameters(pname, context->getClientVersion())) if (!gl::ValidateGetVertexAttribParameters(pname, context->getClientVersion()))
{ {
return; return;
} }
...@@ -7770,7 +7770,7 @@ void __stdcall glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint* params) ...@@ -7770,7 +7770,7 @@ void __stdcall glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint* params)
const gl::VertexAttribute &attribState = context->getVertexAttribState(index); const gl::VertexAttribute &attribState = context->getVertexAttribState(index);
if (!gl::validateGetVertexAttribParameters(pname, context->getClientVersion())) if (!gl::ValidateGetVertexAttribParameters(pname, context->getClientVersion()))
{ {
return; return;
} }
...@@ -9308,12 +9308,12 @@ void __stdcall glSamplerParameteri(GLuint sampler, GLenum pname, GLint param) ...@@ -9308,12 +9308,12 @@ void __stdcall glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
return gl::error(GL_INVALID_OPERATION); return gl::error(GL_INVALID_OPERATION);
} }
if (!gl::validateSamplerObjectParameter(pname)) if (!gl::ValidateSamplerObjectParameter(pname))
{ {
return; return;
} }
if (!gl::validateTexParamParameters(context, pname, param)) if (!gl::ValidateTexParamParameters(context, pname, param))
{ {
return; return;
} }
...@@ -9352,12 +9352,12 @@ void __stdcall glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param) ...@@ -9352,12 +9352,12 @@ void __stdcall glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
return gl::error(GL_INVALID_OPERATION); return gl::error(GL_INVALID_OPERATION);
} }
if (!gl::validateSamplerObjectParameter(pname)) if (!gl::ValidateSamplerObjectParameter(pname))
{ {
return; return;
} }
if (!gl::validateTexParamParameters(context, pname, static_cast<GLint>(param))) if (!gl::ValidateTexParamParameters(context, pname, static_cast<GLint>(param)))
{ {
return; return;
} }
...@@ -9396,7 +9396,7 @@ void __stdcall glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint* para ...@@ -9396,7 +9396,7 @@ void __stdcall glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint* para
return gl::error(GL_INVALID_OPERATION); return gl::error(GL_INVALID_OPERATION);
} }
if (!gl::validateSamplerObjectParameter(pname)) if (!gl::ValidateSamplerObjectParameter(pname))
{ {
return; return;
} }
...@@ -9430,7 +9430,7 @@ void __stdcall glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat* pa ...@@ -9430,7 +9430,7 @@ void __stdcall glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat* pa
return gl::error(GL_INVALID_OPERATION); return gl::error(GL_INVALID_OPERATION);
} }
if (!gl::validateSamplerObjectParameter(pname)) if (!gl::ValidateSamplerObjectParameter(pname))
{ {
return; return;
} }
...@@ -9724,7 +9724,7 @@ void __stdcall glInvalidateFramebuffer(GLenum target, GLsizei numAttachments, co ...@@ -9724,7 +9724,7 @@ void __stdcall glInvalidateFramebuffer(GLenum target, GLsizei numAttachments, co
return gl::error(GL_INVALID_OPERATION); return gl::error(GL_INVALID_OPERATION);
} }
if (!validateInvalidateFramebufferParameters(context, target, numAttachments, attachments)) if (!ValidateInvalidateFramebufferParameters(context, target, numAttachments, attachments))
{ {
return; return;
} }
...@@ -9756,7 +9756,7 @@ void __stdcall glInvalidateSubFramebuffer(GLenum target, GLsizei numAttachments, ...@@ -9756,7 +9756,7 @@ void __stdcall glInvalidateSubFramebuffer(GLenum target, GLsizei numAttachments,
return gl::error(GL_INVALID_OPERATION); return gl::error(GL_INVALID_OPERATION);
} }
if (!validateInvalidateFramebufferParameters(context, target, numAttachments, attachments)) if (!ValidateInvalidateFramebufferParameters(context, target, numAttachments, attachments))
{ {
return; return;
} }
...@@ -9786,7 +9786,7 @@ void __stdcall glTexStorage2D(GLenum target, GLsizei levels, GLenum internalform ...@@ -9786,7 +9786,7 @@ void __stdcall glTexStorage2D(GLenum target, GLsizei levels, GLenum internalform
return gl::error(GL_INVALID_OPERATION); return gl::error(GL_INVALID_OPERATION);
} }
if (!validateES3TexStorageParameters(context, target, levels, internalformat, width, height, 1)) if (!ValidateES3TexStorageParameters(context, target, levels, internalformat, width, height, 1))
{ {
return; return;
} }
...@@ -9840,7 +9840,7 @@ void __stdcall glTexStorage3D(GLenum target, GLsizei levels, GLenum internalform ...@@ -9840,7 +9840,7 @@ void __stdcall glTexStorage3D(GLenum target, GLsizei levels, GLenum internalform
return gl::error(GL_INVALID_OPERATION); return gl::error(GL_INVALID_OPERATION);
} }
if (!validateES3TexStorageParameters(context, target, levels, internalformat, width, height, depth)) if (!ValidateES3TexStorageParameters(context, target, levels, internalformat, width, height, depth))
{ {
return; return;
} }
...@@ -9942,7 +9942,7 @@ void __stdcall glBlitFramebufferANGLE(GLint srcX0, GLint srcY0, GLint srcX1, GLi ...@@ -9942,7 +9942,7 @@ void __stdcall glBlitFramebufferANGLE(GLint srcX0, GLint srcY0, GLint srcX1, GLi
if (context) if (context)
{ {
if (!validateBlitFramebufferParameters(context, srcX0, srcY0, srcX1, srcY1, if (!ValidateBlitFramebufferParameters(context, srcX0, srcY0, srcX1, srcY1,
dstX0, dstY0, dstX1, dstY1, mask, filter, dstX0, dstY0, dstX1, dstY1, mask, filter,
true)) true))
{ {
......
src/libGLESv2/validationES.cpp
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
namespace gl namespace gl
{ {
bool validateRenderbufferStorageParameters(const gl::Context *context, GLenum target, GLsizei samples, bool ValidateRenderbufferStorageParameters(const gl::Context *context, GLenum target, GLsizei samples,
GLenum internalformat, GLsizei width, GLsizei height, GLenum internalformat, GLsizei width, GLsizei height,
bool angleExtension) bool angleExtension)
{ {
...@@ -97,7 +97,7 @@ bool validateRenderbufferStorageParameters(const gl::Context *context, GLenum ta ...@@ -97,7 +97,7 @@ bool validateRenderbufferStorageParameters(const gl::Context *context, GLenum ta
return true; return true;
} }
bool validateBlitFramebufferParameters(gl::Context *context, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, bool ValidateBlitFramebufferParameters(gl::Context *context, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask,
GLenum filter, bool fromAngleExtension) GLenum filter, bool fromAngleExtension)
{ {
...@@ -329,7 +329,7 @@ bool validateBlitFramebufferParameters(gl::Context *context, GLint srcX0, GLint ...@@ -329,7 +329,7 @@ bool validateBlitFramebufferParameters(gl::Context *context, GLint srcX0, GLint
return true; return true;
} }
bool validateGetVertexAttribParameters(GLenum pname, int clientVersion) bool ValidateGetVertexAttribParameters(GLenum pname, int clientVersion)
{ {
switch (pname) switch (pname)
{ {
...@@ -356,7 +356,7 @@ bool validateGetVertexAttribParameters(GLenum pname, int clientVersion) ...@@ -356,7 +356,7 @@ bool validateGetVertexAttribParameters(GLenum pname, int clientVersion)
} }
} }
bool validateTexParamParameters(gl::Context *context, GLenum pname, GLint param) bool ValidateTexParamParameters(gl::Context *context, GLenum pname, GLint param)
{ {
switch (pname) switch (pname)
{ {
...@@ -492,7 +492,7 @@ bool validateTexParamParameters(gl::Context *context, GLenum pname, GLint param) ...@@ -492,7 +492,7 @@ bool validateTexParamParameters(gl::Context *context, GLenum pname, GLint param)
} }
} }
bool validateSamplerObjectParameter(GLenum pname) bool ValidateSamplerObjectParameter(GLenum pname)
{ {
switch (pname) switch (pname)
{ {
......
src/libGLESv2/validationES.h
...@@ -14,19 +14,19 @@ namespace gl ...@@ -14,19 +14,19 @@ namespace gl
class Context; class Context;
bool validateRenderbufferStorageParameters(const gl::Context *context, GLenum target, GLsizei samples, bool ValidateRenderbufferStorageParameters(const gl::Context *context, GLenum target, GLsizei samples,
GLenum internalformat, GLsizei width, GLsizei height, GLenum internalformat, GLsizei width, GLsizei height,
bool angleExtension); bool angleExtension);
bool validateBlitFramebufferParameters(gl::Context *context, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, bool ValidateBlitFramebufferParameters(gl::Context *context, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask,
GLenum filter, bool fromAngleExtension); GLenum filter, bool fromAngleExtension);
bool validateGetVertexAttribParameters(GLenum pname, int clientVersion); bool ValidateGetVertexAttribParameters(GLenum pname, int clientVersion);
bool validateTexParamParameters(gl::Context *context, GLenum pname, GLint param); bool ValidateTexParamParameters(gl::Context *context, GLenum pname, GLint param);
bool validateSamplerObjectParameter(GLenum pname); bool ValidateSamplerObjectParameter(GLenum pname);
} }
......
src/libGLESv2/validationES2.cpp
...@@ -143,7 +143,7 @@ static bool validateSubImageParamsCube(bool compressed, GLsizei width, GLsizei h ...@@ -143,7 +143,7 @@ static bool validateSubImageParamsCube(bool compressed, GLsizei width, GLsizei h
return true; return true;
} }
bool validateES2TexImageParameters(gl::Context *context, GLenum target, GLint level, GLint internalformat, bool isCompressed, bool isSubImage, bool ValidateES2TexImageParameters(gl::Context *context, GLenum target, GLint level, GLint internalformat, bool isCompressed, bool isSubImage,
GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height,
GLint border, GLenum format, GLenum type, const GLvoid *pixels) GLint border, GLenum format, GLenum type, const GLvoid *pixels)
{ {
...@@ -468,7 +468,7 @@ bool validateES2TexImageParameters(gl::Context *context, GLenum target, GLint le ...@@ -468,7 +468,7 @@ bool validateES2TexImageParameters(gl::Context *context, GLenum target, GLint le
bool validateES2CopyTexImageParameters(gl::Context* context, GLenum target, GLint level, GLenum internalformat, bool isSubImage, bool ValidateES2CopyTexImageParameters(gl::Context* context, GLenum target, GLint level, GLenum internalformat, bool isSubImage,
GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height,
GLint border) GLint border)
{ {
...@@ -723,7 +723,7 @@ bool validateES2CopyTexImageParameters(gl::Context* context, GLenum target, GLin ...@@ -723,7 +723,7 @@ bool validateES2CopyTexImageParameters(gl::Context* context, GLenum target, GLin
return true; return true;
} }
bool validateES2TexStorageParameters(gl::Context *context, GLenum target, GLsizei levels, GLenum internalformat, bool ValidateES2TexStorageParameters(gl::Context *context, GLenum target, GLsizei levels, GLenum internalformat,
GLsizei width, GLsizei height) GLsizei width, GLsizei height)
{ {
if (target != GL_TEXTURE_2D && target != GL_TEXTURE_CUBE_MAP) if (target != GL_TEXTURE_2D && target != GL_TEXTURE_CUBE_MAP)
...@@ -870,7 +870,7 @@ bool validateES2TexStorageParameters(gl::Context *context, GLenum target, GLsize ...@@ -870,7 +870,7 @@ bool validateES2TexStorageParameters(gl::Context *context, GLenum target, GLsize
return true; return true;
} }
bool validateES2FramebufferTextureParameters(gl::Context *context, GLenum target, GLenum attachment, bool ValidateES2FramebufferTextureParameters(gl::Context *context, GLenum target, GLenum attachment,
GLenum textarget, GLuint texture, GLint level) GLenum textarget, GLuint texture, GLint level)
{ {
META_ASSERT(GL_DRAW_FRAMEBUFFER == GL_DRAW_FRAMEBUFFER_ANGLE && GL_READ_FRAMEBUFFER == GL_READ_FRAMEBUFFER_ANGLE); META_ASSERT(GL_DRAW_FRAMEBUFFER == GL_DRAW_FRAMEBUFFER_ANGLE && GL_READ_FRAMEBUFFER == GL_READ_FRAMEBUFFER_ANGLE);
...@@ -976,7 +976,7 @@ bool validateES2FramebufferTextureParameters(gl::Context *context, GLenum target ...@@ -976,7 +976,7 @@ bool validateES2FramebufferTextureParameters(gl::Context *context, GLenum target
} }
// check for combinations of format and type that are valid for ReadPixels // check for combinations of format and type that are valid for ReadPixels
bool validES2ReadFormatType(GLenum format, GLenum type) bool ValidES2ReadFormatType(GLenum format, GLenum type)
{ {
switch (format) switch (format)
{ {
......
src/libGLESv2/validationES2.h
...@@ -14,21 +14,21 @@ namespace gl ...@@ -14,21 +14,21 @@ namespace gl
class Context; class Context;
bool validateES2TexImageParameters(gl::Context *context, GLenum target, GLint level, GLint internalformat, bool isCompressed, bool isSubImage, bool ValidateES2TexImageParameters(gl::Context *context, GLenum target, GLint level, GLint internalformat, bool isCompressed, bool isSubImage,
GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height,
GLint border, GLenum format, GLenum type, const GLvoid *pixels); GLint border, GLenum format, GLenum type, const GLvoid *pixels);
bool validateES2CopyTexImageParameters(gl::Context* context, GLenum target, GLint level, GLenum internalformat, bool isSubImage, bool ValidateES2CopyTexImageParameters(gl::Context* context, GLenum target, GLint level, GLenum internalformat, bool isSubImage,
GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height,
GLint border); GLint border);
bool validateES2TexStorageParameters(gl::Context *context, GLenum target, GLsizei levels, GLenum internalformat, bool ValidateES2TexStorageParameters(gl::Context *context, GLenum target, GLsizei levels, GLenum internalformat,
GLsizei width, GLsizei height); GLsizei width, GLsizei height);
bool validateES2FramebufferTextureParameters(gl::Context *context, GLenum target, GLenum attachment, bool ValidateES2FramebufferTextureParameters(gl::Context *context, GLenum target, GLenum attachment,
GLenum textarget, GLuint texture, GLint level); GLenum textarget, GLuint texture, GLint level);
bool validES2ReadFormatType(GLenum format, GLenum type); bool ValidES2ReadFormatType(GLenum format, GLenum type);
} }
......
src/libGLESv2/validationES3.cpp
...@@ -60,7 +60,7 @@ static bool validCompressedImageSize(GLsizei width, GLsizei height) ...@@ -60,7 +60,7 @@ static bool validCompressedImageSize(GLsizei width, GLsizei height)
return true; return true;
} }
bool validateES3TexImageParameters(gl::Context *context, GLenum target, GLint level, GLint internalformat, bool isCompressed, bool isSubImage, bool ValidateES3TexImageParameters(gl::Context *context, GLenum target, GLint level, GLint internalformat, bool isCompressed, bool isSubImage,
GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth,
GLint border, GLenum format, GLenum type) GLint border, GLenum format, GLenum type)
{ {
...@@ -292,7 +292,7 @@ bool validateES3TexImageParameters(gl::Context *context, GLenum target, GLint le ...@@ -292,7 +292,7 @@ bool validateES3TexImageParameters(gl::Context *context, GLenum target, GLint le
return true; return true;
} }
bool validateES3CopyTexImageParameters(gl::Context *context, GLenum target, GLint level, GLenum internalformat, bool ValidateES3CopyTexImageParameters(gl::Context *context, GLenum target, GLint level, GLenum internalformat,
bool isSubImage, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, bool isSubImage, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y,
GLsizei width, GLsizei height, GLint border) GLsizei width, GLsizei height, GLint border)
{ {
...@@ -460,7 +460,7 @@ bool validateES3CopyTexImageParameters(gl::Context *context, GLenum target, GLin ...@@ -460,7 +460,7 @@ bool validateES3CopyTexImageParameters(gl::Context *context, GLenum target, GLin
return true; return true;
} }
bool validateES3TexStorageParameters(gl::Context *context, GLenum target, GLsizei levels, GLenum internalformat, bool ValidateES3TexStorageParameters(gl::Context *context, GLenum target, GLsizei levels, GLenum internalformat,
GLsizei width, GLsizei height, GLsizei depth) GLsizei width, GLsizei height, GLsizei depth)
{ {
if (width < 1 || height < 1 || depth < 1 || levels < 1) if (width < 1 || height < 1 || depth < 1 || levels < 1)
...@@ -562,7 +562,7 @@ bool validateES3TexStorageParameters(gl::Context *context, GLenum target, GLsize ...@@ -562,7 +562,7 @@ bool validateES3TexStorageParameters(gl::Context *context, GLenum target, GLsize
return true; return true;
} }
bool validateES3FramebufferTextureParameters(gl::Context *context, GLenum target, GLenum attachment, bool ValidateES3FramebufferTextureParameters(gl::Context *context, GLenum target, GLenum attachment,
GLenum textarget, GLuint texture, GLint level, GLint layer, GLenum textarget, GLuint texture, GLint level, GLint layer,
bool layerCall) bool layerCall)
{ {
...@@ -733,7 +733,7 @@ bool validateES3FramebufferTextureParameters(gl::Context *context, GLenum target ...@@ -733,7 +733,7 @@ bool validateES3FramebufferTextureParameters(gl::Context *context, GLenum target
return true; return true;
} }
bool validES3ReadFormatType(GLenum internalFormat, GLenum format, GLenum type) bool ValidES3ReadFormatType(GLenum internalFormat, GLenum format, GLenum type)
{ {
switch (format) switch (format)
{ {
...@@ -788,7 +788,7 @@ bool validES3ReadFormatType(GLenum internalFormat, GLenum format, GLenum type) ...@@ -788,7 +788,7 @@ bool validES3ReadFormatType(GLenum internalFormat, GLenum format, GLenum type)
return true; return true;
} }
bool validateInvalidateFramebufferParameters(gl::Context *context, GLenum target, GLsizei numAttachments, bool ValidateInvalidateFramebufferParameters(gl::Context *context, GLenum target, GLsizei numAttachments,
const GLenum* attachments) const GLenum* attachments)
{ {
bool defaultFramebuffer = false; bool defaultFramebuffer = false;
......
src/libGLESv2/validationES3.h
...@@ -14,24 +14,24 @@ namespace gl ...@@ -14,24 +14,24 @@ namespace gl
class Context; class Context;
bool validateES3TexImageParameters(gl::Context *context, GLenum target, GLint level, GLint internalformat, bool isCompressed, bool isSubImage, bool ValidateES3TexImageParameters(gl::Context *context, GLenum target, GLint level, GLint internalformat, bool isCompressed, bool isSubImage,
GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth,
GLint border, GLenum format, GLenum type); GLint border, GLenum format, GLenum type);
bool validateES3CopyTexImageParameters(gl::Context *context, GLenum target, GLint level, GLenum internalformat, bool ValidateES3CopyTexImageParameters(gl::Context *context, GLenum target, GLint level, GLenum internalformat,
bool isSubImage, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, bool isSubImage, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y,
GLsizei width, GLsizei height, GLint border); GLsizei width, GLsizei height, GLint border);
bool validateES3TexStorageParameters(gl::Context *context, GLenum target, GLsizei levels, GLenum internalformat, bool ValidateES3TexStorageParameters(gl::Context *context, GLenum target, GLsizei levels, GLenum internalformat,
GLsizei width, GLsizei height, GLsizei depth); GLsizei width, GLsizei height, GLsizei depth);
bool validateES3FramebufferTextureParameters(gl::Context *context, GLenum target, GLenum attachment, bool ValidateES3FramebufferTextureParameters(gl::Context *context, GLenum target, GLenum attachment,
GLenum textarget, GLuint texture, GLint level, GLint layer, GLenum textarget, GLuint texture, GLint level, GLint layer,
bool layerCall); bool layerCall);
bool validES3ReadFormatType(GLenum internalFormat, GLenum format, GLenum type); bool ValidES3ReadFormatType(GLenum internalFormat, GLenum format, GLenum type);
bool validateInvalidateFramebufferParameters(gl::Context *context, GLenum target, GLsizei numAttachments, bool ValidateInvalidateFramebufferParameters(gl::Context *context, GLenum target, GLsizei numAttachments,
const GLenum* attachments); const GLenum* attachments);
} }
......
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