summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-03-03 15:39:38 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-03-03 15:39:38 +0000
commit7709bd06f2b0244bd05054d2beeafd4c52ee360b (patch)
treefcd1db4c5f9f7f5444d045aabcc0f14100400247
parent4b3f54ecb1b9804abb178ed51491fdcc96b7e423 (diff)
better error messages (Leif Delgass)
-rw-r--r--src/mesa/main/dlist.c6
-rw-r--r--src/mesa/main/texstate.c12
2 files changed, 10 insertions, 8 deletions
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 2391d8dcdb..cf203b4d44 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -1,4 +1,4 @@
-/* $Id: dlist.c,v 1.100 2002/11/06 15:16:23 brianp Exp $ */
+/* $Id: dlist.c,v 1.100.2.1 2003/03/03 15:39:45 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -5081,7 +5081,7 @@ _mesa_CallList( GLuint list )
if (MESA_VERBOSE & VERBOSE_API)
- _mesa_debug(ctx, "_mesa_CallList %d\n", list);
+ _mesa_debug(ctx, "glCallList %d\n", list);
/* mesa_print_display_list( list ); */
@@ -5114,7 +5114,7 @@ _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists )
GLboolean save_compile_flag;
if (MESA_VERBOSE & VERBOSE_API)
- _mesa_debug(ctx, "_mesa_CallLists %d\n", n);
+ _mesa_debug(ctx, "glCallLists %d\n", n);
switch (type) {
case GL_BYTE:
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index f305ae70c7..b9d53a9a6e 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -1,4 +1,4 @@
-/* $Id: texstate.c,v 1.87.2.4 2003/02/28 16:28:22 brianp Exp $ */
+/* $Id: texstate.c,v 1.87.2.5 2003/03/03 15:39:38 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -1019,10 +1019,11 @@ _mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params )
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
- _mesa_debug(ctx, "texPARAM %s %s %d...\n",
+ _mesa_debug(ctx, "glTexParameter %s %s %.1f(%s)...\n",
_mesa_lookup_enum_by_nr(target),
_mesa_lookup_enum_by_nr(pname),
- eparam);
+ *params,
+ _mesa_lookup_enum_by_nr(eparam));
switch (target) {
@@ -1868,10 +1869,11 @@ _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
- _mesa_debug(ctx, "texGEN %s %s %x...\n",
+ _mesa_debug(ctx, "glTexGen %s %s %.1f(%s)...\n",
_mesa_lookup_enum_by_nr(coord),
_mesa_lookup_enum_by_nr(pname),
- *(int *)params);
+ *params,
+ _mesa_lookup_enum_by_nr((GLenum) (GLint) *params));
switch (coord) {
case GL_S: