Apply clang-format to many files.
This cleans up the formatting in many places.
BUG=None
Change-Id: I6c6652ebc042f1f0ffecced53582d09d66b4f384
Reviewed-on: https://chromium-review.googlesource.com/487884
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
diff --git a/src/libANGLE/renderer/gl/FramebufferGL.cpp b/src/libANGLE/renderer/gl/FramebufferGL.cpp
index cd22e88..15f23d4 100644
--- a/src/libANGLE/renderer/gl/FramebufferGL.cpp
+++ b/src/libANGLE/renderer/gl/FramebufferGL.cpp
@@ -11,8 +11,8 @@
#include "common/bitset_utils.h"
#include "common/debug.h"
#include "libANGLE/ContextState.h"
-#include "libANGLE/State.h"
#include "libANGLE/FramebufferAttachment.h"
+#include "libANGLE/State.h"
#include "libANGLE/angletypes.h"
#include "libANGLE/formatutils.h"
#include "libANGLE/renderer/ContextImpl.h"
@@ -94,12 +94,15 @@
}
else if (texture->getTarget() == GL_TEXTURE_CUBE_MAP)
{
- functions->framebufferTexture2D(GL_FRAMEBUFFER, attachmentPoint, attachment->cubeMapFace(),
+ functions->framebufferTexture2D(GL_FRAMEBUFFER, attachmentPoint,
+ attachment->cubeMapFace(),
textureGL->getTextureID(), attachment->mipLevel());
}
- else if (texture->getTarget() == GL_TEXTURE_2D_ARRAY || texture->getTarget() == GL_TEXTURE_3D)
+ else if (texture->getTarget() == GL_TEXTURE_2D_ARRAY ||
+ texture->getTarget() == GL_TEXTURE_3D)
{
- functions->framebufferTextureLayer(GL_FRAMEBUFFER, attachmentPoint, textureGL->getTextureID(),
+ functions->framebufferTextureLayer(GL_FRAMEBUFFER, attachmentPoint,
+ textureGL->getTextureID(),
attachment->mipLevel(), attachment->layer());
}
else
@@ -173,7 +176,8 @@
finalAttachmentsPtr = modifiedAttachments.data();
}
- // Since this function is just a hint and not available until OpenGL 4.3, only call it if it is available.
+ // Since this function is just a hint and not available until OpenGL 4.3, only call it if it is
+ // available.
if (mFunctions->invalidateSubFramebuffer)
{
mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
@@ -307,8 +311,8 @@
GLbitfield mask,
GLenum filter)
{
- const Framebuffer *sourceFramebuffer = context->getGLState().getReadFramebuffer();
- const Framebuffer *destFramebuffer = context->getGLState().getDrawFramebuffer();
+ const Framebuffer *sourceFramebuffer = context->getGLState().getReadFramebuffer();
+ const Framebuffer *destFramebuffer = context->getGLState().getDrawFramebuffer();
const FramebufferAttachment *colorReadAttachment = sourceFramebuffer->getReadColorbuffer();
@@ -332,8 +336,8 @@
// corresponding to the read buffer is SRGB, the red, green, and blue components are
// converted from the non-linear sRGB color space according [...].
{
- bool sourceSRGB = colorReadAttachment != nullptr &&
- colorReadAttachment->getColorEncoding() == GL_SRGB;
+ bool sourceSRGB =
+ colorReadAttachment != nullptr && colorReadAttachment->getColorEncoding() == GL_SRGB;
needManualColorBlit =
needManualColorBlit || (sourceSRGB && mFunctions->isAtMostGL(gl::Version(4, 3)));
}
@@ -587,7 +591,7 @@
intptr_t offset = reinterpret_cast<intptr_t>(pixels);
const gl::InternalFormat &glFormat = gl::GetInternalFormatInfo(format, type);
- GLuint rowBytes = 0;
+ GLuint rowBytes = 0;
ANGLE_TRY_RESULT(glFormat.computeRowPitch(type, area.width, pack.alignment, pack.rowLength),
rowBytes);
GLuint skipBytes = 0;
@@ -617,7 +621,7 @@
void *pixels) const
{
const gl::InternalFormat &glFormat = gl::GetInternalFormatInfo(format, type);
- GLuint rowBytes = 0;
+ GLuint rowBytes = 0;
ANGLE_TRY_RESULT(glFormat.computeRowPitch(type, area.width, pack.alignment, pack.rowLength),
rowBytes);
GLuint skipBytes = 0;