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 32 additions and 32 deletions
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