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_blend.c | |
| parent | 57ffddba9870a0e602ae454e13072a0af48fa150 (diff) | |
Consistent copyright info (version number, date) across all files.
Diffstat (limited to 'src/mesa/swrast/s_blend.c')
| -rw-r--r-- | src/mesa/swrast/s_blend.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/mesa/swrast/s_blend.c b/src/mesa/swrast/s_blend.c index d22616e36b5..3e15ae5deb3 100644 --- a/src/mesa/swrast/s_blend.c +++ b/src/mesa/swrast/s_blend.c @@ -1,21 +1,21 @@ -/* $Id: s_blend.c,v 1.5 2001/03/08 15:23:46 brianp Exp $ */ +/* $Id: s_blend.c,v 1.6 2001/03/12 00:48:41 gareth Exp $ */ /* * Mesa 3-D graphics library * Version: 3.5 - * - * Copyright (C) 1999-2000 Brian Paul All Rights Reserved. - * + * + * 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 @@ -577,7 +577,7 @@ void _swrast_choose_blend_func( GLcontext *ctx ) SWRAST_CONTEXT(ctx)->BlendFunc = blend_general; } else if (eq==GL_FUNC_ADD_EXT && srcRGB==GL_SRC_ALPHA - && dstRGB==GL_ONE_MINUS_SRC_ALPHA) + && dstRGB==GL_ONE_MINUS_SRC_ALPHA) { #if defined(USE_MMX_ASM) if ( cpu_has_mmx ) { @@ -632,7 +632,7 @@ _mesa_blend_span( GLcontext *ctx, GLuint n, GLint x, GLint y, /* Read span of current frame buffer pixels */ _mesa_read_rgba_span( ctx, ctx->DrawBuffer, n, x, y, dest ); - SWRAST_CONTEXT(ctx)->BlendFunc( ctx, n, mask, rgba, + SWRAST_CONTEXT(ctx)->BlendFunc( ctx, n, mask, rgba, (const GLchan (*)[4]) dest ); } @@ -667,5 +667,3 @@ _mesa_blend_pixels( GLcontext *ctx, swrast->BlendFunc( ctx, n, mask, rgba, (const GLchan (*)[4])dest ); } - - |