Skip to content

A
angle
Commit dcd98298 by Nico Weber Committed by Commit Bot
Options

Remove breaks after returns.

No behavior change. Bug: chromium:1066980 Change-Id: I26a5c13a730cbc6cde8e888a8a18bd633bb3f748 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2133087Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Nico Weber <thakis@chromium.org>
parent 449d9d76
Showing with 32 additions and 100 deletions
src/libANGLE/State.cpp
......@@ -1337,7 +1337,6 @@ bool State::getEnableFeatureIndexed(GLenum feature, GLuint index) const
{
case GL_BLEND:
return isBlendEnabledIndexed(index);
break;
default:
UNREACHABLE();
return false;
......
src/libANGLE/formatutils.cpp
......@@ -374,11 +374,7 @@ GLenum InternalFormat::getReadPixelsFormat(const Extensions &extensions) const
{
return GL_RGBA;
}
else
{
return GL_BGRA_EXT;
}
break;
return GL_BGRA_EXT;
default:
return format;
......@@ -399,10 +395,7 @@ GLenum InternalFormat::getReadPixelsType(const Version &version) const
// as an IMPLEMENTATION_READ_TYPE.
return GL_HALF_FLOAT_OES;
}
else
{
return GL_HALF_FLOAT;
}
return GL_HALF_FLOAT;
default:
return type;
......
src/libANGLE/validationES2.cpp
......@@ -531,48 +531,32 @@ bool ValidateES2CopyTexImageParameters(const Context *context,
context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
return false;
}
else
{
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
}
break;
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:
if (context->getExtensions().textureCompressionDXT3)
{
context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
return false;
}
else
{
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
}
break;
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
if (context->getExtensions().textureCompressionDXT5)
{
context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
return false;
}
else
{
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
}
break;
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
case GL_ETC1_RGB8_OES:
if (context->getExtensions().compressedETC1RGB8TextureOES)
{
context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
return false;
}
else
{
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
}
break;
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
case GL_ETC1_RGB8_LOSSY_DECODE_ANGLE:
case GL_COMPRESSED_RGB8_LOSSY_DECODE_ETC2_ANGLE:
case GL_COMPRESSED_SRGB8_LOSSY_DECODE_ETC2_ANGLE:
......@@ -583,12 +567,8 @@ bool ValidateES2CopyTexImageParameters(const Context *context,
context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
return false;
}
else
{
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
}
break;
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
case GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG:
case GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG:
case GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG:
......@@ -598,12 +578,8 @@ bool ValidateES2CopyTexImageParameters(const Context *context,
context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
return false;
}
else
{
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
}
break;
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
case GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT:
case GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT:
case GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT:
......@@ -613,12 +589,8 @@ bool ValidateES2CopyTexImageParameters(const Context *context,
context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
return false;
}
else
{
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
}
break;
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
case GL_DEPTH_COMPONENT:
case GL_DEPTH_COMPONENT16:
case GL_DEPTH_COMPONENT32_OES:
......@@ -627,12 +599,8 @@ bool ValidateES2CopyTexImageParameters(const Context *context,
context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
return false;
}
else
{
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
}
break;
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
case GL_DEPTH_STENCIL_OES:
case GL_DEPTH24_STENCIL8_OES:
if (context->getExtensions().depthTextureAny() ||
......@@ -642,12 +610,8 @@ bool ValidateES2CopyTexImageParameters(const Context *context,
context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
return false;
}
else
{
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
}
break;
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
default:
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
......@@ -1446,36 +1410,24 @@ bool ValidateES2TexImageParametersBase(const Context *context,
context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
return false;
}
else
{
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
}
break;
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
if (context->getExtensions().textureCompressionDXT5)
{
context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
return false;
}
else
{
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
}
break;
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
case GL_ETC1_RGB8_OES:
if (context->getExtensions().compressedETC1RGB8TextureOES)
{
context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
return false;
}
else
{
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
}
break;
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
case GL_ETC1_RGB8_LOSSY_DECODE_ANGLE:
case GL_COMPRESSED_RGB8_LOSSY_DECODE_ETC2_ANGLE:
case GL_COMPRESSED_SRGB8_LOSSY_DECODE_ETC2_ANGLE:
......@@ -1486,12 +1438,8 @@ bool ValidateES2TexImageParametersBase(const Context *context,
context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
return false;
}
else
{
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
}
break;
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
case GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG:
case GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG:
case GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG:
......@@ -1501,12 +1449,8 @@ bool ValidateES2TexImageParametersBase(const Context *context,
context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
return false;
}
else
{
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
}
break;
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
case GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT:
case GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT:
case GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT:
......@@ -1516,12 +1460,8 @@ bool ValidateES2TexImageParametersBase(const Context *context,
context->validationError(GL_INVALID_OPERATION, kInvalidFormat);
return false;
}
else
{
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
}
break;
context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
return false;
case GL_DEPTH_COMPONENT:
case GL_DEPTH_STENCIL_OES:
if (!context->getExtensions().depthTextureANGLE &&
......
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