diff options
Diffstat (limited to 'src/mesa/swrast')
51 files changed, 330 insertions, 352 deletions
diff --git a/src/mesa/swrast/s_aaline.c b/src/mesa/swrast/s_aaline.c index cfaea45053b..f0a8a8d06a7 100644 --- a/src/mesa/swrast/s_aaline.c +++ b/src/mesa/swrast/s_aaline.c @@ -1,4 +1,4 @@ -/* $Id: s_aaline.c,v 1.5 2001/03/07 05:06:12 brianp Exp $ */ +/* $Id: s_aaline.c,v 1.6 2001/03/12 00:48:41 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -506,4 +506,3 @@ _swrast_choose_aa_line_function(GLcontext *ctx) swrast->Line = aa_ci_line; } } - diff --git a/src/mesa/swrast/s_aaline.h b/src/mesa/swrast/s_aaline.h index 1fdd1c0e0de..c470bfecbfa 100644 --- a/src/mesa/swrast/s_aaline.h +++ b/src/mesa/swrast/s_aaline.h @@ -1,10 +1,10 @@ -/* $Id: s_aaline.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */ +/* $Id: s_aaline.h,v 1.3 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"), diff --git a/src/mesa/swrast/s_aalinetemp.h b/src/mesa/swrast/s_aalinetemp.h index 91d588eee0a..9ab1abb292e 100644 --- a/src/mesa/swrast/s_aalinetemp.h +++ b/src/mesa/swrast/s_aalinetemp.h @@ -1,21 +1,21 @@ -/* $Id: s_aalinetemp.h,v 1.6 2001/03/07 05:06:12 brianp Exp $ */ +/* $Id: s_aalinetemp.h,v 1.7 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 diff --git a/src/mesa/swrast/s_aatriangle.c b/src/mesa/swrast/s_aatriangle.c index 423318d0934..1de030c776c 100644 --- a/src/mesa/swrast/s_aatriangle.c +++ b/src/mesa/swrast/s_aatriangle.c @@ -1,21 +1,21 @@ -/* $Id: s_aatriangle.c,v 1.8 2001/03/07 05:06:12 brianp Exp $ */ +/* $Id: s_aatriangle.c,v 1.9 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 diff --git a/src/mesa/swrast/s_aatriangle.h b/src/mesa/swrast/s_aatriangle.h index 68d393002e8..0e25414e65d 100644 --- a/src/mesa/swrast/s_aatriangle.h +++ b/src/mesa/swrast/s_aatriangle.h @@ -1,10 +1,10 @@ -/* $Id: s_aatriangle.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */ +/* $Id: s_aatriangle.h,v 1.3 2001/03/12 00:48:41 gareth Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 + * 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"), diff --git a/src/mesa/swrast/s_aatritemp.h b/src/mesa/swrast/s_aatritemp.h index 26e1352c99b..5eb2455af65 100644 --- a/src/mesa/swrast/s_aatritemp.h +++ b/src/mesa/swrast/s_aatritemp.h @@ -1,21 +1,21 @@ -/* $Id: s_aatritemp.h,v 1.7 2001/03/07 05:06:12 brianp Exp $ */ +/* $Id: s_aatritemp.h,v 1.8 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 @@ -137,10 +137,10 @@ /* plane setup */ #ifdef DO_Z compute_plane(p0, p1, p2, p0[2], p1[2], p2[2], zPlane); - compute_plane(p0, p1, p2, - v0->fog, - v1->fog, - v2->fog, + compute_plane(p0, p1, p2, + v0->fog, + v1->fog, + v2->fog, fogPlane); #endif #ifdef DO_RGBA @@ -470,16 +470,16 @@ (const GLchan (*)[4]) (spec + left), GL_POLYGON); # else - _mesa_write_texture_span(ctx, n, left, iy, z + left, fog + left, + _mesa_write_texture_span(ctx, n, left, iy, z + left, fog + left, s + left, t + left, u + left, lambda + left, rgba + left, NULL, GL_POLYGON); # endif #elif defined(DO_RGBA) - _mesa_write_rgba_span(ctx, n, left, iy, z + left, fog + left, + _mesa_write_rgba_span(ctx, n, left, iy, z + left, fog + left, rgba + left, GL_POLYGON); #elif defined(DO_INDEX) - _mesa_write_index_span(ctx, n, left, iy, z + left, fog + left, + _mesa_write_index_span(ctx, n, left, iy, z + left, fog + left, index + left, GL_POLYGON); #endif } diff --git a/src/mesa/swrast/s_accum.c b/src/mesa/swrast/s_accum.c index 0c1fdbe929f..240992066e7 100644 --- a/src/mesa/swrast/s_accum.c +++ b/src/mesa/swrast/s_accum.c @@ -1,21 +1,21 @@ -/* $Id: s_accum.c,v 1.7 2001/03/08 15:23:46 brianp Exp $ */ +/* $Id: s_accum.c,v 1.8 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 @@ -236,7 +236,7 @@ _mesa_clear_accum_buffer( GLcontext *ctx ) void _swrast_Accum( GLcontext *ctx, GLenum op, GLfloat value, - GLint xpos, GLint ypos, + GLint xpos, GLint ypos, GLint width, GLint height ) { @@ -247,13 +247,13 @@ _swrast_Accum( GLcontext *ctx, GLenum op, GLfloat value, const GLuint colorMask = *((GLuint *) &ctx->Color.ColorMask); const GLint iChanMax = (1 << (sizeof(GLchan) * 8)) - 1; const GLfloat fChanMax = (1 << (sizeof(GLchan) * 8)) - 1; - + if (SWRAST_CONTEXT(ctx)->NewState) _swrast_validate_derived( ctx ); if (!ctx->DrawBuffer->Accum) { - _mesa_warning(ctx, + _mesa_warning(ctx, "Calling glAccum() without an accumulation " "buffer (low memory?)"); return; @@ -320,7 +320,7 @@ _swrast_Accum( GLcontext *ctx, GLenum op, GLfloat value, swrast->_IntegerAccumScaler = value; if (swrast->_IntegerAccumMode && value != swrast->_IntegerAccumScaler) rescale_accum(ctx); - + RENDER_START(ctx); if (swrast->_IntegerAccumMode) { @@ -330,7 +330,7 @@ _swrast_Accum( GLcontext *ctx, GLenum op, GLfloat value, assert(swrast->_IntegerAccumScaler > 0.0); assert(swrast->_IntegerAccumScaler <= 1.0); for (j = 0; j < height; j++) { - + GLint i, i4; _mesa_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba); for (i = i4 = 0; i < width; i++, i4+=4) { @@ -471,7 +471,7 @@ _swrast_Accum( GLcontext *ctx, GLenum op, GLfloat value, if (colorMask != 0xffffffff) { _mesa_mask_rgba_span( ctx, width, xpos, ypos, rgba ); } - (*ctx->Driver.WriteRGBASpan)( ctx, width, xpos, ypos, + (*ctx->Driver.WriteRGBASpan)( ctx, width, xpos, ypos, (const GLchan (*)[4])rgba, NULL ); if (ctx->DrawBuffer->UseSoftwareAlphaBuffers && ctx->Color.ColorMask[ACOMP]) { @@ -503,7 +503,7 @@ _swrast_Accum( GLcontext *ctx, GLenum op, GLfloat value, if (colorMask != 0xffffffff) { _mesa_mask_rgba_span( ctx, width, xpos, ypos, rgba ); } - (*ctx->Driver.WriteRGBASpan)( ctx, width, xpos, ypos, + (*ctx->Driver.WriteRGBASpan)( ctx, width, xpos, ypos, (const GLchan (*)[4])rgba, NULL ); if (ctx->DrawBuffer->UseSoftwareAlphaBuffers && ctx->Color.ColorMask[ACOMP]) { diff --git a/src/mesa/swrast/s_accum.h b/src/mesa/swrast/s_accum.h index b7680e56cff..014ca98b94b 100644 --- a/src/mesa/swrast/s_accum.h +++ b/src/mesa/swrast/s_accum.h @@ -1,10 +1,10 @@ -/* $Id: s_accum.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */ +/* $Id: s_accum.h,v 1.3 2001/03/12 00:48:41 gareth Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.1 + * Version: 3.5 * - * Copyright (C) 1999 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"), diff --git a/src/mesa/swrast/s_alpha.c b/src/mesa/swrast/s_alpha.c index e6bd0c32489..c0d76fd9e1d 100644 --- a/src/mesa/swrast/s_alpha.c +++ b/src/mesa/swrast/s_alpha.c @@ -1,21 +1,21 @@ -/* $Id: s_alpha.c,v 1.3 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: s_alpha.c,v 1.4 2001/03/12 00:48:41 gareth Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 - * - * Copyright (C) 1999-2000 Brian Paul All Rights Reserved. - * + * 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 @@ -60,7 +60,7 @@ _mesa_alpha_test( const GLcontext *ctx, } return 1; case GL_LEQUAL: - for (i=0;i<n;i++) + for (i=0;i<n;i++) mask[i] &= (rgba[i][ACOMP] <= ref); return 1; case GL_GEQUAL: diff --git a/src/mesa/swrast/s_alpha.h b/src/mesa/swrast/s_alpha.h index 95d1788c878..5338df58ae0 100644 --- a/src/mesa/swrast/s_alpha.h +++ b/src/mesa/swrast/s_alpha.h @@ -1,10 +1,10 @@ -/* $Id: s_alpha.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */ +/* $Id: s_alpha.h,v 1.3 2001/03/12 00:48:41 gareth Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 + * 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"), diff --git a/src/mesa/swrast/s_alphabuf.c b/src/mesa/swrast/s_alphabuf.c index 5fbb6a36095..9d88c609209 100644 --- a/src/mesa/swrast/s_alphabuf.c +++ b/src/mesa/swrast/s_alphabuf.c @@ -1,21 +1,21 @@ -/* $Id: s_alphabuf.c,v 1.5 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: s_alphabuf.c,v 1.6 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 @@ -53,7 +53,7 @@ * Input: ctx - the context * */ -static void +static void alloc_alpha_buffers( GLcontext *ctx, GLframebuffer *buf ) { GLint bytes = buf->Width * buf->Height * sizeof(GLchan); @@ -309,6 +309,3 @@ _mesa_read_alpha_pixels( GLcontext *ctx, } } } - - - diff --git a/src/mesa/swrast/s_alphabuf.h b/src/mesa/swrast/s_alphabuf.h index c7208cf4d8e..889a6c94e6b 100644 --- a/src/mesa/swrast/s_alphabuf.h +++ b/src/mesa/swrast/s_alphabuf.h @@ -1,10 +1,10 @@ -/* $Id: s_alphabuf.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */ +/* $Id: s_alphabuf.h,v 1.3 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"), @@ -79,4 +79,3 @@ _mesa_read_alpha_pixels( GLcontext* ctx, #endif - diff --git a/src/mesa/swrast/s_bitmap.c b/src/mesa/swrast/s_bitmap.c index 3a77004520c..243219b75c4 100644 --- a/src/mesa/swrast/s_bitmap.c +++ b/src/mesa/swrast/s_bitmap.c @@ -1,21 +1,21 @@ -/* $Id: s_bitmap.c,v 1.5 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: s_bitmap.c,v 1.6 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 @@ -39,7 +39,7 @@ /* * Render a bitmap. */ -void +void _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py, GLsizei width, GLsizei height, const struct gl_pixelstore_attrib *unpack, @@ -70,7 +70,7 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py, } fragZ = (GLdepth) ( ctx->Current.RasterPos[2] * ctx->DepthMaxF); - + _mesa_win_fog_coords_from_z( ctx, 1, &fragZ, &fogCoord ); for (row=0; row<height; row++) { @@ -125,6 +125,3 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py, _mesa_flush_pb(ctx); } - - - 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 ); } - - diff --git a/src/mesa/swrast/s_blend.h b/src/mesa/swrast/s_blend.h index 58407a1c5d1..14488060685 100644 --- a/src/mesa/swrast/s_blend.h +++ b/src/mesa/swrast/s_blend.h @@ -1,10 +1,10 @@ -/* $Id: s_blend.h,v 1.3 2000/11/22 07:32:18 joukj Exp $ */ +/* $Id: s_blend.h,v 1.4 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"), diff --git a/src/mesa/swrast/s_buffers.c b/src/mesa/swrast/s_buffers.c index 9dc01e89919..003e4695592 100644 --- a/src/mesa/swrast/s_buffers.c +++ b/src/mesa/swrast/s_buffers.c @@ -1,21 +1,21 @@ -/* $Id: s_buffers.c,v 1.6 2001/03/07 05:06:12 brianp Exp $ */ +/* $Id: s_buffers.c,v 1.7 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 @@ -180,7 +180,7 @@ clear_color_buffers(GLcontext *ctx) (void) (*ctx->Driver.SetDrawBuffer)( ctx, GL_BACK_RIGHT); (void) (*ctx->Driver.SetReadBuffer)( ctx, ctx->DrawBuffer, GL_BACK_RIGHT); } - + if (colorMask != 0xffffffff) { clear_color_buffer_with_masking(ctx); } @@ -197,9 +197,9 @@ clear_color_buffers(GLcontext *ctx) -void +void _swrast_Clear( GLcontext *ctx, GLbitfield mask, - GLboolean all, + GLboolean all, GLint x, GLint y, GLint width, GLint height ) { @@ -254,5 +254,3 @@ _swrast_alloc_buffers( GLcontext *ctx ) _mesa_alloc_alpha_buffers( ctx ); } } - - diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index a681ac6d119..ffcdc718c2c 100644 --- a/src/mesa/swrast/s_context.c +++ b/src/mesa/swrast/s_context.c @@ -1,10 +1,10 @@ -/* $Id: s_context.c,v 1.16 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: s_context.c,v 1.17 2001/03/12 00:48:41 gareth Exp $ */ /* * Mesa 3-D graphics library * Version: 3.5 * - * Copyright (C) 1999 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"), @@ -201,7 +201,7 @@ _swrast_validate_triangle( GLcontext *ctx, _swrast_validate_derived( ctx ); swrast->choose_triangle( ctx ); - if ((ctx->_TriangleCaps & DD_SEPERATE_SPECULAR) && + if ((ctx->_TriangleCaps & DD_SEPERATE_SPECULAR) && !ctx->Texture._ReallyEnabled) { swrast->SpecTriangle = swrast->Triangle; swrast->Triangle = _swrast_add_spec_terms_triangle; @@ -218,7 +218,7 @@ _swrast_validate_line( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1 ) _swrast_validate_derived( ctx ); swrast->choose_line( ctx ); - if ((ctx->_TriangleCaps & DD_SEPERATE_SPECULAR) && + if ((ctx->_TriangleCaps & DD_SEPERATE_SPECULAR) && !ctx->Texture._ReallyEnabled) { swrast->SpecLine = swrast->Line; swrast->Line = _swrast_add_spec_terms_line; @@ -236,7 +236,7 @@ _swrast_validate_point( GLcontext *ctx, const SWvertex *v0 ) _swrast_validate_derived( ctx ); swrast->choose_point( ctx ); - if ((ctx->_TriangleCaps & DD_SEPERATE_SPECULAR) && + if ((ctx->_TriangleCaps & DD_SEPERATE_SPECULAR) && !ctx->Texture._ReallyEnabled) { swrast->SpecPoint = swrast->Point; swrast->Point = _swrast_add_spec_terms_point; @@ -476,15 +476,15 @@ _swrast_print_vertex( GLcontext *ctx, const SWvertex *v ) { GLuint i; - fprintf(stderr, "win %f %f %f %f\n", + fprintf(stderr, "win %f %f %f %f\n", v->win[0], v->win[1], v->win[2], v->win[3]); for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++) fprintf(stderr, "texcoord[%d] %f %f %f %f\n", i, - v->texcoord[i][0], v->texcoord[i][1], + v->texcoord[i][0], v->texcoord[i][1], v->texcoord[i][2], v->texcoord[i][3]); - fprintf(stderr, "color %d %d %d %d\n", + fprintf(stderr, "color %d %d %d %d\n", v->color[0], v->color[1], v->color[2], v->color[3]); fprintf(stderr, "spec %d %d %d %d\n", v->specular[0], v->specular[1], v->specular[2], v->specular[3]); diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h index 63596083bcc..7449cb28963 100644 --- a/src/mesa/swrast/s_context.h +++ b/src/mesa/swrast/s_context.h @@ -1,4 +1,4 @@ -/* $Id: s_context.h,v 1.6 2001/03/07 04:50:49 brianp Exp $ */ +/* $Id: s_context.h,v 1.7 2001/03/12 00:48:41 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -149,7 +149,7 @@ typedef struct swrast_tri_func Triangle; /* Placeholders for when seperate specular (or secondary color) is - * enabled but texturing is not. + * enabled but texturing is not. */ swrast_point_func SpecPoint; swrast_line_func SpecLine; diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c index 7af64ff0453..1a8c0a069c2 100644 --- a/src/mesa/swrast/s_copypix.c +++ b/src/mesa/swrast/s_copypix.c @@ -1,21 +1,21 @@ -/* $Id: s_copypix.c,v 1.14 2001/03/07 05:06:12 brianp Exp $ */ +/* $Id: s_copypix.c,v 1.15 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 @@ -277,11 +277,11 @@ copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy, dy = desty + row; if (quick_draw && dy >= 0 && dy < ctx->DrawBuffer->Height) { - (*ctx->Driver.WriteRGBASpan)( ctx, width, destx, dy, + (*ctx->Driver.WriteRGBASpan)( ctx, width, destx, dy, (const GLchan (*)[4])rgba, NULL ); } else if (zoom) { - _mesa_write_zoomed_rgba_span( ctx, width, destx, dy, zspan, 0, + _mesa_write_zoomed_rgba_span( ctx, width, destx, dy, zspan, 0, (const GLchan (*)[4])rgba, desty); } else { @@ -521,7 +521,7 @@ copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy, } if (quick_draw && dy >= 0 && dy < ctx->DrawBuffer->Height) { - (*ctx->Driver.WriteRGBASpan)( ctx, width, destx, dy, + (*ctx->Driver.WriteRGBASpan)( ctx, width, destx, dy, (const GLchan (*)[4])rgba, NULL ); } else if (zoom) { @@ -747,7 +747,7 @@ static void copy_depth_pixels( GLcontext *ctx, GLint srcx, GLint srcy, (const GLchan (*)[4])rgba, desty ); } else { - _mesa_write_rgba_span( ctx, width, destx, dy, zspan, 0, + _mesa_write_rgba_span( ctx, width, destx, dy, zspan, 0, rgba, GL_BITMAP); } } diff --git a/src/mesa/swrast/s_depth.c b/src/mesa/swrast/s_depth.c index b051cdc4891..19101a24c48 100644 --- a/src/mesa/swrast/s_depth.c +++ b/src/mesa/swrast/s_depth.c @@ -1,21 +1,21 @@ -/* $Id: s_depth.c,v 1.7 2001/03/07 05:06:12 brianp Exp $ */ +/* $Id: s_depth.c,v 1.8 2001/03/12 00:48:41 gareth Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 - * - * Copyright (C) 1999-2000 Brian Paul All Rights Reserved. - * + * 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 diff --git a/src/mesa/swrast/s_depth.h b/src/mesa/swrast/s_depth.h index e44b98eee5e..4d53de350f1 100644 --- a/src/mesa/swrast/s_depth.h +++ b/src/mesa/swrast/s_depth.h @@ -1,10 +1,10 @@ -/* $Id: s_depth.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */ +/* $Id: s_depth.h,v 1.3 2001/03/12 00:48:41 gareth Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 + * 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"), 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)" ); } } - diff --git a/src/mesa/swrast/s_drawpix.h b/src/mesa/swrast/s_drawpix.h index 7debca81dac..a792ef8dd44 100644 --- a/src/mesa/swrast/s_drawpix.h +++ b/src/mesa/swrast/s_drawpix.h @@ -1,10 +1,10 @@ -/* $Id: s_drawpix.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */ +/* $Id: s_drawpix.h,v 1.3 2001/03/12 00:48:42 gareth Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 + * Version: 3.5 * - * Copyright (C) 1999 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"), diff --git a/src/mesa/swrast/s_feedback.c b/src/mesa/swrast/s_feedback.c index 2bb9f301e80..c86dc4f6d5f 100644 --- a/src/mesa/swrast/s_feedback.c +++ b/src/mesa/swrast/s_feedback.c @@ -1,21 +1,21 @@ -/* $Id: s_feedback.c,v 1.6 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: s_feedback.c,v 1.7 2001/03/12 00:48:42 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 @@ -94,7 +94,7 @@ void _mesa_feedback_triangle( GLcontext *ctx, if (_mesa_cull_triangle( ctx, v0, v1, v2 )) { FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) GL_POLYGON_TOKEN ); FEEDBACK_TOKEN( ctx, (GLfloat) 3 ); /* three vertices */ - + if (ctx->Light.ShadeModel == GL_SMOOTH) { feedback_vertex( ctx, v0, v0 ); feedback_vertex( ctx, v1, v1 ); @@ -113,7 +113,7 @@ void _mesa_feedback_line( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1 GLenum token = GL_LINE_TOKEN; SWcontext *swrast = SWRAST_CONTEXT(ctx); - if (swrast->StippleCounter==0) + if (swrast->StippleCounter==0) token = GL_LINE_RESET_TOKEN; FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) token ); @@ -165,6 +165,3 @@ void _mesa_select_point( GLcontext *ctx, const SWvertex *v ) const GLfloat zs = 1.0F / ctx->DepthMaxF; _mesa_update_hitflag( ctx, v->win[2] * zs ); } - - - diff --git a/src/mesa/swrast/s_feedback.h b/src/mesa/swrast/s_feedback.h index bd84f0dc8ab..9acae42db63 100644 --- a/src/mesa/swrast/s_feedback.h +++ b/src/mesa/swrast/s_feedback.h @@ -1,10 +1,10 @@ -/* $Id: s_feedback.h,v 1.4 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: s_feedback.h,v 1.5 2001/03/12 00:48:42 gareth Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 + * Version: 3.5 * - * Copyright (C) 1999 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"), @@ -50,4 +50,3 @@ extern void _mesa_select_triangle( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1, const SWvertex *v2 ); #endif - diff --git a/src/mesa/swrast/s_fog.c b/src/mesa/swrast/s_fog.c index debca659e43..cc55913f37d 100644 --- a/src/mesa/swrast/s_fog.c +++ b/src/mesa/swrast/s_fog.c @@ -1,21 +1,21 @@ -/* $Id: s_fog.c,v 1.10 2001/03/07 05:06:12 brianp Exp $ */ +/* $Id: s_fog.c,v 1.11 2001/03/12 00:48:42 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 @@ -45,8 +45,8 @@ */ void _mesa_fog_rgba_pixels( const GLcontext *ctx, - GLuint n, - const GLfixed fog[], + GLuint n, + const GLfixed fog[], GLchan rgba[][4] ) { GLuint i; @@ -101,18 +101,18 @@ _mesa_fog_ci_pixels( const GLcontext *ctx, /* - * Calculate fog coords from window z values + * Calculate fog coords from window z values * Input: n - number of pixels * z - array of integer depth values * red, green, blue, alpha - pixel colors * Output: red, green, blue, alpha - fogged pixel colors * - * Use lookup table & interpolation? + * Use lookup table & interpolation? */ void _mesa_win_fog_coords_from_z( const GLcontext *ctx, - GLuint n, - const GLdepth z[], + GLuint n, + const GLdepth z[], GLfixed fogcoord[] ) { const GLboolean ortho = (ctx->ProjectionMatrix.m[15] != 0.0F); @@ -274,4 +274,3 @@ _mesa_depth_fog_ci_pixels( const GLcontext *ctx, _mesa_win_fog_coords_from_z( ctx, n, z, fog ); _mesa_fog_ci_pixels( ctx, n, fog, index ); } - diff --git a/src/mesa/swrast/s_fog.h b/src/mesa/swrast/s_fog.h index 864ad7af968..9c487e13d11 100644 --- a/src/mesa/swrast/s_fog.h +++ b/src/mesa/swrast/s_fog.h @@ -1,10 +1,10 @@ -/* $Id: s_fog.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */ +/* $Id: s_fog.h,v 1.3 2001/03/12 00:48:42 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"), diff --git a/src/mesa/swrast/s_lines.c b/src/mesa/swrast/s_lines.c index 9e856d41534..48d04115cc2 100644 --- a/src/mesa/swrast/s_lines.c +++ b/src/mesa/swrast/s_lines.c @@ -1,21 +1,21 @@ -/* $Id: s_lines.c,v 1.13 2001/03/08 17:33:33 brianp Exp $ */ +/* $Id: s_lines.c,v 1.14 2001/03/12 00:48:42 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 @@ -933,7 +933,7 @@ static void flat_multitextured_line( GLcontext *ctx, } -void _swrast_add_spec_terms_line( GLcontext *ctx, +void _swrast_add_spec_terms_line( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1 ) { diff --git a/src/mesa/swrast/s_lines.h b/src/mesa/swrast/s_lines.h index 110f536c488..99a60d9b063 100644 --- a/src/mesa/swrast/s_lines.h +++ b/src/mesa/swrast/s_lines.h @@ -1,10 +1,10 @@ -/* $Id: s_lines.h,v 1.4 2001/02/16 18:14:41 keithw Exp $ */ +/* $Id: s_lines.h,v 1.5 2001/03/12 00:48:42 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"), @@ -33,8 +33,8 @@ void _swrast_choose_line( GLcontext *ctx ); -void -_swrast_add_spec_terms_line( GLcontext *ctx, +void +_swrast_add_spec_terms_line( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1 ); diff --git a/src/mesa/swrast/s_linetemp.h b/src/mesa/swrast/s_linetemp.h index dd7d33f8cde..5792b46a4a9 100644 --- a/src/mesa/swrast/s_linetemp.h +++ b/src/mesa/swrast/s_linetemp.h @@ -1,21 +1,21 @@ -/* $Id: s_linetemp.h,v 1.6 2001/03/08 17:33:33 brianp Exp $ */ +/* $Id: s_linetemp.h,v 1.7 2001/03/12 00:48:42 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 @@ -58,7 +58,7 @@ * * To enable line stippling define STIPPLE = 1 * To enable wide lines define WIDE = 1 - * + * * To actually "plot" each pixel either the PLOT macro or * (XMAJOR_PLOT and YMAJOR_PLOT macros) must be defined... * PLOT(X,Y) - code to plot a pixel. Example: @@ -96,7 +96,7 @@ #endif #ifdef INTERP_FOG GLfixed fog0 = FloatToFixed(vert0->fog); - GLfixed dfog = FloatToFixed(vert1->fog) - fog0; + GLfixed dfog = FloatToFixed(vert1->fog) - fog0; #endif #ifdef INTERP_RGB GLfixed r0 = IntToFixed(vert0->color[0]); diff --git a/src/mesa/swrast/s_logic.c b/src/mesa/swrast/s_logic.c index c16a4b63a9f..399a8e8a762 100644 --- a/src/mesa/swrast/s_logic.c +++ b/src/mesa/swrast/s_logic.c @@ -1,21 +1,21 @@ -/* $Id: s_logic.c,v 1.4 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: s_logic.c,v 1.5 2001/03/12 00:48:42 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 diff --git a/src/mesa/swrast/s_logic.h b/src/mesa/swrast/s_logic.h index b6a339a0adb..76cd7f8fa9f 100644 --- a/src/mesa/swrast/s_logic.h +++ b/src/mesa/swrast/s_logic.h @@ -1,10 +1,10 @@ -/* $Id: s_logic.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */ +/* $Id: s_logic.h,v 1.3 2001/03/12 00:48:42 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"), diff --git a/src/mesa/swrast/s_masking.c b/src/mesa/swrast/s_masking.c index a2d763067d6..7cacd1de389 100644 --- a/src/mesa/swrast/s_masking.c +++ b/src/mesa/swrast/s_masking.c @@ -1,21 +1,21 @@ -/* $Id: s_masking.c,v 1.3 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: s_masking.c,v 1.4 2001/03/12 00:48:42 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 @@ -178,4 +178,3 @@ _mesa_mask_index_pixels( GLcontext *ctx, index[i] = (index[i] & msrc) | (fbindexes[i] & mdest); } } - diff --git a/src/mesa/swrast/s_masking.h b/src/mesa/swrast/s_masking.h index dcd35c27e59..4f324aa60a4 100644 --- a/src/mesa/swrast/s_masking.h +++ b/src/mesa/swrast/s_masking.h @@ -1,10 +1,10 @@ -/* $Id: s_masking.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */ +/* $Id: s_masking.h,v 1.3 2001/03/12 00:48:42 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"), @@ -73,4 +73,3 @@ _mesa_mask_index_pixels( GLcontext *ctx, #endif - diff --git a/src/mesa/swrast/s_pixeltex.c b/src/mesa/swrast/s_pixeltex.c index a9cf425ffbd..6f83779e2a8 100644 --- a/src/mesa/swrast/s_pixeltex.c +++ b/src/mesa/swrast/s_pixeltex.c @@ -1,21 +1,21 @@ -/* $Id: s_pixeltex.c,v 1.2 2000/11/05 18:24:40 keithw Exp $ */ +/* $Id: s_pixeltex.c,v 1.3 2001/03/12 00:48:42 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 diff --git a/src/mesa/swrast/s_pixeltex.h b/src/mesa/swrast/s_pixeltex.h index a677c173012..6a53f5b6b41 100644 --- a/src/mesa/swrast/s_pixeltex.h +++ b/src/mesa/swrast/s_pixeltex.h @@ -1,10 +1,10 @@ -/* $Id: s_pixeltex.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */ +/* $Id: s_pixeltex.h,v 1.3 2001/03/12 00:48:42 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"), @@ -13,7 +13,7 @@ * 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 noti_mesa_PixelTexGenParameterfvce and this permission notice shall be included + * 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 diff --git a/src/mesa/swrast/s_points.c b/src/mesa/swrast/s_points.c index 70ff376df88..0c3b4d0f084 100644 --- a/src/mesa/swrast/s_points.c +++ b/src/mesa/swrast/s_points.c @@ -1,21 +1,21 @@ -/* $Id: s_points.c,v 1.14 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: s_points.c,v 1.15 2001/03/12 00:48:42 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 @@ -159,7 +159,7 @@ -void _swrast_add_spec_terms_point( GLcontext *ctx, +void _swrast_add_spec_terms_point( GLcontext *ctx, const SWvertex *v0 ) { SWvertex *ncv0 = (SWvertex *)v0; @@ -195,7 +195,7 @@ do { \ * Examine the current context to determine which point drawing function * should be used. */ -void +void _swrast_choose_point( GLcontext *ctx ) { SWcontext *swrast = SWRAST_CONTEXT(ctx); @@ -276,4 +276,3 @@ _swrast_choose_point( GLcontext *ctx ) USE(_mesa_select_point); } } - diff --git a/src/mesa/swrast/s_points.h b/src/mesa/swrast/s_points.h index 1dd78cb8645..f52b32b76e5 100644 --- a/src/mesa/swrast/s_points.h +++ b/src/mesa/swrast/s_points.h @@ -1,10 +1,10 @@ -/* $Id: s_points.h,v 1.4 2001/02/16 18:14:41 keithw Exp $ */ +/* $Id: s_points.h,v 1.5 2001/03/12 00:48:42 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"), @@ -33,8 +33,8 @@ void _swrast_choose_point( GLcontext *ctx ); -void -_swrast_add_spec_terms_point( GLcontext *ctx, +void +_swrast_add_spec_terms_point( GLcontext *ctx, const SWvertex *v0 ); #endif diff --git a/src/mesa/swrast/s_pointtemp.h b/src/mesa/swrast/s_pointtemp.h index 60d7f45f140..f33be6d6655 100644 --- a/src/mesa/swrast/s_pointtemp.h +++ b/src/mesa/swrast/s_pointtemp.h @@ -1,21 +1,21 @@ -/* $Id: s_pointtemp.h,v 1.4 2001/03/07 05:06:12 brianp Exp $ */ +/* $Id: s_pointtemp.h,v 1.5 2001/03/12 00:48:42 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 @@ -96,7 +96,7 @@ NAME ( GLcontext *ctx, const SWvertex *vert ) texcoord[u][0] = vert->texcoord[u][0] / vert->texcoord[u][3]; texcoord[u][1] = vert->texcoord[u][1] / vert->texcoord[u][3]; texcoord[u][2] = vert->texcoord[u][2] / vert->texcoord[u][3]; - } + } else { texcoord[u][0] = vert->texcoord[u][0]; texcoord[u][1] = vert->texcoord[u][1]; diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c index 9ed58f4a63f..a24c44bebed 100644 --- a/src/mesa/swrast/s_readpix.c +++ b/src/mesa/swrast/s_readpix.c @@ -1,21 +1,21 @@ -/* $Id: s_readpix.c,v 1.9 2001/03/07 05:06:12 brianp Exp $ */ +/* $Id: s_readpix.c,v 1.10 2001/03/12 00:48:42 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 @@ -473,7 +473,7 @@ read_rgba_pixels( GLcontext *ctx, void _swrast_ReadPixels( GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height, - GLenum format, GLenum type, + GLenum format, GLenum type, const struct gl_pixelstore_attrib *pack, GLvoid *pixels ) { diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index 4197167e2d0..e7659d51a7f 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -1,21 +1,21 @@ -/* $Id: s_span.c,v 1.10 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: s_span.c,v 1.11 2001/03/12 00:48:42 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 @@ -99,7 +99,7 @@ static GLuint clip_span( GLcontext *ctx, } else { /* partially off left side */ - BZERO(mask, -x * sizeof(GLubyte)); + BZERO(mask, -x * sizeof(GLubyte)); } } @@ -269,7 +269,7 @@ void _mesa_write_index_span( GLcontext *ctx, void _mesa_write_monoindex_span( GLcontext *ctx, - GLuint n, GLint x, GLint y, + GLuint n, GLint x, GLint y, const GLdepth z[], const GLfixed fog[], GLuint index, GLenum primitive ) @@ -426,10 +426,10 @@ static void multi_write_rgba_span( GLcontext *ctx, GLuint n, _mesa_mask_rgba_span( ctx, n, x, y, rgbaTmp ); } - (*ctx->Driver.WriteRGBASpan)( ctx, n, x, y, + (*ctx->Driver.WriteRGBASpan)( ctx, n, x, y, (const GLchan (*)[4]) rgbaTmp, mask ); if (swrast->_RasterMask & ALPHABUF_BIT) { - _mesa_write_alpha_span( ctx, n, x, y, + _mesa_write_alpha_span( ctx, n, x, y, (const GLchan (*)[4])rgbaTmp, mask ); } } @@ -523,7 +523,7 @@ void _mesa_write_rgba_span( GLcontext *ctx, /* Per-pixel fog */ if (ctx->Fog.Enabled) { - if (fog && !swrast->_PreferPixelFog) + if (fog && !swrast->_PreferPixelFog) _mesa_fog_rgba_pixels( ctx, n, fog, rgba ); else _mesa_depth_fog_rgba_pixels( ctx, n, z, rgba ); @@ -553,13 +553,13 @@ void _mesa_write_rgba_span( GLcontext *ctx, } /* write pixels */ - (*ctx->Driver.WriteRGBASpan)( ctx, n, x, y, - (const GLchan (*)[4]) rgba, + (*ctx->Driver.WriteRGBASpan)( ctx, n, x, y, + (const GLchan (*)[4]) rgba, write_all ? Null : mask ); if (swrast->_RasterMask & ALPHABUF_BIT) { - _mesa_write_alpha_span( ctx, n, x, y, - (const GLchan (*)[4]) rgba, + _mesa_write_alpha_span( ctx, n, x, y, + (const GLchan (*)[4]) rgba, write_all ? Null : mask ); } } @@ -693,12 +693,12 @@ void _mesa_write_monocolor_span( GLcontext *ctx, } /* write pixels */ - (*ctx->Driver.WriteRGBASpan)( ctx, n, x, y, - (const GLchan (*)[4]) rgba, + (*ctx->Driver.WriteRGBASpan)( ctx, n, x, y, + (const GLchan (*)[4]) rgba, write_all ? Null : mask ); if (swrast->_RasterMask & ALPHABUF_BIT) { - _mesa_write_alpha_span( ctx, n, x, y, - (const GLchan (*)[4]) rgba, + _mesa_write_alpha_span( ctx, n, x, y, + (const GLchan (*)[4]) rgba, write_all ? Null : mask ); } } @@ -714,7 +714,7 @@ void _mesa_write_monocolor_span( GLcontext *ctx, COPY_CHAN4(rgba[i], color); } } - multi_write_rgba_span( ctx, n, x, y, + multi_write_rgba_span( ctx, n, x, y, (const GLchan (*)[4]) rgba, mask ); } else { @@ -811,7 +811,7 @@ void _mesa_write_texture_span( GLcontext *ctx, stipple_polygon_span( ctx, n, x, y, mask ); write_all = GL_FALSE; } - + /* Texture with alpha test*/ if (ctx->Color.AlphaEnabled) { /* Texturing without alpha is done after depth-testing which @@ -819,7 +819,7 @@ void _mesa_write_texture_span( GLcontext *ctx, ASSERT(ctx->Texture._ReallyEnabled); _swrast_texture_fragments( ctx, 0, n, s, t, u, lambda, (CONST GLchan (*)[4]) rgba, rgba ); - + /* Do the alpha test */ if (_mesa_alpha_test( ctx, n, (const GLchan (*)[4]) rgba, mask ) == 0) { return; @@ -856,7 +856,7 @@ void _mesa_write_texture_span( GLcontext *ctx, } /* Add base and specular colors */ - if (spec && + if (spec && (ctx->Fog.ColorSumEnabled || (ctx->Light.Enabled && ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR))) add_colors( n, rgba, spec ); /* rgba = rgba + spec */ @@ -890,7 +890,7 @@ void _mesa_write_texture_span( GLcontext *ctx, (*ctx->Driver.WriteRGBASpan)( ctx, n, x, y, (const GLchan (*)[4])rgba, write_all ? Null : mask ); if (swrast->_RasterMask & ALPHABUF_BIT) { - _mesa_write_alpha_span( ctx, n, x, y, (const GLchan (*)[4]) rgba, + _mesa_write_alpha_span( ctx, n, x, y, (const GLchan (*)[4]) rgba, write_all ? Null : mask ); } } @@ -969,7 +969,7 @@ _mesa_write_multitexture_span( GLcontext *ctx, for (i = 0; i < texUnits; i++) _swrast_texture_fragments( ctx, i, n, s[i], t[i], u[i], lambda[i], (CONST GLchan (*)[4]) rgbaIn, rgba ); - + /* Do the alpha test */ if (_mesa_alpha_test( ctx, n, (const GLchan (*)[4])rgba, mask ) == 0) { return; @@ -1007,9 +1007,9 @@ _mesa_write_multitexture_span( GLcontext *ctx, } /* Add base and specular colors */ - if (spec && + if (spec && (ctx->Fog.ColorSumEnabled || - (ctx->Light.Enabled && + (ctx->Light.Enabled && ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR))) add_colors( n, rgba, spec ); /* rgba = rgba + spec */ diff --git a/src/mesa/swrast/s_span.h b/src/mesa/swrast/s_span.h index d4c77715c34..aa7e3b3664b 100644 --- a/src/mesa/swrast/s_span.h +++ b/src/mesa/swrast/s_span.h @@ -1,10 +1,10 @@ -/* $Id: s_span.h,v 1.3 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: s_span.h,v 1.4 2001/03/12 00:48:42 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"), diff --git a/src/mesa/swrast/s_stencil.c b/src/mesa/swrast/s_stencil.c index ac6f0dda4bc..af782aa7856 100644 --- a/src/mesa/swrast/s_stencil.c +++ b/src/mesa/swrast/s_stencil.c @@ -1,21 +1,21 @@ -/* $Id: s_stencil.c,v 1.9 2001/03/07 05:06:12 brianp Exp $ */ +/* $Id: s_stencil.c,v 1.10 2001/03/12 00:48:42 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 @@ -42,11 +42,11 @@ /* Stencil Logic: IF stencil test fails THEN - Apply fail-op to stencil value + Apply fail-op to stencil value Don't write the pixel (RGBA,Z) ELSE IF doing depth test && depth test fails THEN - Apply zfail-op to stencil value + Apply zfail-op to stencil value Write RGBA and Z to appropriate buffers ELSE Apply zpass-op to stencil value @@ -416,7 +416,7 @@ do_stencil_test( GLcontext *ctx, GLuint n, GLstencil stencil[], * mask - array [n] of flags (1=stencil and depth test passed) * Return: GL_TRUE - all fragments failed the testing * GL_FALSE - one or more fragments passed the testing - * + * */ static GLboolean stencil_and_ztest_span( GLcontext *ctx, GLuint n, GLint x, GLint y, @@ -499,7 +499,7 @@ stencil_and_ztest_span( GLcontext *ctx, GLuint n, GLint x, GLint y, * Output: mask - array [n] of flags (1=stencil and depth test passed) * Return: GL_TRUE - all fragments failed the testing * GL_FALSE - one or more fragments passed the testing - * + * */ GLboolean _mesa_stencil_and_ztest_span( GLcontext *ctx, GLuint n, GLint x, GLint y, @@ -896,7 +896,7 @@ stencil_test_pixels( GLcontext *ctx, GLuint n, * The comments in this function are a bit sparse but the code is * almost identical to stencil_and_ztest_span(), which is well * commented. - * + * * Input: n - number of pixels in the array * x, y - array of [n] pixel positions * z - array [n] of z values @@ -1301,4 +1301,3 @@ _mesa_clear_stencil_buffer( GLcontext *ctx ) clear_software_stencil_buffer(ctx); } } - diff --git a/src/mesa/swrast/s_stencil.h b/src/mesa/swrast/s_stencil.h index a1ef81b61a1..30394a90594 100644 --- a/src/mesa/swrast/s_stencil.h +++ b/src/mesa/swrast/s_stencil.h @@ -1,10 +1,10 @@ -/* $Id: s_stencil.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */ +/* $Id: s_stencil.h,v 1.3 2001/03/12 00:48:42 gareth Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 + * 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"), diff --git a/src/mesa/swrast/s_texture.h b/src/mesa/swrast/s_texture.h index 821e8199d5b..ac15c106029 100644 --- a/src/mesa/swrast/s_texture.h +++ b/src/mesa/swrast/s_texture.h @@ -1,4 +1,4 @@ -/* $Id: s_texture.h,v 1.5 2001/02/20 16:42:26 brianp Exp $ */ +/* $Id: s_texture.h,v 1.6 2001/03/12 00:48:42 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -47,4 +47,3 @@ _swrast_texture_fragments( GLcontext *ctx, GLuint texSet, GLuint n, #endif - diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index fbacc7ddd4a..a581acfcfb9 100644 --- a/src/mesa/swrast/s_triangle.c +++ b/src/mesa/swrast/s_triangle.c @@ -1,21 +1,21 @@ -/* $Id: s_triangle.c,v 1.17 2001/03/08 17:33:33 brianp Exp $ */ +/* $Id: s_triangle.c,v 1.18 2001/03/12 00:48:42 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 @@ -47,10 +47,10 @@ #include "s_feedback.h" #include "s_span.h" #include "s_triangle.h" - + GLboolean _mesa_cull_triangle( GLcontext *ctx, - const SWvertex *v0, - const SWvertex *v1, + const SWvertex *v0, + const SWvertex *v1, const SWvertex *v2 ) { GLfloat ex = v1->win[0] - v0->win[0]; @@ -61,7 +61,7 @@ GLboolean _mesa_cull_triangle( GLcontext *ctx, if (c * SWRAST_CONTEXT(ctx)->_backface_sign > 0) return 0; - + return 1; } @@ -71,8 +71,8 @@ GLboolean _mesa_cull_triangle( GLcontext *ctx, * Render a flat-shaded color index triangle. */ static void flat_ci_triangle( GLcontext *ctx, - const SWvertex *v0, - const SWvertex *v1, + const SWvertex *v0, + const SWvertex *v1, const SWvertex *v2 ) { #define INTERP_Z 1 @@ -96,7 +96,7 @@ static void flat_ci_triangle( GLcontext *ctx, } \ } -#include "s_tritemp.h" +#include "s_tritemp.h" } @@ -105,8 +105,8 @@ static void flat_ci_triangle( GLcontext *ctx, * Render a smooth-shaded color index triangle. */ static void smooth_ci_triangle( GLcontext *ctx, - const SWvertex *v0, - const SWvertex *v1, + const SWvertex *v0, + const SWvertex *v1, const SWvertex *v2 ) { #define INTERP_Z 1 @@ -289,7 +289,7 @@ static void simple_textured_triangle( GLcontext *ctx, * Render an RGB, GL_DECAL, textured triangle. * Interpolate S,T, GL_LESS depth test, w/out mipmapping or * perspective correction. - * + * * No fog. */ static void simple_z_textured_triangle( GLcontext *ctx, @@ -423,11 +423,11 @@ static void affine_textured_triangle( GLcontext *ctx, tsize = obj->Image[b]->Height * tbytesline; - /* Instead of defining a function for each mode, a test is done + /* Instead of defining a function for each mode, a test is done * between the outer and inner loops. This is to reduce code size - * and complexity. Observe that an optimizing compiler kills + * and complexity. Observe that an optimizing compiler kills * unused variables (for instance tf,sf,ti,si in case of GL_NEAREST). - */ + */ #define NEAREST_RGB \ tr = tex00[RCOMP]; \ @@ -690,7 +690,7 @@ static void near_persp_textured_triangle(GLcontext *ctx, /* The BIAS value is used to shift negative values into positive values. * Without this, negative texture values don't GL_REPEAT correctly at just * below zero, because (int)-0.5 = 0 = (int)0.5. We're not going to worry - * about texture coords less than -BIAS. This could be fixed by using + * about texture coords less than -BIAS. This could be fixed by using * FLOORF etc. instead, but this is slower... */ #define BIAS 4096.0F @@ -825,7 +825,7 @@ static void near_persp_textured_triangle(GLcontext *ctx, DRAW_LINE (DO_TEX); \ x_m ++; \ } \ -} +} #define SPAN3(DO_TEX, COMP, TEX_COORD) { \ GLfloat x_min = FLOORF (x_tex); \ @@ -862,7 +862,7 @@ static void near_persp_textured_triangle(GLcontext *ctx, DRAW_LINE (DO_TEX); \ } \ } - + #define SPAN4(DO_TEX, COMP, TEX_COORD) \ { \ GLfloat x_min = FLOORF(x_tex); \ @@ -1798,7 +1798,7 @@ static void general_textured_spec_triangle1( GLcontext *ctx, static void lambda_textured_triangle1( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1, - const SWvertex *v2, + const SWvertex *v2, GLfloat s[MAX_WIDTH], GLfloat t[MAX_WIDTH], GLfloat u[MAX_WIDTH] ) @@ -2015,7 +2015,7 @@ static void lambda_textured_spec_triangle1( GLcontext *ctx, * Interpolate Z, RGB, Alpha, and two sets of texture coordinates. * Yup, it's slow. */ -static void +static void lambda_multitextured_triangle1( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1, @@ -2144,7 +2144,7 @@ static void general_textured_spec_triangle(GLcontext *ctx, const SWvertex *v2 ) { GLdepth zspan[MAX_WIDTH]; - GLfixed fogspan[MAX_WIDTH]; + GLfixed fogspan[MAX_WIDTH]; GLchan rgba[MAX_WIDTH][4], spec[MAX_WIDTH][4]; general_textured_spec_triangle1(ctx,v0,v1,v2,zspan,fogspan,rgba,spec); } @@ -2180,9 +2180,9 @@ static void lambda_multitextured_triangle( GLcontext *ctx, GLfloat t[MAX_TEXTURE_UNITS][MAX_WIDTH]; DEFMARRAY(GLfloat,u,MAX_TEXTURE_UNITS,MAX_WIDTH); CHECKARRAY(u,return); - + lambda_multitextured_triangle1(ctx,v0,v1,v2,s,t,u); - + UNDEFARRAY(u); } @@ -2238,7 +2238,7 @@ void _swrast_add_spec_terms_triangle( GLcontext *ctx, SWRAST_CONTEXT(ctx)->SpecTriangle( ctx, ncv0, ncv1, ncv2 ); COPY_CHAN4( ncv0->color, c[0] ); COPY_CHAN4( ncv1->color, c[1] ); - COPY_CHAN4( ncv2->color, c[2] ); + COPY_CHAN4( ncv2->color, c[2] ); } @@ -2258,7 +2258,7 @@ void _swrast_add_spec_terms_triangle( GLcontext *ctx, * Please update the summary flag _SWRAST_NEW_TRIANGLE if you add or * remove tests to this code. */ -void +void _swrast_choose_triangle( GLcontext *ctx ) { SWcontext *swrast = SWRAST_CONTEXT(ctx); @@ -2278,8 +2278,8 @@ _swrast_choose_triangle( GLcontext *ctx ) ctx->Depth.Func == GL_LESS && !ctx->Stencil.Enabled) { if ((rgbmode && - ctx->Color.ColorMask[0] == 0 && - ctx->Color.ColorMask[1] == 0 && + ctx->Color.ColorMask[0] == 0 && + ctx->Color.ColorMask[1] == 0 && ctx->Color.ColorMask[2] == 0 && ctx->Color.ColorMask[3] == 0) || @@ -2309,7 +2309,7 @@ _swrast_choose_triangle( GLcontext *ctx ) && ctx->Texture.Unit[0].EnvMode!=GL_COMBINE_EXT) { if (ctx->Hint.PerspectiveCorrection==GL_FASTEST) { - + if (filter==GL_NEAREST && format==GL_RGB && (ctx->Texture.Unit[0].EnvMode==GL_REPLACE diff --git a/src/mesa/swrast/s_triangle.h b/src/mesa/swrast/s_triangle.h index 8689441bea6..576038db720 100644 --- a/src/mesa/swrast/s_triangle.h +++ b/src/mesa/swrast/s_triangle.h @@ -1,10 +1,10 @@ -/* $Id: s_triangle.h,v 1.6 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: s_triangle.h,v 1.7 2001/03/12 00:48:42 gareth Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.1 + * Version: 3.5 * - * Copyright (C) 1999 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"), @@ -45,12 +45,11 @@ GLboolean _mesa_cull_triangle( GLcontext *ctx, void _swrast_choose_triangle( GLcontext *ctx ); -void -_swrast_add_spec_terms_triangle( GLcontext *ctx, +void +_swrast_add_spec_terms_triangle( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1, const SWvertex *v2 ); #endif - diff --git a/src/mesa/swrast/s_tritemp.h b/src/mesa/swrast/s_tritemp.h index a854b995b89..062795debb2 100644 --- a/src/mesa/swrast/s_tritemp.h +++ b/src/mesa/swrast/s_tritemp.h @@ -1,21 +1,21 @@ -/* $Id: s_tritemp.h,v 1.13 2001/03/08 17:33:33 brianp Exp $ */ +/* $Id: s_tritemp.h,v 1.14 2001/03/12 00:48:42 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 @@ -62,7 +62,7 @@ * * Optionally, one may provide one-time setup code per triangle: * SETUP_CODE - code which is to be executed once per triangle - * + * * The following macro MUST be defined: * INNER_LOOP(LEFT,RIGHT,Y) - code to write a span of pixels. * Something like: @@ -231,7 +231,7 @@ * By stepping rasterization parameters along the major edge, * we can avoid recomputing them at the discontinuity where * the top and bottom edges meet. However, this forces us to - * be able to scan both left-to-right and right-to-left. + * be able to scan both left-to-right and right-to-left. * Also, we must determine whether the major edge is at the * left or right side of the triangle. We do this by * computing the magnitude of the cross-product of the major @@ -461,7 +461,7 @@ eBot_dt = vMid->texcoord[0][1] * wMid - vMin->texcoord[0][1] * wMin; dtdx = oneOverArea * (eMaj_dt * eBot.dy - eMaj.dy * eBot_dt); dtdy = oneOverArea * (eMaj.dx * eBot_dt - eMaj_dt * eBot.dx); - + eMaj_du = vMax->texcoord[0][2] * wMax - vMin->texcoord[0][2] * wMin; eBot_du = vMid->texcoord[0][2] * wMid - vMin->texcoord[0][2] * wMin; dudx = oneOverArea * (eMaj_du * eBot.dy - eMaj.dy * eBot_du); @@ -498,14 +498,14 @@ - vMin->texcoord[u][1] * wMin; dtdx[u] = oneOverArea * (eMaj_dt * eBot.dy - eMaj.dy * eBot_dt); dtdy[u] = oneOverArea * (eMaj.dx * eBot_dt - eMaj_dt * eBot.dx); - + eMaj_du = vMax->texcoord[u][2] * wMax - vMin->texcoord[u][2] * wMin; eBot_du = vMid->texcoord[u][2] * wMid - vMin->texcoord[u][2] * wMin; dudx[u] = oneOverArea * (eMaj_du * eBot.dy - eMaj.dy * eBot_du); dudy[u] = oneOverArea * (eMaj.dx * eBot_du - eMaj_du * eBot.dx); - + eMaj_dv = vMax->texcoord[u][3] * wMax - vMin->texcoord[u][3] * wMin; eBot_dv = vMid->texcoord[u][3] * wMid @@ -540,7 +540,7 @@ * inside the triangle. * * Next we creep down the major edge until we reach that y, - * and compute the corresponding x coordinate on the edge. + * and compute the corresponding x coordinate on the edge. * Then we find the half-integral x that lies on or just * inside the edge. This is the first pixel that might lie in * the interior of the triangle. (We won't know for sure @@ -1004,8 +1004,8 @@ GLfloat rho2 = r1 + r2; /* was: rho2 = MAX2(r1,r2); */ lambda_nominator = rho2; } - - /* set DEST to log_(base 2) of sqrt(rho) */ + + /* set DEST to log_(base 2) of sqrt(rho) */ /* 1.442695 = 1/log(2) */ #define COMPUTE_LAMBDA(DEST, X) \ DEST = log( lambda_nominator * (X)*(X) ) * 1.442695F * 0.5F @@ -1013,7 +1013,7 @@ #ifdef INTERP_MULTILAMBDA /* - * Read the comment for INTERP_LAMBDA, but apply to each texture unit + * Read the comment for INTERP_LAMBDA, but apply to each texture unit */ { GLuint unit; @@ -1030,7 +1030,7 @@ } } } - /* set DEST to log_(base 2) of sqrt(rho) */ + /* set DEST to log_(base 2) of sqrt(rho) */ #define COMPUTE_MULTILAMBDA(DEST, X, unit) \ DEST = log( lambda_nominator[unit] * (X)*(X) ) * 1.442695F * 0.5F #endif @@ -1064,7 +1064,7 @@ fz += fdzOuter; #endif #ifdef INTERP_FOG - ffog += fdfogOuter; + ffog += fdfogOuter; #endif #ifdef INTERP_RGB fr += fdrOuter; fg += fdgOuter; fb += fdbOuter; diff --git a/src/mesa/swrast/s_zoom.c b/src/mesa/swrast/s_zoom.c index b2ecbf2d902..daace6920fd 100644 --- a/src/mesa/swrast/s_zoom.c +++ b/src/mesa/swrast/s_zoom.c @@ -1,21 +1,21 @@ -/* $Id: s_zoom.c,v 1.3 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: s_zoom.c,v 1.4 2001/03/12 00:48:42 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 @@ -142,7 +142,7 @@ _mesa_write_zoomed_rgba_span( GLcontext *ctx, /* write the span */ for (r=r0; r<r1; r++) { - _mesa_write_rgba_span( ctx, m, x+skipcol, r, zdepth, + _mesa_write_rgba_span( ctx, m, x+skipcol, r, zdepth, (fog ? zfog : 0), zrgba, GL_BITMAP ); } @@ -253,7 +253,7 @@ _mesa_write_zoomed_rgb_span( GLcontext *ctx, /* write the span */ for (r=r0; r<r1; r++) { - _mesa_write_rgba_span( ctx, m, x+skipcol, r, zdepth, + _mesa_write_rgba_span( ctx, m, x+skipcol, r, zdepth, (fog ? zfog : 0), zrgba, GL_BITMAP ); } } @@ -360,7 +360,7 @@ _mesa_write_zoomed_index_span( GLcontext *ctx, /* write the span */ for (r=r0; r<r1; r++) { - _mesa_write_index_span( ctx, m, x+skipcol, r, zdepth, + _mesa_write_index_span( ctx, m, x+skipcol, r, zdepth, (fog ? zfog : 0), zindexes, GL_BITMAP ); } } diff --git a/src/mesa/swrast/s_zoom.h b/src/mesa/swrast/s_zoom.h index 4724edeb0ce..170133c3dff 100644 --- a/src/mesa/swrast/s_zoom.h +++ b/src/mesa/swrast/s_zoom.h @@ -1,10 +1,10 @@ -/* $Id: s_zoom.h,v 1.3 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: s_zoom.h,v 1.4 2001/03/12 00:48:42 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"), diff --git a/src/mesa/swrast/swrast.h b/src/mesa/swrast/swrast.h index 94b564d78e8..eaea8cd7e81 100644 --- a/src/mesa/swrast/swrast.h +++ b/src/mesa/swrast/swrast.h @@ -1,8 +1,10 @@ +/* $Id: swrast.h,v 1.11 2001/03/12 00:48:42 gareth Exp $ */ + /* * Mesa 3-D graphics library * Version: 3.5 * - * Copyright (C) 1999 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"), |