Mesa (master): mesa: move/fix levels check for glTexStorage()
Brian Paul
brianp at kemper.freedesktop.org
Tue Sep 18 02:01:11 UTC 2012
Module: Mesa
Branch: master
Commit: 7dc76e94246a14d995d2e9a4c8dc8591c4085849
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7dc76e94246a14d995d2e9a4c8dc8591c4085849
Author: Brian Paul <brianp at vmware.com>
Date: Sat Sep 15 10:30:20 2012 -0600
mesa: move/fix levels check for glTexStorage()
Fix copy&paste error and move min levels check closer to max levels check.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
---
src/mesa/main/texstorage.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/mesa/main/texstorage.c b/src/mesa/main/texstorage.c
index 0a4cafe..ca02ef3 100644
--- a/src/mesa/main/texstorage.c
+++ b/src/mesa/main/texstorage.c
@@ -268,13 +268,6 @@ tex_storage_error_check(struct gl_context *ctx, GLuint dims, GLenum target,
return GL_TRUE;
}
- /* levels check */
- if (levels < 1 || height < 1 || depth < 1) {
- _mesa_error(ctx, GL_INVALID_VALUE, "glTexStorage%uD(levels < 1)",
- dims);
- return GL_TRUE;
- }
-
/* target check */
if (!legal_texobj_target(ctx, dims, target)) {
_mesa_error(ctx, GL_INVALID_ENUM,
@@ -283,7 +276,14 @@ tex_storage_error_check(struct gl_context *ctx, GLuint dims, GLenum target,
return GL_TRUE;
}
- /* check levels against maximum */
+ /* levels check */
+ if (levels < 1) {
+ _mesa_error(ctx, GL_INVALID_VALUE, "glTexStorage%uD(levels < 1)",
+ dims);
+ return GL_TRUE;
+ }
+
+ /* check levels against maximum (note different error than above) */
if (levels > _mesa_max_texture_levels(ctx, target)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glTexStorage%uD(levels too large)", dims);
More information about the mesa-commit
mailing list