Mesa (master): mesa: simplify format check in compressed_subtexture_target_check()
Brian Paul
brianp at kemper.freedesktop.org
Fri Jul 24 02:21:43 UTC 2015
Module: Mesa
Branch: master
Commit: 81e2c256e921ad4f5c13bb0d95bbe0ad232ec37c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=81e2c256e921ad4f5c13bb0d95bbe0ad232ec37c
Author: Brian Paul <brianp at vmware.com>
Date: Wed Jul 22 07:32:36 2015 -0600
mesa: simplify format check in compressed_subtexture_target_check()
Lose the invalidformat local variable.
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
---
src/mesa/main/teximage.c | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index cd45113..4fe6ee4 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -4586,21 +4586,17 @@ compressed_subtexture_target_check(struct gl_context *ctx, GLenum target,
* are valid here, which they are not, but of course not mentioned by
* core spec.
*/
- if (targetOK && target != GL_TEXTURE_2D_ARRAY &&
- target != GL_TEXTURE_CUBE_MAP_ARRAY) {
- bool invalidformat;
+ if (target != GL_TEXTURE_2D_ARRAY && target != GL_TEXTURE_CUBE_MAP_ARRAY) {
switch (format) {
- /* These came from _mesa_is_compressed_format in glformats.c. */
- case GL_COMPRESSED_RGBA_BPTC_UNORM:
- case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM:
- case GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT:
- case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT:
- invalidformat = false;
- break;
- default:
- invalidformat = true;
- }
- if (invalidformat) {
+ /* These are the only 3D compression formats supported at this time */
+ case GL_COMPRESSED_RGBA_BPTC_UNORM:
+ case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM:
+ case GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT:
+ case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT:
+ /* valid format */
+ break;
+ default:
+ /* invalid format */
_mesa_error(ctx, GL_INVALID_OPERATION,
"%s(invalid target %s for format %s)", caller,
_mesa_enum_to_string(target),
More information about the mesa-commit
mailing list