Commit 7f232939 by Jamie Madill Committed by Commit Bot

Run git cl format on several files.

Bug: angleproject:2763 Change-Id: Idcb8a714a6dccdff3dd953679e17a7314866a37d Reviewed-on: https://chromium-review.googlesource.com/1214206 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: 's avatarFrank Henigman <fjhenigman@chromium.org>
parent 8a561914
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
#include "libANGLE/Error.h" #include "libANGLE/Error.h"
#include "libANGLE/HandleAllocator.h" #include "libANGLE/HandleAllocator.h"
#include "libANGLE/RefCountObject.h" #include "libANGLE/RefCountObject.h"
#include "libANGLE/ResourceMap.h"
#include "libANGLE/ResourceManager.h" #include "libANGLE/ResourceManager.h"
#include "libANGLE/ResourceMap.h"
#include "libANGLE/VertexAttribute.h" #include "libANGLE/VertexAttribute.h"
#include "libANGLE/Workarounds.h" #include "libANGLE/Workarounds.h"
#include "libANGLE/angletypes.h" #include "libANGLE/angletypes.h"
......
...@@ -882,8 +882,7 @@ gl::Error TextureGL::setStorage(const gl::Context *context, ...@@ -882,8 +882,7 @@ gl::Error TextureGL::setStorage(const gl::Context *context,
for (size_t level = 0; level < levels; level++) for (size_t level = 0; level < levels; level++)
{ {
gl::Extents levelSize(std::max(size.width >> level, 1), gl::Extents levelSize(std::max(size.width >> level, 1),
std::max(size.height >> level, 1), std::max(size.height >> level, 1), 1);
1);
if (getType() == gl::TextureType::_2D || getType() == gl::TextureType::Rectangle) if (getType() == gl::TextureType::_2D || getType() == gl::TextureType::Rectangle)
{ {
...@@ -1352,8 +1351,8 @@ void TextureGL::syncTextureStateSwizzle(const FunctionsGL *functions, ...@@ -1352,8 +1351,8 @@ void TextureGL::syncTextureStateSwizzle(const FunctionsGL *functions,
if (levelInfo.sourceFormat == GL_LUMINANCE || if (levelInfo.sourceFormat == GL_LUMINANCE ||
levelInfo.sourceFormat == GL_LUMINANCE_ALPHA) levelInfo.sourceFormat == GL_LUMINANCE_ALPHA)
{ {
// Texture is backed by a RED or RG texture, point all color channels at the red // Texture is backed by a RED or RG texture, point all color channels at the
// channel. // red channel.
ASSERT(levelInfo.lumaWorkaround.workaroundFormat == GL_RED || ASSERT(levelInfo.lumaWorkaround.workaroundFormat == GL_RED ||
levelInfo.lumaWorkaround.workaroundFormat == GL_RG); levelInfo.lumaWorkaround.workaroundFormat == GL_RG);
resultSwizzle = GL_RED; resultSwizzle = GL_RED;
...@@ -1441,7 +1440,6 @@ void TextureGL::syncTextureStateSwizzle(const FunctionsGL *functions, ...@@ -1441,7 +1440,6 @@ void TextureGL::syncTextureStateSwizzle(const FunctionsGL *functions,
{ {
UNREACHABLE(); UNREACHABLE();
} }
} }
*outValue = resultSwizzle; *outValue = resultSwizzle;
......
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