Mesa (master): mesa: Make CompressedTexSubImage errors more consistent
Chris Forbes
chrisf at kemper.freedesktop.org
Mon Jun 9 07:46:38 UTC 2014
Module: Mesa
Branch: master
Commit: 8f63559c931265c1d4e244551a3fed9c5ebd07c8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8f63559c931265c1d4e244551a3fed9c5ebd07c8
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Wed May 21 20:03:50 2014 +1200
mesa: Make CompressedTexSubImage errors more consistent
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
src/mesa/main/teximage.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 845ba80..5058b39 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -3844,7 +3844,7 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dims,
}
if (!targetOK) {
- _mesa_error(ctx, GL_INVALID_ENUM, "glCompressedTexImage%uD(target)",
+ _mesa_error(ctx, GL_INVALID_ENUM, "glCompressedTexSubImage%uD(target)",
dims);
return GL_TRUE;
}
@@ -3857,14 +3857,14 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dims,
}
if (level < 0 || level >= _mesa_max_texture_levels(ctx, target)) {
- _mesa_error(ctx, GL_INVALID_VALUE, "glCompressedTexImage%uD(level=%d)",
+ _mesa_error(ctx, GL_INVALID_VALUE, "glCompressedTexSubImage%uD(level=%d)",
dims, level);
return GL_TRUE;
}
expectedSize = compressed_tex_size(width, height, depth, format);
if (expectedSize != imageSize) {
- _mesa_error(ctx, GL_INVALID_VALUE, "glCompressedTexImage%uD(size=%d)",
+ _mesa_error(ctx, GL_INVALID_VALUE, "glCompressedTexSubImage%uD(size=%d)",
dims, imageSize);
return GL_TRUE;
}
More information about the mesa-commit
mailing list