From: Eric Engestrom Date: Fri, 3 Jul 2020 00:40:26 +0000 (+0200) Subject: mesa/glformats: make _mesa_gles_error_check_format_and_type() more consistent X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9e2afe4f05abc700bb75c373009aa890311bfdc6;p=mesa.git mesa/glformats: make _mesa_gles_error_check_format_and_type() more consistent Let's consistently use the following code format instead of relying on falling through to `default`: if (!req) return GL_INVALID_OPERATION; break; Signed-off-by: Eric Engestrom Reviewed-by: Timothy Arceri Part-of: --- diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c index 252599340aa..1d528f4bff5 100644 --- a/src/mesa/main/glformats.c +++ b/src/mesa/main/glformats.c @@ -2926,18 +2926,18 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx, return GL_INVALID_OPERATION; break; case GL_RGBA: - if (_mesa_has_OES_texture_float(ctx) && internalFormat == format) - break; - /* fallthrough */ + if (!_mesa_has_OES_texture_float(ctx) || internalFormat != format) + return GL_INVALID_OPERATION; + break; default: return GL_INVALID_OPERATION; } break; case GL_HALF_FLOAT_OES: - if (_mesa_has_OES_texture_half_float(ctx) && internalFormat == format) - break; - /* fallthrough */ + if (!_mesa_has_OES_texture_half_float(ctx) || internalFormat != format) + return GL_INVALID_OPERATION; + break; default: return GL_INVALID_OPERATION; } @@ -3068,9 +3068,9 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx, return GL_INVALID_OPERATION; break; case GL_RGB: - if (_mesa_has_OES_texture_float(ctx) && internalFormat == format) - break; - /* fallthrough */ + if (!_mesa_has_OES_texture_float(ctx) || internalFormat != format) + return GL_INVALID_OPERATION; + break; default: return GL_INVALID_OPERATION; } @@ -3180,10 +3180,10 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx, return GL_INVALID_OPERATION; break; case GL_RG: - if (_mesa_has_rg_textures(ctx) && - _mesa_has_OES_texture_half_float(ctx)) - break; - /* fallthrough */ + if (!_mesa_has_rg_textures(ctx) || + !_mesa_has_OES_texture_half_float(ctx)) + return GL_INVALID_OPERATION; + break; default: return GL_INVALID_OPERATION; } @@ -3195,10 +3195,10 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx, case GL_RG32F: break; case GL_RG: - if (_mesa_has_rg_textures(ctx) && - _mesa_has_OES_texture_float(ctx)) - break; - /* fallthrough */ + if (!_mesa_has_rg_textures(ctx) || + !_mesa_has_OES_texture_float(ctx)) + return GL_INVALID_OPERATION; + break; default: return GL_INVALID_OPERATION; } @@ -3288,10 +3288,10 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx, break; case GL_RG: case GL_RED: - if (_mesa_has_rg_textures(ctx) && - _mesa_has_OES_texture_half_float(ctx)) - break; - /* fallthrough */ + if (!_mesa_has_rg_textures(ctx) || + !_mesa_has_OES_texture_half_float(ctx)) + return GL_INVALID_OPERATION; + break; default: return GL_INVALID_OPERATION; } @@ -3303,10 +3303,10 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx, case GL_R32F: break; case GL_RED: - if (_mesa_has_rg_textures(ctx) && - _mesa_has_OES_texture_float(ctx)) - break; - /* fallthrough */ + if (!_mesa_has_rg_textures(ctx) || + !_mesa_has_OES_texture_float(ctx)) + return GL_INVALID_OPERATION; + break; default: return GL_INVALID_OPERATION; }