summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2002-08-21 16:39:39 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2002-08-21 16:39:39 +0000
commit2188d002df22ac4495444fa7705af1963508f766 (patch)
treef5a4eb04d1540f88c442c9a7d1b0af17fa031e48
parent62166908a947602ba8909059794fb6b9fe6813b9 (diff)
minor error message changes
-rw-r--r--src/mesa/main/drawpix.c6
-rw-r--r--src/mesa/main/matrix.c11
2 files changed, 9 insertions, 8 deletions
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index edad15b3e7..663bef47e2 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -1,4 +1,4 @@
-/* $Id: drawpix.c,v 1.61 2002/06/15 02:38:15 brianp Exp $ */
+/* $Id: drawpix.c,v 1.62 2002/08/21 16:39:39 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -104,7 +104,8 @@ _mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
if (width < 0 || height < 0) {
- _mesa_error( ctx, GL_INVALID_VALUE, "glReadPixels(width or height < 0)" );
+ _mesa_error( ctx, GL_INVALID_VALUE,
+ "glReadPixels(width=%d height=%d)", width, height );
return;
}
@@ -118,7 +119,6 @@ _mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
ctx->Driver.ReadPixels(ctx, x, y, width, height,
format, type, &ctx->Pack, pixels);
-
}
diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c
index 27e4297d36..1ad72f11b6 100644
--- a/src/mesa/main/matrix.c
+++ b/src/mesa/main/matrix.c
@@ -1,4 +1,4 @@
-/* $Id: matrix.c,v 1.43 2002/06/23 02:52:18 brianp Exp $ */
+/* $Id: matrix.c,v 1.44 2002/08/21 16:39:39 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -407,14 +407,15 @@ _mesa_set_viewport( GLcontext *ctx, GLint x, GLint y,
const GLfloat n = ctx->Viewport.Near;
const GLfloat f = ctx->Viewport.Far;
+ if (MESA_VERBOSE & VERBOSE_API)
+ _mesa_debug(ctx, "glViewport %d %d %d %d\n", x, y, width, height);
+
if (width < 0 || height < 0) {
- _mesa_error( ctx, GL_INVALID_VALUE, "glViewport" );
+ _mesa_error( ctx, GL_INVALID_VALUE,
+ "glViewport(%d, %d, %d, %d)", x, y, width, height );
return;
}
- if (MESA_VERBOSE & VERBOSE_API)
- _mesa_debug(ctx, "glViewport %d %d %d %d\n", x, y, width, height);
-
/* clamp width, and height to implementation dependent range */
width = CLAMP( width, 1, MAX_WIDTH );
height = CLAMP( height, 1, MAX_HEIGHT );