diff options
| author | Gareth Hughes <[email protected]> | 2001-03-12 00:48:37 +0000 |
|---|---|---|
| committer | Gareth Hughes <[email protected]> | 2001-03-12 00:48:37 +0000 |
| commit | 22144ab7552f0799bcfca506bf4ffa7f70a06649 (patch) | |
| tree | e7986aa02e97d88071b0769dc8d5359860320614 /src/mesa/swrast/s_drawpix.c | |
| parent | 57ffddba9870a0e602ae454e13072a0af48fa150 (diff) | |
Consistent copyright info (version number, date) across all files.
Diffstat (limited to 'src/mesa/swrast/s_drawpix.c')
| -rw-r--r-- | src/mesa/swrast/s_drawpix.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index 1e03fa903e1..925d5dba6e0 100644 --- a/src/mesa/swrast/s_drawpix.c +++ b/src/mesa/swrast/s_drawpix.c @@ -1,21 +1,21 @@ -/* $Id: s_drawpix.c,v 1.13 2001/03/08 15:23:46 brianp Exp $ */ +/* $Id: s_drawpix.c,v 1.14 2001/03/12 00:48:41 gareth Exp $ */ /* * Mesa 3-D graphics library * Version: 3.5 - * + * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL @@ -411,7 +411,7 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y, ASSERT(drawWidth < MAX_WIDTH); _mesa_map_ci8_to_rgba(ctx, drawWidth, src, rgba); (*ctx->Driver.WriteRGBASpan)(ctx, drawWidth, destX, destY, - (const GLchan (*)[4]) rgba, + (const GLchan (*)[4]) rgba, NULL); src += rowLength; destY++; @@ -426,7 +426,7 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y, _mesa_map_ci8_to_rgba(ctx, drawWidth, src, rgba); destY--; (*ctx->Driver.WriteRGBASpan)(ctx, drawWidth, destX, destY, - (CONST GLchan (*)[4]) rgba, + (CONST GLchan (*)[4]) rgba, NULL); src += rowLength; } @@ -526,7 +526,7 @@ draw_index_pixels( GLcontext *ctx, GLint x, GLint y, * Do glDrawPixels of stencil image. The image datatype may either * be GLubyte or GLbitmap. */ -static void +static void draw_stencil_pixels( GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum type, const GLvoid *pixels ) @@ -855,10 +855,10 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y, * Execute glDrawPixels */ void -_swrast_DrawPixels( GLcontext *ctx, +_swrast_DrawPixels( GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height, - GLenum format, GLenum type, + GLenum format, GLenum type, const struct gl_pixelstore_attrib *unpack, const GLvoid *pixels ) { @@ -897,4 +897,3 @@ _swrast_DrawPixels( GLcontext *ctx, _mesa_error( ctx, GL_INVALID_ENUM, "glDrawPixels(format)" ); } } - |