summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2002-09-03 18:05:17 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2002-09-03 18:05:17 +0000
commitb9f75444e60477e7a523e7eec1bb49a8232fd4e7 (patch)
tree04d0d23cbc17d7da0b75a900013be3b1bdb69704
parentba88dd0d92e818df20752ca5a4b1cd5fb0c49f76 (diff)
improved error string
-rw-r--r--src/mesa/main/teximage.c7
-rw-r--r--src/mesa/tnl/t_imm_api.c4
2 files changed, 7 insertions, 4 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 95bed13d9d..e7df504fd7 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1,4 +1,4 @@
-/* $Id: teximage.c,v 1.111 2002/07/09 01:22:50 brianp Exp $ */
+/* $Id: teximage.c,v 1.112 2002/09/03 18:05:17 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -1212,7 +1212,8 @@ copytexsubimage_error_check( GLcontext *ctx, GLuint dimensions,
teximage = _mesa_select_tex_image(ctx, texUnit, target, level);
if (!teximage) {
_mesa_error(ctx, GL_INVALID_OPERATION,
- "glCopyTexSubImage%dD(undefined texture)", dimensions);
+ "glCopyTexSubImage%dD(undefined texture level: %d)",
+ dimensions, level);
return GL_TRUE;
}
@@ -1537,6 +1538,8 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+ internalFormat = GL_RGBA;
+
if (is_color_format(internalFormat)) {
_mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth,
&postConvHeight);
diff --git a/src/mesa/tnl/t_imm_api.c b/src/mesa/tnl/t_imm_api.c
index 7631e0cbb8..f5a977b600 100644
--- a/src/mesa/tnl/t_imm_api.c
+++ b/src/mesa/tnl/t_imm_api.c
@@ -1,4 +1,4 @@
-/* $Id: t_imm_api.c,v 1.30 2002/06/16 01:09:16 brianp Exp $ */
+/* $Id: t_imm_api.c,v 1.31 2002/09/03 18:05:52 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -182,7 +182,7 @@ _tnl_Begin( GLenum mode )
ASSERT (!ctx->CompileFlag);
if (mode > GL_POLYGON) {
- _mesa_error( ctx, GL_INVALID_ENUM, "_tnl_Begin" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "_tnl_Begin(0x%x)", mode );
return;
}