AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor error message changes

Browse Source
This commit is contained in:
Brian Paul
2002-08-21 16:39:39 +00:00
parent 62166908a9
commit 2188d002df
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/drawpix.c
+3 -3
View File
@@ -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);
}
src/mesa/main/matrix.c
+7 -6
View File
@@ -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 (width < 0 || height < 0) {
_mesa_error( ctx, GL_INVALID_VALUE, "glViewport" );
return;
}
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(%d, %d, %d, %d)", x, y, width, height );
return;
}
/* clamp width, and height to implementation dependent range */
width = CLAMP( width, 1, MAX_WIDTH );
height = CLAMP( height, 1, MAX_HEIGHT );