OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added some missing error checks

Browse Source
This commit is contained in:
Brian Paul
2002-01-15 21:49:57 +00:00
parent 25c5f1b448
commit 858b694b64
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/mesa/main/drawpix.c
View File

@@ -1,10 +1,10 @@
/* $Id: drawpix.c,v 1.58 2001/12/14 02:55:08 brianp Exp $ */ /* $Id: drawpix.c,v 1.59 2002/01/15 21:49:57 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
* Version: 4.1 * Version: 4.1
* *
* Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -52,6 +52,11 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
if (width < 0 || height < 0) {
_mesa_error( ctx, GL_INVALID_VALUE, "glDrawPixels(width or height < 0" );
return;
}
if (ctx->RenderMode==GL_RENDER) { if (ctx->RenderMode==GL_RENDER) {
GLint x, y; GLint x, y;
if (!pixels || !ctx->Current.RasterPosValid) { if (!pixels || !ctx->Current.RasterPosValid) {
@@ -98,6 +103,11 @@ _mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
if (width < 0 || height < 0) {
_mesa_error( ctx, GL_INVALID_VALUE, "glReadPixels(width or height < 0)" );
return;
}
if (!pixels) { if (!pixels) {
_mesa_error( ctx, GL_INVALID_VALUE, "glReadPixels(pixels)" ); _mesa_error( ctx, GL_INVALID_VALUE, "glReadPixels(pixels)" );
return; return;
@@ -122,7 +132,7 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
if (width < 0 || height < 0) { if (width < 0 || height < 0) {
_mesa_error( ctx, GL_INVALID_VALUE, "glCopyPixels" ); _mesa_error( ctx, GL_INVALID_VALUE, "glCopyPixels(width or height < 0)" );
return; return;
} }
@@ -171,9 +181,8 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
/* Error checking */
if (width < 0 || height < 0) { if (width < 0 || height < 0) {
_mesa_error( ctx, GL_INVALID_VALUE, "glBitmap" ); _mesa_error( ctx, GL_INVALID_VALUE, "glBitmap(width or height < 0)" );
return; return;
} }

7
src/mesa/swrast/s_drawpix.c
View File

@@ -1,4 +1,4 @@
/* $Id: s_drawpix.c,v 1.24 2002/01/10 16:54:29 brianp Exp $ */ /* $Id: s_drawpix.c,v 1.25 2002/01/15 21:49:58 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -560,6 +560,11 @@ draw_stencil_pixels( GLcontext *ctx, GLint x, GLint y,
return; return;
} }
if (ctx->Visual.stencilBits == 0) {
_mesa_error( ctx, GL_INVALID_OPERATION, "glDrawPixels(no stencil buffer)");
return;
}
drawWidth = (width > MAX_WIDTH) ? MAX_WIDTH : width; drawWidth = (width > MAX_WIDTH) ? MAX_WIDTH : width;
for (row = 0; row < height; row++, y++) { for (row = 0; row < height; row++, y++) {