diff options
| author | Timothy Arceri <[email protected]> | 2020-07-01 13:04:25 +1000 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-07-02 23:52:52 +0000 |
| commit | 040b07c7feebac90858f7426c2c20784642d0ca5 (patch) | |
| tree | c75702333f2480841bccd6543d94bb535e1d7469 /src/mesa/main | |
| parent | 8591adea38b82f973948cd120ffd9f93eb3bd71d (diff) | |
mesa: fix fallthrough in glformats
Before 908f817918fb this would fallthrough to GL_INVALID_OPERATION
if the validation condition was not met. But since that change it
will now only return GL_INVALID_OPERATION if
!_mesa_has_EXT_texture_compression_bptc(ctx) is true. This seems
unintended.
Here we fix up the fallthrough and add the fallthrough comment so
this doesn't happen again.
Fixes: 908f817918fb ("mesa: expose EXT_texture_compression_bptc in GLES")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3005
Reviewed-by: Marek Olšák <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5705>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/glformats.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c index dfff4a21f04..66b29ede67a 100644 --- a/src/mesa/main/glformats.c +++ b/src/mesa/main/glformats.c @@ -3059,14 +3059,15 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx, if (ctx->Version <= 20) return GL_INVALID_OPERATION; break; - case GL_RGB: - if (_mesa_has_OES_texture_float(ctx) && internalFormat == format) - break; case GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT: case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT: if (!_mesa_has_EXT_texture_compression_bptc(ctx)) return GL_INVALID_OPERATION; break; + case GL_RGB: + if (_mesa_has_OES_texture_float(ctx) && internalFormat == format) + break; + /* fallthrough */ default: return GL_INVALID_OPERATION; } |