Skip to content

A
angle
Commit f0fd87d8 by Yunchao He Committed by Commit Bot
Options

Code refactoring in validation part.

Some code refactoring in this change: 1) It moves some public methods to static. These methods are only used in validationES3.cpp. They are not necessay to be exposed to public. 2) The error messages to check context version are inconsistent. It makes them to be consistent. BUG:angleproject:2005 Change-Id: I5af4c3300634ccc44aac386c90dcb0522acbff83 Reviewed-on: https://chromium-review.googlesource.com/661324 Commit-Queue: Corentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent f32cd0b7
Showing with 57 additions and 60 deletions
src/libANGLE/validationES.cpp
...@@ -2099,7 +2099,7 @@ bool ValidateProgramUniform(gl::Context *context, ...@@ -2099,7 +2099,7 @@ bool ValidateProgramUniform(gl::Context *context,
// Check for ES31 program uniform entry points // Check for ES31 program uniform entry points
if (context->getClientVersion() < Version(3, 1)) if (context->getClientVersion() < Version(3, 1))
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
return false; return false;
} }
...@@ -2118,7 +2118,7 @@ bool ValidateProgramUniform1iv(gl::Context *context, ...@@ -2118,7 +2118,7 @@ bool ValidateProgramUniform1iv(gl::Context *context,
// Check for ES31 program uniform entry points // Check for ES31 program uniform entry points
if (context->getClientVersion() < Version(3, 1)) if (context->getClientVersion() < Version(3, 1))
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
return false; return false;
} }
...@@ -2138,7 +2138,7 @@ bool ValidateProgramUniformMatrix(gl::Context *context, ...@@ -2138,7 +2138,7 @@ bool ValidateProgramUniformMatrix(gl::Context *context,
// Check for ES31 program uniform entry points // Check for ES31 program uniform entry points
if (context->getClientVersion() < Version(3, 1)) if (context->getClientVersion() < Version(3, 1))
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES31Required);
return false; return false;
} }
...@@ -3136,7 +3136,7 @@ bool ValidateGetUniformuivRobustANGLE(Context *context, ...@@ -3136,7 +3136,7 @@ bool ValidateGetUniformuivRobustANGLE(Context *context,
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation() << "Entry point requires at least OpenGL ES 3.0."); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -4130,7 +4130,7 @@ bool ValidateGetProgramivBase(ValidationContext *context, ...@@ -4130,7 +4130,7 @@ bool ValidateGetProgramivBase(ValidationContext *context,
case GL_PROGRAM_BINARY_RETRIEVABLE_HINT: case GL_PROGRAM_BINARY_RETRIEVABLE_HINT:
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidEnum() << "Querying requires at least ES 3.0."); ANGLE_VALIDATION_ERR(context, InvalidEnum(), ES3Required);
return false; return false;
} }
break; break;
...@@ -4138,7 +4138,7 @@ bool ValidateGetProgramivBase(ValidationContext *context, ...@@ -4138,7 +4138,7 @@ bool ValidateGetProgramivBase(ValidationContext *context,
case GL_PROGRAM_SEPARABLE: case GL_PROGRAM_SEPARABLE:
if (context->getClientVersion() < Version(3, 1)) if (context->getClientVersion() < Version(3, 1))
{ {
context->handleError(InvalidEnum() << "Querying requires at least ES 3.1."); ANGLE_VALIDATION_ERR(context, InvalidEnum(), ES31Required);
return false; return false;
} }
break; break;
...@@ -5754,7 +5754,7 @@ bool ValidateGetInternalFormativBase(Context *context, ...@@ -5754,7 +5754,7 @@ bool ValidateGetInternalFormativBase(Context *context,
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation() << "Context does not support OpenGL ES 3.0."); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
......
src/libANGLE/validationES2.cpp
...@@ -4101,7 +4101,7 @@ bool ValidateCreateShader(Context *context, GLenum type) ...@@ -4101,7 +4101,7 @@ bool ValidateCreateShader(Context *context, GLenum type)
case GL_COMPUTE_SHADER: case GL_COMPUTE_SHADER:
if (context->getClientVersion() < Version(3, 1)) if (context->getClientVersion() < Version(3, 1))
{ {
context->handleError(InvalidEnum() << "GL_COMPUTE_SHADER requires OpenGL ES 3.1."); ANGLE_VALIDATION_ERR(context, InvalidEnum(), ES31Required);
return false; return false;
} }
break; break;
......
src/libANGLE/validationES3.cpp
...@@ -109,6 +109,31 @@ bool ValidateUniformMatrixES3(Context *context, ...@@ -109,6 +109,31 @@ bool ValidateUniformMatrixES3(Context *context,
return ValidateUniformMatrix(context, valueType, location, count, transpose); return ValidateUniformMatrix(context, valueType, location, count, transpose);
} }
bool ValidateGenOrDeleteES3(Context *context, GLint n)
{
if (context->getClientMajorVersion() < 3)
{
ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false;
}
return ValidateGenOrDelete(context, n);
}
bool ValidateGenOrDeleteCountES3(Context *context, GLint count)
{
if (context->getClientMajorVersion() < 3)
{
ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false;
}
if (count < 0)
{
ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeCount);
return false;
}
return true;
}
} // anonymous namespace } // anonymous namespace
static bool ValidateTexImageFormatCombination(gl::Context *context, static bool ValidateTexImageFormatCombination(gl::Context *context,
...@@ -1025,7 +1050,7 @@ bool ValidateBeginQuery(gl::Context *context, GLenum target, GLuint id) ...@@ -1025,7 +1050,7 @@ bool ValidateBeginQuery(gl::Context *context, GLenum target, GLuint id)
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation() << "GLES version < 3.0"); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -1036,7 +1061,7 @@ bool ValidateEndQuery(gl::Context *context, GLenum target) ...@@ -1036,7 +1061,7 @@ bool ValidateEndQuery(gl::Context *context, GLenum target)
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation() << "GLES version < 3.0"); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -1047,7 +1072,7 @@ bool ValidateGetQueryiv(Context *context, GLenum target, GLenum pname, GLint *pa ...@@ -1047,7 +1072,7 @@ bool ValidateGetQueryiv(Context *context, GLenum target, GLenum pname, GLint *pa
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation() << "GLES version < 3.0"); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -1058,7 +1083,7 @@ bool ValidateGetQueryObjectuiv(Context *context, GLuint id, GLenum pname, GLuint ...@@ -1058,7 +1083,7 @@ bool ValidateGetQueryObjectuiv(Context *context, GLuint id, GLenum pname, GLuint
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation() << "GLES version < 3.0"); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -1074,7 +1099,7 @@ bool ValidateFramebufferTextureLayer(Context *context, ...@@ -1074,7 +1099,7 @@ bool ValidateFramebufferTextureLayer(Context *context,
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -1192,7 +1217,7 @@ bool ValidateClearBuffer(ValidationContext *context) ...@@ -1192,7 +1217,7 @@ bool ValidateClearBuffer(ValidationContext *context)
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -1252,7 +1277,7 @@ bool ValidateGetUniformuiv(Context *context, GLuint program, GLint location, GLu ...@@ -1252,7 +1277,7 @@ bool ValidateGetUniformuiv(Context *context, GLuint program, GLint location, GLu
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -1263,7 +1288,7 @@ bool ValidateReadBuffer(Context *context, GLenum src) ...@@ -1263,7 +1288,7 @@ bool ValidateReadBuffer(Context *context, GLenum src)
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -1323,7 +1348,7 @@ bool ValidateCompressedTexImage3D(Context *context, ...@@ -1323,7 +1348,7 @@ bool ValidateCompressedTexImage3D(Context *context,
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -1403,7 +1428,7 @@ bool ValidateBindVertexArray(Context *context, GLuint array) ...@@ -1403,7 +1428,7 @@ bool ValidateBindVertexArray(Context *context, GLuint array)
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -1430,7 +1455,7 @@ static bool ValidateBindBufferCommon(Context *context, ...@@ -1430,7 +1455,7 @@ static bool ValidateBindBufferCommon(Context *context,
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -1578,7 +1603,7 @@ bool ValidateProgramBinary(Context *context, ...@@ -1578,7 +1603,7 @@ bool ValidateProgramBinary(Context *context,
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -1594,7 +1619,7 @@ bool ValidateGetProgramBinary(Context *context, ...@@ -1594,7 +1619,7 @@ bool ValidateGetProgramBinary(Context *context,
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -1664,7 +1689,7 @@ bool ValidateBlitFramebuffer(Context *context, ...@@ -1664,7 +1689,7 @@ bool ValidateBlitFramebuffer(Context *context,
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -1836,7 +1861,7 @@ bool ValidateCopyTexSubImage3D(Context *context, ...@@ -1836,7 +1861,7 @@ bool ValidateCopyTexSubImage3D(Context *context,
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -1858,7 +1883,7 @@ bool ValidateTexImage3D(Context *context, ...@@ -1858,7 +1883,7 @@ bool ValidateTexImage3D(Context *context,
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -1882,7 +1907,7 @@ bool ValidateTexImage3DRobustANGLE(Context *context, ...@@ -1882,7 +1907,7 @@ bool ValidateTexImage3DRobustANGLE(Context *context,
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -1911,7 +1936,7 @@ bool ValidateTexSubImage3D(Context *context, ...@@ -1911,7 +1936,7 @@ bool ValidateTexSubImage3D(Context *context,
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -1936,7 +1961,7 @@ bool ValidateTexSubImage3DRobustANGLE(Context *context, ...@@ -1936,7 +1961,7 @@ bool ValidateTexSubImage3DRobustANGLE(Context *context,
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -1965,7 +1990,7 @@ bool ValidateCompressedTexSubImage3D(Context *context, ...@@ -1965,7 +1990,7 @@ bool ValidateCompressedTexSubImage3D(Context *context,
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -2076,31 +2101,6 @@ bool ValidateDeleteVertexArrays(Context *context, GLint n, const GLuint *) ...@@ -2076,31 +2101,6 @@ bool ValidateDeleteVertexArrays(Context *context, GLint n, const GLuint *)
return ValidateGenOrDeleteES3(context, n); return ValidateGenOrDeleteES3(context, n);
} }
bool ValidateGenOrDeleteES3(Context *context, GLint n)
{
if (context->getClientMajorVersion() < 3)
{
context->handleError(InvalidOperation() << "Context does not support GLES3.");
return false;
}
return ValidateGenOrDelete(context, n);
}
bool ValidateGenOrDeleteCountES3(Context *context, GLint count)
{
if (context->getClientMajorVersion() < 3)
{
ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false;
}
if (count < 0)
{
context->handleError(InvalidValue() << "count < 0");
return false;
}
return true;
}
bool ValidateBeginTransformFeedback(Context *context, GLenum primitiveMode) bool ValidateBeginTransformFeedback(Context *context, GLenum primitiveMode)
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
...@@ -2176,7 +2176,7 @@ bool ValidateUnmapBuffer(Context *context, GLenum target) ...@@ -2176,7 +2176,7 @@ bool ValidateUnmapBuffer(Context *context, GLenum target)
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -2552,7 +2552,7 @@ bool ValidateRenderbufferStorageMultisample(ValidationContext *context, ...@@ -2552,7 +2552,7 @@ bool ValidateRenderbufferStorageMultisample(ValidationContext *context,
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -2705,7 +2705,7 @@ bool ValidateDrawElementsInstanced(ValidationContext *context, ...@@ -2705,7 +2705,7 @@ bool ValidateDrawElementsInstanced(ValidationContext *context,
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation() << "Requires a GLES 3.0 or higher context."); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
...@@ -3512,7 +3512,7 @@ bool ValidateIsSampler(Context *context, GLuint sampler) ...@@ -3512,7 +3512,7 @@ bool ValidateIsSampler(Context *context, GLuint sampler)
{ {
if (context->getClientMajorVersion() < 3) if (context->getClientMajorVersion() < 3)
{ {
context->handleError(InvalidOperation()); ANGLE_VALIDATION_ERR(context, InvalidOperation(), ES3Required);
return false; return false;
} }
......
src/libANGLE/validationES3.h
...@@ -355,9 +355,6 @@ bool ValidateDeleteTransformFeedbacks(Context *context, GLint n, const GLuint *i ...@@ -355,9 +355,6 @@ bool ValidateDeleteTransformFeedbacks(Context *context, GLint n, const GLuint *i
bool ValidateGenVertexArrays(Context *context, GLint n, GLuint *arrays); bool ValidateGenVertexArrays(Context *context, GLint n, GLuint *arrays);
bool ValidateDeleteVertexArrays(Context *context, GLint n, const GLuint *arrays); bool ValidateDeleteVertexArrays(Context *context, GLint n, const GLuint *arrays);
bool ValidateGenOrDeleteES3(Context *context, GLint n);
bool ValidateGenOrDeleteCountES3(Context *context, GLint count);
bool ValidateBeginTransformFeedback(Context *context, GLenum primitiveMode); bool ValidateBeginTransformFeedback(Context *context, GLenum primitiveMode);
bool ValidateGetBufferPointerv(Context *context, GLenum target, GLenum pname, void **params); bool ValidateGetBufferPointerv(Context *context, GLenum target, GLenum pname, void **params);
......
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