Fix the coding style issue for validation code
Change-Id: I63aa1c1b3bbc52b0b522e4a703e6d20574eb21ad
Reviewed-on: https://chromium-review.googlesource.com/414588
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index 6d76d33..73f028f 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -39,9 +39,9 @@
const gl::State &state = context->getGLState();
const gl::Program *program = state.getProgram();
- const VertexArray *vao = state.getVertexArray();
- const auto &vertexAttribs = vao->getVertexAttributes();
- size_t maxEnabledAttrib = vao->getMaxEnabledAttribute();
+ const VertexArray *vao = state.getVertexArray();
+ const auto &vertexAttribs = vao->getVertexAttributes();
+ size_t maxEnabledAttrib = vao->getMaxEnabledAttribute();
for (size_t attributeIndex = 0; attributeIndex < maxEnabledAttrib; ++attributeIndex)
{
const VertexAttribute &attrib = vertexAttribs[attributeIndex];
@@ -51,7 +51,7 @@
if (buffer)
{
- GLint64 attribStride = static_cast<GLint64>(ComputeVertexAttributeStride(attrib));
+ GLint64 attribStride = static_cast<GLint64>(ComputeVertexAttributeStride(attrib));
GLint64 maxVertexElement = 0;
if (attrib.divisor > 0)
@@ -1300,20 +1300,20 @@
{
switch (target)
{
- case GL_TEXTURE_2D:
- case GL_TEXTURE_CUBE_MAP:
- return true;
+ case GL_TEXTURE_2D:
+ case GL_TEXTURE_CUBE_MAP:
+ return true;
- case GL_TEXTURE_3D:
- case GL_TEXTURE_2D_ARRAY:
- return (context->getClientMajorVersion() >= 3);
+ case GL_TEXTURE_3D:
+ case GL_TEXTURE_2D_ARRAY:
+ return (context->getClientMajorVersion() >= 3);
- case GL_TEXTURE_2D_MULTISAMPLE:
- UNIMPLEMENTED();
- return (context->getClientVersion() >= Version(3, 1));
+ case GL_TEXTURE_2D_MULTISAMPLE:
+ UNIMPLEMENTED();
+ return (context->getClientVersion() >= Version(3, 1));
- default:
- return false;
+ default:
+ return false;
}
}
@@ -1360,16 +1360,16 @@
{
switch (target)
{
- case GL_TEXTURE_2D:
- case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
- case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
- case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
- case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
- case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
- case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
- return true;
- default:
- return false;
+ case GL_TEXTURE_2D:
+ case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
+ case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
+ case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
+ case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
+ case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
+ case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
+ return true;
+ default:
+ return false;
}
}
@@ -1377,25 +1377,30 @@
{
switch (target)
{
- case GL_TEXTURE_3D:
- case GL_TEXTURE_2D_ARRAY:
- return true;
- default:
- return false;
+ case GL_TEXTURE_3D:
+ case GL_TEXTURE_2D_ARRAY:
+ return true;
+ default:
+ return false;
}
}
bool ValidFramebufferTarget(GLenum target)
{
- static_assert(GL_DRAW_FRAMEBUFFER_ANGLE == GL_DRAW_FRAMEBUFFER && GL_READ_FRAMEBUFFER_ANGLE == GL_READ_FRAMEBUFFER,
+ static_assert(GL_DRAW_FRAMEBUFFER_ANGLE == GL_DRAW_FRAMEBUFFER &&
+ GL_READ_FRAMEBUFFER_ANGLE == GL_READ_FRAMEBUFFER,
"ANGLE framebuffer enums must equal the ES3 framebuffer enums.");
switch (target)
{
- case GL_FRAMEBUFFER: return true;
- case GL_READ_FRAMEBUFFER: return true;
- case GL_DRAW_FRAMEBUFFER: return true;
- default: return false;
+ case GL_FRAMEBUFFER:
+ return true;
+ case GL_READ_FRAMEBUFFER:
+ return true;
+ case GL_DRAW_FRAMEBUFFER:
+ return true;
+ default:
+ return false;
}
}
@@ -1403,30 +1408,30 @@
{
switch (target)
{
- case GL_ARRAY_BUFFER:
- case GL_ELEMENT_ARRAY_BUFFER:
- return true;
+ case GL_ARRAY_BUFFER:
+ case GL_ELEMENT_ARRAY_BUFFER:
+ return true;
- case GL_PIXEL_PACK_BUFFER:
- case GL_PIXEL_UNPACK_BUFFER:
- return (context->getExtensions().pixelBufferObject ||
- context->getClientMajorVersion() >= 3);
+ case GL_PIXEL_PACK_BUFFER:
+ case GL_PIXEL_UNPACK_BUFFER:
+ return (context->getExtensions().pixelBufferObject ||
+ context->getClientMajorVersion() >= 3);
- case GL_COPY_READ_BUFFER:
- case GL_COPY_WRITE_BUFFER:
- case GL_TRANSFORM_FEEDBACK_BUFFER:
- case GL_UNIFORM_BUFFER:
- return (context->getClientMajorVersion() >= 3);
+ case GL_COPY_READ_BUFFER:
+ case GL_COPY_WRITE_BUFFER:
+ case GL_TRANSFORM_FEEDBACK_BUFFER:
+ case GL_UNIFORM_BUFFER:
+ return (context->getClientMajorVersion() >= 3);
- case GL_ATOMIC_COUNTER_BUFFER:
- case GL_SHADER_STORAGE_BUFFER:
- case GL_DRAW_INDIRECT_BUFFER:
- case GL_DISPATCH_INDIRECT_BUFFER:
- UNIMPLEMENTED();
- return context->getClientVersion() >= Version(3, 1);
+ case GL_ATOMIC_COUNTER_BUFFER:
+ case GL_SHADER_STORAGE_BUFFER:
+ case GL_DRAW_INDIRECT_BUFFER:
+ case GL_DISPATCH_INDIRECT_BUFFER:
+ UNIMPLEMENTED();
+ return context->getClientVersion() >= Version(3, 1);
- default:
- return false;
+ default:
+ return false;
}
}
@@ -1439,22 +1444,23 @@
case GL_TEXTURE_2D:
maxDimension = caps.max2DTextureSize;
break;
- case GL_TEXTURE_CUBE_MAP:
- case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
- case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
- case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
- case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
- case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
- case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
- maxDimension = caps.maxCubeMapTextureSize;
- break;
- case GL_TEXTURE_3D:
- maxDimension = caps.max3DTextureSize;
- break;
- case GL_TEXTURE_2D_ARRAY:
- maxDimension = caps.max2DTextureSize;
- break;
- default: UNREACHABLE();
+ case GL_TEXTURE_CUBE_MAP:
+ case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
+ case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
+ case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
+ case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
+ case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
+ case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
+ maxDimension = caps.maxCubeMapTextureSize;
+ break;
+ case GL_TEXTURE_3D:
+ maxDimension = caps.max3DTextureSize;
+ break;
+ case GL_TEXTURE_2D_ARRAY:
+ maxDimension = caps.max2DTextureSize;
+ break;
+ default:
+ UNREACHABLE();
}
return level <= gl::log2(static_cast<int>(maxDimension));
@@ -1608,30 +1614,33 @@
bool ValidQueryType(const Context *context, GLenum queryType)
{
- static_assert(GL_ANY_SAMPLES_PASSED == GL_ANY_SAMPLES_PASSED_EXT, "GL extension enums not equal.");
- static_assert(GL_ANY_SAMPLES_PASSED_CONSERVATIVE == GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT, "GL extension enums not equal.");
+ static_assert(GL_ANY_SAMPLES_PASSED == GL_ANY_SAMPLES_PASSED_EXT,
+ "GL extension enums not equal.");
+ static_assert(GL_ANY_SAMPLES_PASSED_CONSERVATIVE == GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT,
+ "GL extension enums not equal.");
switch (queryType)
{
- case GL_ANY_SAMPLES_PASSED:
- case GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
- return true;
- case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
- return (context->getClientMajorVersion() >= 3);
- case GL_TIME_ELAPSED_EXT:
- return context->getExtensions().disjointTimerQuery;
- case GL_COMMANDS_COMPLETED_CHROMIUM:
- return context->getExtensions().syncQuery;
- default:
- return false;
+ case GL_ANY_SAMPLES_PASSED:
+ case GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
+ return true;
+ case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
+ return (context->getClientMajorVersion() >= 3);
+ case GL_TIME_ELAPSED_EXT:
+ return context->getExtensions().disjointTimerQuery;
+ case GL_COMMANDS_COMPLETED_CHROMIUM:
+ return context->getExtensions().syncQuery;
+ default:
+ return false;
}
}
Program *GetValidProgram(ValidationContext *context, GLuint id)
{
- // ES3 spec (section 2.11.1) -- "Commands that accept shader or program object names will generate the
- // error INVALID_VALUE if the provided name is not the name of either a shader or program object and
- // INVALID_OPERATION if the provided name identifies an object that is not the expected type."
+ // ES3 spec (section 2.11.1) -- "Commands that accept shader or program object names will
+ // generate the error INVALID_VALUE if the provided name is not the name of either a shader
+ // or program object and INVALID_OPERATION if the provided name identifies an object
+ // that is not the expected type."
Program *validProgram = context->getProgram(id);
@@ -1689,38 +1698,42 @@
{
switch (attachment)
{
- case GL_DEPTH_ATTACHMENT:
- case GL_STENCIL_ATTACHMENT:
- break;
+ case GL_DEPTH_ATTACHMENT:
+ case GL_STENCIL_ATTACHMENT:
+ break;
- case GL_DEPTH_STENCIL_ATTACHMENT:
- if (!context->getExtensions().webglCompatibility &&
- context->getClientMajorVersion() < 3)
- {
- context->handleError(Error(GL_INVALID_ENUM));
- return false;
- }
- break;
+ case GL_DEPTH_STENCIL_ATTACHMENT:
+ if (!context->getExtensions().webglCompatibility &&
+ context->getClientMajorVersion() < 3)
+ {
+ context->handleError(Error(GL_INVALID_ENUM));
+ return false;
+ }
+ break;
- default:
- context->handleError(Error(GL_INVALID_ENUM));
- return false;
+ default:
+ context->handleError(Error(GL_INVALID_ENUM));
+ return false;
}
}
return true;
}
-bool ValidateRenderbufferStorageParametersBase(gl::Context *context, GLenum target, GLsizei samples,
- GLenum internalformat, GLsizei width, GLsizei height)
+bool ValidateRenderbufferStorageParametersBase(gl::Context *context,
+ GLenum target,
+ GLsizei samples,
+ GLenum internalformat,
+ GLsizei width,
+ GLsizei height)
{
switch (target)
{
- case GL_RENDERBUFFER:
- break;
- default:
- context->handleError(Error(GL_INVALID_ENUM));
- return false;
+ case GL_RENDERBUFFER:
+ break;
+ default:
+ context->handleError(Error(GL_INVALID_ENUM));
+ return false;
}
if (width < 0 || height < 0 || samples < 0)
@@ -1762,8 +1775,12 @@
return true;
}
-bool ValidateRenderbufferStorageParametersANGLE(gl::Context *context, GLenum target, GLsizei samples,
- GLenum internalformat, GLsizei width, GLsizei height)
+bool ValidateRenderbufferStorageParametersANGLE(gl::Context *context,
+ GLenum target,
+ GLsizei samples,
+ GLenum internalformat,
+ GLsizei width,
+ GLsizei height)
{
ASSERT(samples == 0 || context->getExtensions().framebufferMultisample);
@@ -1790,11 +1807,15 @@
}
}
- return ValidateRenderbufferStorageParametersBase(context, target, samples, internalformat, width, height);
+ return ValidateRenderbufferStorageParametersBase(context, target, samples, internalformat,
+ width, height);
}
-bool ValidateFramebufferRenderbufferParameters(gl::Context *context, GLenum target, GLenum attachment,
- GLenum renderbuffertarget, GLuint renderbuffer)
+bool ValidateFramebufferRenderbufferParameters(gl::Context *context,
+ GLenum target,
+ GLenum attachment,
+ GLenum renderbuffertarget,
+ GLuint renderbuffer)
{
if (!ValidFramebufferTarget(target))
{
@@ -1847,13 +1868,13 @@
{
switch (filter)
{
- case GL_NEAREST:
- break;
- case GL_LINEAR:
- break;
- default:
- context->handleError(Error(GL_INVALID_ENUM));
- return false;
+ case GL_NEAREST:
+ break;
+ case GL_LINEAR:
+ break;
+ default:
+ context->handleError(Error(GL_INVALID_ENUM));
+ return false;
}
if ((mask & ~(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)) != 0)
@@ -1934,13 +1955,15 @@
// The GL ES 3.0.2 spec (pg 193) states that:
// 1) If the read buffer is fixed point format, the draw buffer must be as well
- // 2) If the read buffer is an unsigned integer format, the draw buffer must be as well
- // 3) If the read buffer is a signed integer format, the draw buffer must be as well
+ // 2) If the read buffer is an unsigned integer format, the draw buffer must be
+ // as well
+ // 3) If the read buffer is a signed integer format, the draw buffer must be as
+ // well
// Changes with EXT_color_buffer_float:
// Case 1) is changed to fixed point OR floating point
GLenum readComponentType = readFormat.info->componentType;
GLenum drawComponentType = drawFormat.info->componentType;
- bool readFixedPoint = (readComponentType == GL_UNSIGNED_NORMALIZED ||
+ bool readFixedPoint = (readComponentType == GL_UNSIGNED_NORMALIZED ||
readComponentType == GL_SIGNED_NORMALIZED);
bool drawFixedPoint = (drawComponentType == GL_UNSIGNED_NORMALIZED ||
drawComponentType == GL_SIGNED_NORMALIZED);
@@ -1999,14 +2022,16 @@
}
}
- GLenum masks[] = {GL_DEPTH_BUFFER_BIT, GL_STENCIL_BUFFER_BIT};
+ GLenum masks[] = {GL_DEPTH_BUFFER_BIT, GL_STENCIL_BUFFER_BIT};
GLenum attachments[] = {GL_DEPTH_ATTACHMENT, GL_STENCIL_ATTACHMENT};
for (size_t i = 0; i < 2; i++)
{
if (mask & masks[i])
{
- const gl::FramebufferAttachment *readBuffer = readFramebuffer->getAttachment(attachments[i]);
- const gl::FramebufferAttachment *drawBuffer = drawFramebuffer->getAttachment(attachments[i]);
+ const gl::FramebufferAttachment *readBuffer =
+ readFramebuffer->getAttachment(attachments[i]);
+ const gl::FramebufferAttachment *drawBuffer =
+ drawFramebuffer->getAttachment(attachments[i]);
if (readBuffer && drawBuffer)
{
@@ -2682,7 +2707,7 @@
return false;
}
- GLenum targetBoolType = VariableBoolVectorType(uniformType);
+ GLenum targetBoolType = VariableBoolVectorType(uniformType);
bool samplerUniformCheck = (IsSamplerType(uniform->type) && uniformType == GL_INT);
if (!samplerUniformCheck && uniformType != uniform->type && targetBoolType != uniform->type)
{
@@ -2693,7 +2718,10 @@
return true;
}
-bool ValidateUniformMatrix(gl::Context *context, GLenum matrixType, GLint location, GLsizei count,
+bool ValidateUniformMatrix(gl::Context *context,
+ GLenum matrixType,
+ GLint location,
+ GLsizei count,
GLboolean transpose)
{
// Check for ES3 uniform entry points
@@ -2753,24 +2781,24 @@
switch (pname)
{
- case GL_TEXTURE_BINDING_2D:
- case GL_TEXTURE_BINDING_CUBE_MAP:
- case GL_TEXTURE_BINDING_3D:
- case GL_TEXTURE_BINDING_2D_ARRAY:
- break;
- case GL_TEXTURE_BINDING_EXTERNAL_OES:
- if (!context->getExtensions().eglStreamConsumerExternal &&
- !context->getExtensions().eglImageExternal)
- {
- context->handleError(Error(GL_INVALID_ENUM,
- "Neither NV_EGL_stream_consumer_external nor "
- "GL_OES_EGL_image_external extensions enabled"));
- return false;
- }
- break;
+ case GL_TEXTURE_BINDING_2D:
+ case GL_TEXTURE_BINDING_CUBE_MAP:
+ case GL_TEXTURE_BINDING_3D:
+ case GL_TEXTURE_BINDING_2D_ARRAY:
+ break;
+ case GL_TEXTURE_BINDING_EXTERNAL_OES:
+ if (!context->getExtensions().eglStreamConsumerExternal &&
+ !context->getExtensions().eglImageExternal)
+ {
+ context->handleError(Error(GL_INVALID_ENUM,
+ "Neither NV_EGL_stream_consumer_external nor "
+ "GL_OES_EGL_image_external extensions enabled"));
+ return false;
+ }
+ break;
- case GL_IMPLEMENTATION_COLOR_READ_TYPE:
- case GL_IMPLEMENTATION_COLOR_READ_FORMAT:
+ case GL_IMPLEMENTATION_COLOR_READ_TYPE:
+ case GL_IMPLEMENTATION_COLOR_READ_FORMAT:
{
if (context->getGLState().getReadFramebuffer()->checkStatus(
context->getContextState()) != GL_FRAMEBUFFER_COMPLETE)
@@ -2797,8 +2825,8 @@
}
break;
- default:
- break;
+ default:
+ break;
}
// pname is valid, but there are no parameters to return
@@ -2855,7 +2883,8 @@
return false;
}
- if (std::numeric_limits<GLsizei>::max() - xoffset < width || std::numeric_limits<GLsizei>::max() - yoffset < height)
+ if (std::numeric_limits<GLsizei>::max() - xoffset < width ||
+ std::numeric_limits<GLsizei>::max() - yoffset < height)
{
context->handleError(Error(GL_INVALID_VALUE));
return false;
@@ -2898,30 +2927,30 @@
GLuint maxDimension = 0;
switch (target)
{
- case GL_TEXTURE_2D:
- maxDimension = caps.max2DTextureSize;
- break;
+ case GL_TEXTURE_2D:
+ maxDimension = caps.max2DTextureSize;
+ break;
- case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
- case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
- case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
- case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
- case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
- case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
- maxDimension = caps.maxCubeMapTextureSize;
- break;
+ case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
+ case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
+ case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
+ case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
+ case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
+ case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
+ maxDimension = caps.maxCubeMapTextureSize;
+ break;
- case GL_TEXTURE_2D_ARRAY:
- maxDimension = caps.max2DTextureSize;
- break;
+ case GL_TEXTURE_2D_ARRAY:
+ maxDimension = caps.max2DTextureSize;
+ break;
- case GL_TEXTURE_3D:
- maxDimension = caps.max3DTextureSize;
- break;
+ case GL_TEXTURE_3D:
+ maxDimension = caps.max3DTextureSize;
+ break;
- default:
- context->handleError(Error(GL_INVALID_ENUM));
- return false;
+ default:
+ context->handleError(Error(GL_INVALID_ENUM));
+ return false;
}
gl::Texture *texture =
@@ -2977,7 +3006,8 @@
}
int maxLevelDimension = (maxDimension >> level);
- if (static_cast<int>(width) > maxLevelDimension || static_cast<int>(height) > maxLevelDimension)
+ if (static_cast<int>(width) > maxLevelDimension ||
+ static_cast<int>(height) > maxLevelDimension)
{
context->handleError(Error(GL_INVALID_VALUE));
return false;
@@ -2998,17 +3028,17 @@
{
switch (mode)
{
- case GL_POINTS:
- case GL_LINES:
- case GL_LINE_LOOP:
- case GL_LINE_STRIP:
- case GL_TRIANGLES:
- case GL_TRIANGLE_STRIP:
- case GL_TRIANGLE_FAN:
- break;
- default:
- context->handleError(Error(GL_INVALID_ENUM));
- return false;
+ case GL_POINTS:
+ case GL_LINES:
+ case GL_LINE_LOOP:
+ case GL_LINE_STRIP:
+ case GL_TRIANGLES:
+ case GL_TRIANGLE_STRIP:
+ case GL_TRIANGLE_FAN:
+ break;
+ default:
+ context->handleError(Error(GL_INVALID_ENUM));
+ return false;
}
if (count < 0)
@@ -3030,8 +3060,8 @@
if (context->getLimitations().noSeparateStencilRefsAndMasks)
{
const FramebufferAttachment *stencilBuffer = framebuffer->getStencilbuffer();
- GLuint stencilBits = stencilBuffer ? stencilBuffer->getStencilSize() : 0;
- GLuint minimumRequiredStencilMask = (1 << stencilBits) - 1;
+ GLuint stencilBits = stencilBuffer ? stencilBuffer->getStencilSize() : 0;
+ GLuint minimumRequiredStencilMask = (1 << stencilBits) - 1;
const DepthStencilState &depthStencilState = state.getDepthStencilState();
if ((depthStencilState.stencilWritemask & minimumRequiredStencilMask) !=
(depthStencilState.stencilBackWritemask & minimumRequiredStencilMask) ||
@@ -3041,8 +3071,7 @@
{
// Note: these separate values are not supported in WebGL, due to D3D's limitations. See
// Section 6.10 of the WebGL 1.0 spec
- ERR(
- "This ANGLE implementation does not support separate front/back stencil "
+ ERR("This ANGLE implementation does not support separate front/back stencil "
"writemasks, reference values, or stencil mask values.");
context->handleError(Error(GL_INVALID_OPERATION));
return false;
@@ -3069,10 +3098,11 @@
}
// Uniform buffer validation
- for (unsigned int uniformBlockIndex = 0; uniformBlockIndex < program->getActiveUniformBlockCount(); uniformBlockIndex++)
+ for (unsigned int uniformBlockIndex = 0;
+ uniformBlockIndex < program->getActiveUniformBlockCount(); uniformBlockIndex++)
{
const gl::UniformBlock &uniformBlock = program->getUniformBlockByIndex(uniformBlockIndex);
- GLuint blockBinding = program->getUniformBlockBinding(uniformBlockIndex);
+ GLuint blockBinding = program->getUniformBlockBinding(uniformBlockIndex);
const OffsetBindingPointer<Buffer> &uniformBuffer =
state.getIndexedUniformBuffer(blockBinding);
@@ -3120,11 +3150,12 @@
const State &state = context->getGLState();
gl::TransformFeedback *curTransformFeedback = state.getCurrentTransformFeedback();
- if (curTransformFeedback && curTransformFeedback->isActive() && !curTransformFeedback->isPaused() &&
- curTransformFeedback->getPrimitiveMode() != mode)
+ if (curTransformFeedback && curTransformFeedback->isActive() &&
+ !curTransformFeedback->isPaused() && curTransformFeedback->getPrimitiveMode() != mode)
{
// It is an invalid operation to call DrawArrays or DrawArraysInstanced with a draw mode
- // that does not match the current transform feedback object's draw mode (if transform feedback
+ // that does not match the current transform feedback object's draw mode (if transform
+ // feedback
// is active), (3.0.2, section 2.14, pg 86)
context->handleError(Error(GL_INVALID_OPERATION));
return false;
@@ -3143,7 +3174,11 @@
return true;
}
-bool ValidateDrawArraysInstanced(Context *context, GLenum mode, GLint first, GLsizei count, GLsizei primcount)
+bool ValidateDrawArraysInstanced(Context *context,
+ GLenum mode,
+ GLint first,
+ GLsizei count,
+ GLsizei primcount)
{
if (primcount < 0)
{
@@ -3183,7 +3218,11 @@
return false;
}
-bool ValidateDrawArraysInstancedANGLE(Context *context, GLenum mode, GLint first, GLsizei count, GLsizei primcount)
+bool ValidateDrawArraysInstancedANGLE(Context *context,
+ GLenum mode,
+ GLint first,
+ GLsizei count,
+ GLsizei primcount)
{
if (!ValidateDrawInstancedANGLE(context))
{
@@ -3203,27 +3242,29 @@
{
switch (type)
{
- case GL_UNSIGNED_BYTE:
- case GL_UNSIGNED_SHORT:
- break;
- case GL_UNSIGNED_INT:
- if (context->getClientMajorVersion() < 3 && !context->getExtensions().elementIndexUint)
- {
- context->handleError(Error(GL_INVALID_ENUM));
- return false;
- }
- break;
- default:
- context->handleError(Error(GL_INVALID_ENUM));
- return false;
+ case GL_UNSIGNED_BYTE:
+ case GL_UNSIGNED_SHORT:
+ break;
+ case GL_UNSIGNED_INT:
+ if (context->getClientMajorVersion() < 3 && !context->getExtensions().elementIndexUint)
+ {
+ context->handleError(Error(GL_INVALID_ENUM));
+ return false;
+ }
+ break;
+ default:
+ context->handleError(Error(GL_INVALID_ENUM));
+ return false;
}
const State &state = context->getGLState();
gl::TransformFeedback *curTransformFeedback = state.getCurrentTransformFeedback();
- if (curTransformFeedback && curTransformFeedback->isActive() && !curTransformFeedback->isPaused())
+ if (curTransformFeedback && curTransformFeedback->isActive() &&
+ !curTransformFeedback->isPaused())
{
- // It is an invalid operation to call DrawElements, DrawRangeElements or DrawElementsInstanced
+ // It is an invalid operation to call DrawElements, DrawRangeElements or
+ // DrawElementsInstanced
// while transform feedback is active, (3.0.2, section 2.14, pg 86)
context->handleError(Error(GL_INVALID_OPERATION));
return false;
@@ -3236,7 +3277,7 @@
return false;
}
- const gl::VertexArray *vao = state.getVertexArray();
+ const gl::VertexArray *vao = state.getVertexArray();
gl::Buffer *elementArrayBuffer = vao->getElementArrayBuffer().get();
if (!indices && !elementArrayBuffer)
{
@@ -3249,7 +3290,8 @@
const gl::Type &typeInfo = gl::GetTypeInfo(type);
GLint64 offset = reinterpret_cast<GLint64>(indices);
- GLint64 byteCount = static_cast<GLint64>(typeInfo.bytes) * static_cast<GLint64>(count)+offset;
+ GLint64 byteCount =
+ static_cast<GLint64>(typeInfo.bytes) * static_cast<GLint64>(count) + offset;
// check for integer overflows
if (static_cast<GLuint>(count) > (std::numeric_limits<GLuint>::max() / typeInfo.bytes) ||
@@ -3352,11 +3394,15 @@
return false;
}
- return ValidateDrawElementsInstanced(context, mode, count, type, indices, primcount, indexRangeOut);
+ return ValidateDrawElementsInstanced(context, mode, count, type, indices, primcount,
+ indexRangeOut);
}
-bool ValidateFramebufferTextureBase(Context *context, GLenum target, GLenum attachment,
- GLuint texture, GLint level)
+bool ValidateFramebufferTextureBase(Context *context,
+ GLenum target,
+ GLenum attachment,
+ GLuint texture,
+ GLint level)
{
if (!ValidFramebufferTarget(target))
{
@@ -3399,10 +3445,15 @@
return true;
}
-bool ValidateFramebufferTexture2D(Context *context, GLenum target, GLenum attachment,
- GLenum textarget, GLuint texture, GLint level)
+bool ValidateFramebufferTexture2D(Context *context,
+ GLenum target,
+ GLenum attachment,
+ GLenum textarget,
+ GLuint texture,
+ GLint level)
{
- // Attachments are required to be bound to level 0 without ES3 or the GL_OES_fbo_render_mipmap extension
+ // Attachments are required to be bound to level 0 without ES3 or the GL_OES_fbo_render_mipmap
+ // extension
if (context->getClientMajorVersion() < 3 && !context->getExtensions().fboRenderMipmap &&
level != 0)
{
@@ -3424,7 +3475,7 @@
switch (textarget)
{
- case GL_TEXTURE_2D:
+ case GL_TEXTURE_2D:
{
if (level > gl::log2(caps.max2DTextureSize))
{
@@ -3439,12 +3490,12 @@
}
break;
- case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
- case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
- case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
- case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
- case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
- case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
+ case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
+ case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
+ case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
+ case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
+ case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
+ case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
{
if (level > gl::log2(caps.maxCubeMapTextureSize))
{
@@ -3459,9 +3510,9 @@
}
break;
- default:
- context->handleError(Error(GL_INVALID_ENUM));
- return false;
+ default:
+ context->handleError(Error(GL_INVALID_ENUM));
+ return false;
}
const Format &format = tex->getFormat(textarget, level);
@@ -3504,12 +3555,12 @@
return true;
}
-bool ValidateGetUniformfv(Context *context, GLuint program, GLint location, GLfloat* params)
+bool ValidateGetUniformfv(Context *context, GLuint program, GLint location, GLfloat *params)
{
return ValidateGetUniformBase(context, program, location);
}
-bool ValidateGetUniformiv(Context *context, GLuint program, GLint location, GLint* params)
+bool ValidateGetUniformiv(Context *context, GLuint program, GLint location, GLint *params)
{
return ValidateGetUniformBase(context, program, location);
}
@@ -3541,7 +3592,7 @@
// sized queries -- ensure the provided buffer is large enough
const LinkedUniform &uniform = programObject->getUniformByLocation(location);
- size_t requiredBytes = VariableExternalSize(uniform.type);
+ size_t requiredBytes = VariableExternalSize(uniform.type);
if (static_cast<size_t>(bufSize) < requiredBytes)
{
context->handleError(
@@ -3557,12 +3608,20 @@
return true;
}
-bool ValidateGetnUniformfvEXT(Context *context, GLuint program, GLint location, GLsizei bufSize, GLfloat* params)
+bool ValidateGetnUniformfvEXT(Context *context,
+ GLuint program,
+ GLint location,
+ GLsizei bufSize,
+ GLfloat *params)
{
return ValidateSizedGetUniform(context, program, location, bufSize, nullptr);
}
-bool ValidateGetnUniformivEXT(Context *context, GLuint program, GLint location, GLsizei bufSize, GLint* params)
+bool ValidateGetnUniformivEXT(Context *context,
+ GLuint program,
+ GLint location,
+ GLsizei bufSize,
+ GLint *params)
{
return ValidateSizedGetUniform(context, program, location, bufSize, nullptr);
}
@@ -3622,8 +3681,11 @@
return ValidateSizedGetUniform(context, program, location, bufSize, length);
}
-bool ValidateDiscardFramebufferBase(Context *context, GLenum target, GLsizei numAttachments,
- const GLenum *attachments, bool defaultFramebuffer)
+bool ValidateDiscardFramebufferBase(Context *context,
+ GLenum target,
+ GLsizei numAttachments,
+ const GLenum *attachments,
+ bool defaultFramebuffer)
{
if (numAttachments < 0)
{
@@ -3654,31 +3716,31 @@
{
switch (attachments[i])
{
- case GL_DEPTH_ATTACHMENT:
- case GL_STENCIL_ATTACHMENT:
- case GL_DEPTH_STENCIL_ATTACHMENT:
- if (defaultFramebuffer)
- {
- context->handleError(
- Error(GL_INVALID_ENUM,
- "Invalid attachment when the default framebuffer is bound"));
+ case GL_DEPTH_ATTACHMENT:
+ case GL_STENCIL_ATTACHMENT:
+ case GL_DEPTH_STENCIL_ATTACHMENT:
+ if (defaultFramebuffer)
+ {
+ context->handleError(
+ Error(GL_INVALID_ENUM,
+ "Invalid attachment when the default framebuffer is bound"));
+ return false;
+ }
+ break;
+ case GL_COLOR:
+ case GL_DEPTH:
+ case GL_STENCIL:
+ if (!defaultFramebuffer)
+ {
+ context->handleError(
+ Error(GL_INVALID_ENUM,
+ "Invalid attachment when the default framebuffer is not bound"));
+ return false;
+ }
+ break;
+ default:
+ context->handleError(Error(GL_INVALID_ENUM, "Invalid attachment"));
return false;
- }
- break;
- case GL_COLOR:
- case GL_DEPTH:
- case GL_STENCIL:
- if (!defaultFramebuffer)
- {
- context->handleError(
- Error(GL_INVALID_ENUM,
- "Invalid attachment when the default framebuffer is not bound"));
- return false;
- }
- break;
- default:
- context->handleError(Error(GL_INVALID_ENUM, "Invalid attachment"));
- return false;
}
}
}