diff options
| author | Gareth Hughes <gareth@valinux.com> | 2001-03-12 00:48:37 +0000 |
|---|---|---|
| committer | Gareth Hughes <gareth@valinux.com> | 2001-03-12 00:48:37 +0000 |
| commit | 22144ab7552f0799bcfca506bf4ffa7f70a06649 (patch) | |
| tree | e7986aa02e97d88071b0769dc8d5359860320614 /src/mesa/main | |
| parent | 57ffddba9870a0e602ae454e13072a0af48fa150 (diff) | |
Consistent copyright info (version number, date) across all files.
Diffstat (limited to 'src/mesa/main')
84 files changed, 540 insertions, 458 deletions
diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c index 32c2298c74..85b856a20a 100644 --- a/src/mesa/main/accum.c +++ b/src/mesa/main/accum.c @@ -1,10 +1,10 @@ -/* $Id: accum.c,v 1.36 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: accum.c,v 1.37 2001/03/12 00:48:37 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/main/accum.h b/src/mesa/main/accum.h index 4c39a3ebc8..dde8dfe17b 100644 --- a/src/mesa/main/accum.h +++ b/src/mesa/main/accum.h @@ -1,10 +1,10 @@ -/* $Id: accum.h,v 1.5 2000/11/22 07:32:16 joukj Exp $ */ +/* $Id: accum.h,v 1.6 2001/03/12 00:48:37 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/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c index 004977c36c..8934fca98c 100644 --- a/src/mesa/main/api_arrayelt.c +++ b/src/mesa/main/api_arrayelt.c @@ -1,3 +1,29 @@ +/* $Id: api_arrayelt.c,v 1.2 2001/03/12 00:48:37 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 + * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + #include "glheader.h" #include "api_noop.h" #include "context.h" @@ -13,7 +39,7 @@ typedef struct { struct gl_client_array *array; void *func; } AAtexarray; - + typedef struct { struct gl_client_array *array; @@ -170,7 +196,7 @@ static void _aa_update_state( GLcontext *ctx ) AAarray *aa = actx->arrays; int i; - for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++) + for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++) if (ctx->Array.TexCoord[i].Enabled) { ta->unit = i; ta->array = &ctx->Array.TexCoord[i]; @@ -237,14 +263,14 @@ static void _aa_loopback_array_elt( GLint elt ) AAarray *aa; for (ta = actx->texarrays ; ta->func ; ta++) { - void (*func)( GLint, const void * ) = - (void (*)( GLint, const void * )) ta->func; + void (*func)( GLint, const void * ) = + (void (*)( GLint, const void * )) ta->func; func( ta->unit, (char *)ta->array->Ptr + elt * ta->array->SizeB ); } for (aa = actx->arrays ; aa->func ; aa++) { - void (*func)( GLint, const void * ) = - (void (*)( GLint, const void * )) aa->func; + void (*func)( GLint, const void * ) = + (void (*)( GLint, const void * )) aa->func; func( (char *)aa->array->Ptr + elt * aa->array->SizeB ); } } @@ -254,8 +280,8 @@ void _aa_exec_array_elt( GLint elt ) { GET_CURRENT_CONTEXT(ctx); AAcontext *actx = AA_CONTEXT(ctx); - - if (actx->NewState) + + if (actx->NewState) _aa_update_state( ctx ); ctx->Exec->ArrayElement = _aa_loopback_array_elt; @@ -268,8 +294,8 @@ void _aa_save_array_elt( GLint elt ) { GET_CURRENT_CONTEXT(ctx); AAcontext *actx = AA_CONTEXT(ctx); - - if (actx->NewState) + + if (actx->NewState) _aa_update_state( ctx ); ctx->Save->ArrayElement = _aa_loopback_array_elt; @@ -279,6 +305,6 @@ void _aa_save_array_elt( GLint elt ) void aa_invalidate_state( GLcontext *ctx, GLuint new_state ) { - if (AA_CONTEXT(ctx)) + if (AA_CONTEXT(ctx)) AA_CONTEXT(ctx)->NewState |= new_state; } diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c index adbf015bbe..9c33cce690 100644 --- a/src/mesa/main/api_loopback.c +++ b/src/mesa/main/api_loopback.c @@ -1,32 +1,30 @@ -/* $Id: api_loopback.c,v 1.6 2001/01/02 22:05:55 brianp Exp $ */ +/* $Id: api_loopback.c,v 1.7 2001/03/12 00:48:37 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 * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -/* + * * Authors: - * Keith Whitwell <keithw@valinux.com> + * Keith Whitwell <keithw@valinux.com> */ @@ -57,10 +55,10 @@ #define TEXCOORD2(s,t) DRIVER(TexCoord2f)(s,t) #define TEXCOORD3(s,t,u) DRIVER(TexCoord3f)(s,t,u) #define TEXCOORD4(s,t,u,v) DRIVER(TexCoord4f)(s,t,u,v) -#define INDEX(c) DRIVER(Indexi)(c) -#define MULTI_TEXCOORD1(z,s) DRIVER(MultiTexCoord1fARB)(z,s) +#define INDEX(c) DRIVER(Indexi)(c) +#define MULTI_TEXCOORD1(z,s) DRIVER(MultiTexCoord1fARB)(z,s) #define MULTI_TEXCOORD2(z,s,t) DRIVER(MultiTexCoord2fARB)(z,s,t) -#define MULTI_TEXCOORD3(z,s,t,u) DRIVER(MultiTexCoord3fARB)(z,s,t,u) +#define MULTI_TEXCOORD3(z,s,t,u) DRIVER(MultiTexCoord3fARB)(z,s,t,u) #define MULTI_TEXCOORD4(z,s,t,u,v) DRIVER(MultiTexCoord4fARB)(z,s,t,u,v) #define EVALCOORD1(x) DRIVER(EvalCoord1f)(x) #define EVALCOORD2(x,y) DRIVER(EvalCoord2f)(x,y) @@ -177,7 +175,7 @@ loopback_Color4i( GLint red, GLint green, GLint blue, GLint alpha ) } static void -loopback_Color4s( GLshort red, GLshort green, GLshort blue, +loopback_Color4s( GLshort red, GLshort green, GLshort blue, GLshort alpha ) { GLubyte col[4]; @@ -200,7 +198,7 @@ loopback_Color4ui( GLuint red, GLuint green, GLuint blue, GLuint alpha ) } static void -loopback_Color4us( GLushort red, GLushort green, GLushort blue, +loopback_Color4us( GLushort red, GLushort green, GLushort blue, GLushort alpha ) { GLubyte col[4]; @@ -249,7 +247,7 @@ loopback_Color3iv( const GLint *v ) static void loopback_Color3sv( const GLshort *v ) -{ +{ GLubyte col[4]; col[0] = SHORT_TO_UBYTE(v[0]); col[1] = SHORT_TO_UBYTE(v[1]); @@ -354,9 +352,9 @@ loopback_Color4usv( const GLushort *v) static void loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue ) { - COLORF( BYTE_TO_FLOAT(red), + COLORF( BYTE_TO_FLOAT(red), BYTE_TO_FLOAT(green), - BYTE_TO_FLOAT(blue), + BYTE_TO_FLOAT(blue), 1.0 ); } @@ -438,7 +436,7 @@ loopback_Color3usv_f( const GLushort *v ) static void -loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue, +loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha ) { COLORF( BYTE_TO_FLOAT(red), BYTE_TO_FLOAT(green), @@ -460,7 +458,7 @@ loopback_Color4i_f( GLint red, GLint green, GLint blue, GLint alpha ) } static void -loopback_Color4s_f( GLshort red, GLshort green, GLshort blue, +loopback_Color4s_f( GLshort red, GLshort green, GLshort blue, GLshort alpha ) { COLORF( SHORT_TO_FLOAT(red), SHORT_TO_FLOAT(green), @@ -878,21 +876,21 @@ loopback_Vertex3sv( const GLshort *v ) static void loopback_Vertex4dv( const GLdouble *v ) { - VERTEX4( (GLfloat) v[0], (GLfloat) v[1], + VERTEX4( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } static void loopback_Vertex4iv( const GLint *v ) { - VERTEX4( (GLfloat) v[0], (GLfloat) v[1], + VERTEX4( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } static void loopback_Vertex4sv( const GLshort *v ) { - VERTEX4( (GLfloat) v[0], (GLfloat) v[1], + VERTEX4( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } @@ -1365,7 +1363,7 @@ loopback_SecondaryColor3usvEXT_f( const GLushort *v ) void -_mesa_loopback_prefer_float( struct _glapi_table *dest, +_mesa_loopback_prefer_float( struct _glapi_table *dest, GLboolean prefer_float_colors ) { if (!prefer_float_colors) { @@ -1405,7 +1403,7 @@ _mesa_loopback_prefer_float( struct _glapi_table *dest, dest->SecondaryColor3svEXT = loopback_SecondaryColor3svEXT; dest->SecondaryColor3uivEXT = loopback_SecondaryColor3uivEXT; dest->SecondaryColor3usvEXT = loopback_SecondaryColor3usvEXT; - } + } else { dest->Color3b = loopback_Color3b_f; dest->Color3d = loopback_Color3d_f; @@ -1448,13 +1446,13 @@ _mesa_loopback_prefer_float( struct _glapi_table *dest, /* Passing prefer_f_colors as true will mean that all colors * *except* Color{34}ub{v} are passed as floats. Setting it false will - * mean all colors *except* Color{34}f{v} are passed as ubytes. - * + * mean all colors *except* Color{34}f{v} are passed as ubytes. + * * This code never registers handlers for any of the entry points - * listed in vtxfmt.h. + * listed in vtxfmt.h. */ void -_mesa_loopback_init_api_table( struct _glapi_table *dest, +_mesa_loopback_init_api_table( struct _glapi_table *dest, GLboolean prefer_float_colors ) { _mesa_loopback_prefer_float( dest, prefer_float_colors ); diff --git a/src/mesa/main/api_loopback.h b/src/mesa/main/api_loopback.h index 1c8e81733f..901c70cde6 100644 --- a/src/mesa/main/api_loopback.h +++ b/src/mesa/main/api_loopback.h @@ -1,3 +1,29 @@ +/* $Id: api_loopback.h,v 1.2 2001/03/12 00:48:37 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 + * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + #ifndef API_LOOPBACK_H #define API_LOOPBACK_H @@ -5,10 +31,10 @@ struct _glapi_table; -extern void _mesa_loopback_prefer_float( struct _glapi_table *dest, +extern void _mesa_loopback_prefer_float( struct _glapi_table *dest, GLboolean prefer_float_colors ); -extern void _mesa_loopback_init_api_table( struct _glapi_table *dest, +extern void _mesa_loopback_init_api_table( struct _glapi_table *dest, GLboolean prefer_float_colors ); #endif diff --git a/src/mesa/main/api_noop.h b/src/mesa/main/api_noop.h index b656ec6d44..c80179d293 100644 --- a/src/mesa/main/api_noop.h +++ b/src/mesa/main/api_noop.h @@ -1,3 +1,28 @@ +/* $Id: api_noop.h,v 1.3 2001/03/12 00:48:37 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 + * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ #ifndef _API_NOOP_H #define _API_NOOP_H @@ -52,17 +77,17 @@ extern void _mesa_noop_MultiTexCoord1fARB( GLenum target, GLfloat a ); extern void _mesa_noop_MultiTexCoord1fvARB( GLenum target, GLfloat *v ); -extern void _mesa_noop_MultiTexCoord2fARB( GLenum target, GLfloat a, +extern void _mesa_noop_MultiTexCoord2fARB( GLenum target, GLfloat a, GLfloat b ); extern void _mesa_noop_MultiTexCoord2fvARB( GLenum target, GLfloat *v ); -extern void _mesa_noop_MultiTexCoord3fARB( GLenum target, GLfloat a, +extern void _mesa_noop_MultiTexCoord3fARB( GLenum target, GLfloat a, GLfloat b, GLfloat c); extern void _mesa_noop_MultiTexCoord3fvARB( GLenum target, GLfloat *v ); -extern void _mesa_noop_MultiTexCoord4fARB( GLenum target, GLfloat a, +extern void _mesa_noop_MultiTexCoord4fARB( GLenum target, GLfloat a, GLfloat b, GLfloat c, GLfloat d ); extern void _mesa_noop_MultiTexCoord4fvARB( GLenum target, GLfloat *v ); @@ -94,17 +119,17 @@ extern void _mesa_noop_TexCoord4fv( GLfloat *v ); /* Not strictly a noop -- translate Rectf down to Begin/End and * vertices. Closer to the loopback operations, but doesn't meet the - * criteria for inclusion there (cannot be used in the Save table). + * criteria for inclusion there (cannot be used in the Save table). */ extern void _mesa_noop_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 ); extern void _mesa_noop_DrawArrays(GLenum mode, GLint start, GLsizei count); -extern void _mesa_noop_DrawElements(GLenum mode, GLsizei count, GLenum type, +extern void _mesa_noop_DrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices); -extern void _mesa_noop_DrawRangeElements(GLenum mode, - GLuint start, GLuint end, - GLsizei count, GLenum type, +extern void _mesa_noop_DrawRangeElements(GLenum mode, + GLuint start, GLuint end, + GLsizei count, GLenum type, const GLvoid *indices); diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c index 8d3cbafc64..3a0ce52b96 100644 --- a/src/mesa/main/api_validate.c +++ b/src/mesa/main/api_validate.c @@ -1,11 +1,10 @@ - -/* $Id: api_validate.c,v 1.4 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: api_validate.c,v 1.5 2001/03/12 00:48:37 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"), @@ -34,10 +33,10 @@ GLboolean _mesa_validate_DrawElements(GLcontext *ctx, - GLenum mode, GLsizei count, GLenum type, + GLenum mode, GLsizei count, GLenum type, const GLvoid *indices) { - ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); + ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); if (count <= 0) { if (count < 0) @@ -45,14 +44,14 @@ _mesa_validate_DrawElements(GLcontext *ctx, return GL_FALSE; } - if (mode < 0 || + if (mode < 0 || mode > GL_POLYGON) { _mesa_error(ctx, GL_INVALID_ENUM, "glDrawArrays(mode)" ); return GL_FALSE; } - if (type != GL_UNSIGNED_INT && - type != GL_UNSIGNED_BYTE && + if (type != GL_UNSIGNED_INT && + type != GL_UNSIGNED_BYTE && type != GL_UNSIGNED_SHORT) { _mesa_error(ctx, GL_INVALID_ENUM, "glDrawElements(type)" ); @@ -70,12 +69,12 @@ _mesa_validate_DrawElements(GLcontext *ctx, GLboolean -_mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode, - GLuint start, GLuint end, - GLsizei count, GLenum type, +_mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode, + GLuint start, GLuint end, + GLsizei count, GLenum type, const GLvoid *indices) { - ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); + ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); if (count <= 0) { if (count < 0) @@ -93,8 +92,8 @@ _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode, return GL_FALSE; } - if (type != GL_UNSIGNED_INT && - type != GL_UNSIGNED_BYTE && + if (type != GL_UNSIGNED_INT && + type != GL_UNSIGNED_BYTE && type != GL_UNSIGNED_SHORT) { _mesa_error(ctx, GL_INVALID_ENUM, "glDrawElements(type)" ); @@ -113,10 +112,10 @@ _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode, GLboolean -_mesa_validate_DrawArrays(GLcontext *ctx, +_mesa_validate_DrawArrays(GLcontext *ctx, GLenum mode, GLint start, GLsizei count) { - ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); + ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); if (count<0) { _mesa_error(ctx, GL_INVALID_VALUE, "glDrawArrays(count)" ); @@ -131,9 +130,8 @@ _mesa_validate_DrawArrays(GLcontext *ctx, if (ctx->NewState) _mesa_update_state( ctx ); - if (!ctx->Array.Vertex.Enabled) + if (!ctx->Array.Vertex.Enabled) return GL_FALSE; return GL_TRUE; } - diff --git a/src/mesa/main/api_validate.h b/src/mesa/main/api_validate.h index 7f381a0429..f24365055b 100644 --- a/src/mesa/main/api_validate.h +++ b/src/mesa/main/api_validate.h @@ -1,10 +1,10 @@ -/* $Id: api_validate.h,v 1.1 2000/12/26 05:09:27 keithw Exp $ */ +/* $Id: api_validate.h,v 1.2 2001/03/12 00:48:37 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"), @@ -37,13 +37,13 @@ _mesa_validate_DrawArrays(GLcontext *ctx, extern GLboolean _mesa_validate_DrawElements(GLcontext *ctx, - GLenum mode, GLsizei count, GLenum type, + GLenum mode, GLsizei count, GLenum type, const GLvoid *indices); extern GLboolean -_mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode, - GLuint start, GLuint end, - GLsizei count, GLenum type, +_mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode, + GLuint start, GLuint end, + GLsizei count, GLenum type, const GLvoid *indices); diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 00394a7970..700106ea8f 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -1,4 +1,4 @@ -/* $Id: attrib.c,v 1.45 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: attrib.c,v 1.46 2001/03/12 00:48:37 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -983,6 +983,3 @@ _mesa_PopClientAttrib(void) attr = next; } } - - - diff --git a/src/mesa/main/attrib.h b/src/mesa/main/attrib.h index d478aeb065..5ce75fcd91 100644 --- a/src/mesa/main/attrib.h +++ b/src/mesa/main/attrib.h @@ -1,10 +1,10 @@ -/* $Id: attrib.h,v 1.4 2000/11/22 07:32:16 joukj Exp $ */ +/* $Id: attrib.h,v 1.5 2001/03/12 00:48:37 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/main/blend.c b/src/mesa/main/blend.c index 342d0a48d9..ef26563add 100644 --- a/src/mesa/main/blend.c +++ b/src/mesa/main/blend.c @@ -1,4 +1,4 @@ -/* $Id: blend.c,v 1.30 2001/03/07 00:21:32 brianp Exp $ */ +/* $Id: blend.c,v 1.31 2001/03/12 00:48:37 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -40,7 +40,7 @@ void _mesa_BlendFunc( GLenum sfactor, GLenum dfactor ) { - + GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); @@ -112,7 +112,7 @@ _mesa_BlendFunc( GLenum sfactor, GLenum dfactor ) ctx->Color.BlendDstRGB = ctx->Color.BlendDstA = dfactor; ctx->Color.BlendSrcRGB = ctx->Color.BlendSrcA = sfactor; - if (ctx->Driver.BlendFunc) + if (ctx->Driver.BlendFunc) ctx->Driver.BlendFunc( ctx, sfactor, dfactor ); } @@ -309,7 +309,7 @@ _mesa_BlendEquation( GLenum mode ) /* This is needed to support 1.1's RGB logic ops AND * 1.0's blending logicops. */ - ctx->Color.ColorLogicOpEnabled = (mode==GL_LOGIC_OP && + ctx->Color.ColorLogicOpEnabled = (mode==GL_LOGIC_OP && ctx->Color.BlendEnabled); if (ctx->Driver.BlendEquation) @@ -339,4 +339,3 @@ _mesa_BlendColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ) if (ctx->Driver.BlendColor) (*ctx->Driver.BlendColor)(ctx, tmp); } - diff --git a/src/mesa/main/blend.h b/src/mesa/main/blend.h index 186cee857d..c2ec7093e2 100644 --- a/src/mesa/main/blend.h +++ b/src/mesa/main/blend.h @@ -1,10 +1,10 @@ -/* $Id: blend.h,v 1.7 2000/11/22 07:32:16 joukj Exp $ */ +/* $Id: blend.h,v 1.8 2001/03/12 00:48:37 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/main/buffers.c b/src/mesa/main/buffers.c index 6d7bb9b375..c2737ad5f0 100644 --- a/src/mesa/main/buffers.c +++ b/src/mesa/main/buffers.c @@ -1,4 +1,4 @@ -/* $Id: buffers.c,v 1.27 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: buffers.c,v 1.28 2001/03/12 00:48:37 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -53,7 +53,7 @@ _mesa_ClearIndex( GLfloat c ) if (ctx->Color.ClearIndex == (GLuint) c) return; - + FLUSH_VERTICES(ctx, _NEW_COLOR); ctx->Color.ClearIndex = (GLuint) c; diff --git a/src/mesa/main/buffers.h b/src/mesa/main/buffers.h index 8700e40700..a453c3e1a2 100644 --- a/src/mesa/main/buffers.h +++ b/src/mesa/main/buffers.h @@ -1,10 +1,10 @@ -/* $Id: buffers.h,v 1.2 2000/11/22 07:32:16 joukj Exp $ */ +/* $Id: buffers.h,v 1.3 2001/03/12 00:48:37 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/main/clip.c b/src/mesa/main/clip.c index 14930e2be3..026d3e5695 100644 --- a/src/mesa/main/clip.c +++ b/src/mesa/main/clip.c @@ -1,10 +1,10 @@ -/* $Id: clip.c,v 1.21 2001/03/07 05:06:11 brianp Exp $ */ +/* $Id: clip.c,v 1.22 2001/03/12 00:48:37 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"), @@ -84,7 +84,7 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *eq ) if (TEST_EQ_4V(ctx->Transform.EyeUserPlane[p], equation)) return; - + FLUSH_VERTICES(ctx, _NEW_TRANSFORM); COPY_4FV(ctx->Transform.EyeUserPlane[p], equation); diff --git a/src/mesa/main/clip.h b/src/mesa/main/clip.h index 19c5fe6a5d..6d034b64b8 100644 --- a/src/mesa/main/clip.h +++ b/src/mesa/main/clip.h @@ -1,10 +1,10 @@ -/* $Id: clip.h,v 1.5 2000/11/22 07:32:16 joukj Exp $ */ +/* $Id: clip.h,v 1.6 2001/03/12 00:48:37 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/main/colortab.c b/src/mesa/main/colortab.c index c3ba3c50c9..eae856b300 100644 --- a/src/mesa/main/colortab.c +++ b/src/mesa/main/colortab.c @@ -1,21 +1,21 @@ -/* $Id: colortab.c,v 1.36 2001/03/07 05:06:11 brianp Exp $ */ +/* $Id: colortab.c,v 1.37 2001/03/12 00:48:37 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 @@ -184,7 +184,7 @@ set_component_sizes( struct gl_color_table *table ) -void +void _mesa_ColorTable( GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *data ) @@ -424,7 +424,7 @@ _mesa_ColorTable( GLenum target, GLenum internalFormat, (*ctx->Driver.UpdateTexturePalette)( ctx, texObj ); } } - + ctx->NewState |= _NEW_PIXEL; } @@ -598,7 +598,7 @@ _mesa_ColorSubTable( GLenum target, GLsizei start, (*ctx->Driver.UpdateTexturePalette)( ctx, texObj ); } } - + ctx->NewState |= _NEW_PIXEL; } diff --git a/src/mesa/main/colortab.h b/src/mesa/main/colortab.h index cf866c66c2..813b4e2877 100644 --- a/src/mesa/main/colortab.h +++ b/src/mesa/main/colortab.h @@ -1,10 +1,10 @@ -/* $Id: colortab.h,v 1.8 2000/11/22 07:32:16 joukj Exp $ */ +/* $Id: colortab.h,v 1.9 2001/03/12 00:48:37 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/main/config.h b/src/mesa/main/config.h index fd2e1b599a..dff7c40138 100644 --- a/src/mesa/main/config.h +++ b/src/mesa/main/config.h @@ -1,21 +1,21 @@ -/* $Id: config.h,v 1.26 2000/12/28 22:11:05 keithw Exp $ */ +/* $Id: config.h,v 1.27 2001/03/12 00:48:37 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/main/context.h b/src/mesa/main/context.h index 792862c027..e4e5c5f1c2 100644 --- a/src/mesa/main/context.h +++ b/src/mesa/main/context.h @@ -1,10 +1,10 @@ -/* $Id: context.h,v 1.24 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: context.h,v 1.25 2001/03/12 00:48:37 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/main/convolve.c b/src/mesa/main/convolve.c index dcc4d59f80..5031f95b62 100644 --- a/src/mesa/main/convolve.c +++ b/src/mesa/main/convolve.c @@ -1,4 +1,4 @@ -/* $Id: convolve.c,v 1.21 2001/03/07 05:06:11 brianp Exp $ */ +/* $Id: convolve.c,v 1.22 2001/03/12 00:48:37 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -550,13 +550,13 @@ _mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, GLint x, GLi ctx->Unpack.SkipImages = 0; ctx->Unpack.SwapBytes = GL_FALSE; ctx->Unpack.LsbFirst = GL_FALSE; - ctx->NewState |= _NEW_PACKUNPACK; + ctx->NewState |= _NEW_PACKUNPACK; _mesa_ConvolutionFilter2D(target, internalFormat, width, height, GL_RGBA, CHAN_TYPE, rgba); ctx->Unpack = packSave; /* restore pixel packing params */ - ctx->NewState |= _NEW_PACKUNPACK; + ctx->NewState |= _NEW_PACKUNPACK; } @@ -1450,4 +1450,3 @@ _mesa_adjust_image_for_convolution(const GLcontext *ctx, GLuint dimensions, *height = *height - (MAX2(ctx->Separable2D.Height, 1) - 1); } } - diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 4f4cff7556..1e3671b5e5 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -1,10 +1,10 @@ -/* $Id: dd.h,v 1.57 2001/03/11 18:49:11 gareth Exp $ */ +/* $Id: dd.h,v 1.58 2001/03/12 00:48:37 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/main/debug.c b/src/mesa/main/debug.c index 62c3e1fc34..2295916b32 100644 --- a/src/mesa/main/debug.c +++ b/src/mesa/main/debug.c @@ -1,3 +1,29 @@ +/* $Id: debug.c,v 1.9 2001/03/12 00:48:37 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 + * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + #include "mtypes.h" #include "debug.h" diff --git a/src/mesa/main/debug.h b/src/mesa/main/debug.h index 929a877cf9..2565f018c5 100644 --- a/src/mesa/main/debug.h +++ b/src/mesa/main/debug.h @@ -1,3 +1,29 @@ +/* $Id: debug.h,v 1.3 2001/03/12 00:48:37 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 + * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + #ifndef _DEBUG_H #define _DEBUG_H diff --git a/src/mesa/main/depth.c b/src/mesa/main/depth.c index 82ca1bd345..fa77439394 100644 --- a/src/mesa/main/depth.c +++ b/src/mesa/main/depth.c @@ -1,10 +1,10 @@ -/* $Id: depth.c,v 1.26 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: depth.c,v 1.27 2001/03/12 00:48:37 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"), @@ -87,9 +87,9 @@ _mesa_DepthFunc( GLenum func ) return; } - if (ctx->Depth.Func == func) + if (ctx->Depth.Func == func) return; - + FLUSH_VERTICES(ctx, _NEW_DEPTH); ctx->Depth.Func = func; @@ -98,7 +98,7 @@ _mesa_DepthFunc( GLenum func ) else ctx->_TriangleCaps &= ~DD_Z_NEVER; - if (ctx->Driver.DepthFunc) + if (ctx->Driver.DepthFunc) ctx->Driver.DepthFunc( ctx, func ); } @@ -117,14 +117,12 @@ _mesa_DepthMask( GLboolean flag ) * GL_TRUE indicates depth buffer writing is enabled (default) * GL_FALSE indicates depth buffer writing is disabled */ - if (ctx->Depth.Mask == flag) + if (ctx->Depth.Mask == flag) return; - + FLUSH_VERTICES(ctx, _NEW_DEPTH); ctx->Depth.Mask = flag; - if (ctx->Driver.DepthMask) + if (ctx->Driver.DepthMask) ctx->Driver.DepthMask( ctx, flag ); } - - diff --git a/src/mesa/main/depth.h b/src/mesa/main/depth.h index 2120507fdf..e9c2885b7f 100644 --- a/src/mesa/main/depth.h +++ b/src/mesa/main/depth.h @@ -1,10 +1,10 @@ -/* $Id: depth.h,v 1.10 2000/11/22 07:32:16 joukj Exp $ */ +/* $Id: depth.h,v 1.11 2001/03/12 00:48:37 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/main/dispatch.c b/src/mesa/main/dispatch.c index 3c19e562e5..7582732e23 100644 --- a/src/mesa/main/dispatch.c +++ b/src/mesa/main/dispatch.c @@ -1,10 +1,10 @@ -/* $Id: dispatch.c,v 1.19 2001/01/08 04:09:41 keithw Exp $ */ +/* $Id: dispatch.c,v 1.20 2001/03/12 00:48:37 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"), @@ -117,4 +117,3 @@ trace(void) #define DO_GEOMETRY #include "glapitemp.h" - diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 4f93d0d768..d727a118c2 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -1,4 +1,4 @@ -/* $Id: dlist.c,v 1.66 2001/03/07 05:06:11 brianp Exp $ */ +/* $Id: dlist.c,v 1.67 2001/03/12 00:48:37 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -4767,7 +4767,7 @@ _mesa_NewList( GLuint list, GLenum mode ) /* - * End definition of current display list. Is the current + * End definition of current display list. Is the current * ASSERT_OUTSIDE_BEGIN_END strong enough to really guarentee that * we are outside begin/end calls? */ @@ -5088,7 +5088,7 @@ static void exec_GetTexLevelParameteriv( GLenum target, GLint level, ctx->Exec->GetTexLevelParameteriv( target, level, pname, params ); } -static void exec_GetTexParameterfv( GLenum target, GLenum pname, +static void exec_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params ) { GET_CURRENT_CONTEXT(ctx); @@ -5161,7 +5161,7 @@ static GLboolean exec_AreTexturesResident(GLsizei n, const GLuint *texName, return ctx->Exec->AreTexturesResident( n, texName, residences); } -static void exec_ColorPointer(GLint size, GLenum type, GLsizei stride, +static void exec_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr) { GET_CURRENT_CONTEXT(ctx); @@ -5218,7 +5218,7 @@ static void exec_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr) ctx->Exec->IndexPointer( type, stride, ptr); } -static void exec_InterleavedArrays(GLenum format, GLsizei stride, +static void exec_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer) { GET_CURRENT_CONTEXT(ctx); @@ -5254,7 +5254,7 @@ static void exec_PushClientAttrib(GLbitfield mask) ctx->Exec->PushClientAttrib( mask); } -static void exec_TexCoordPointer(GLint size, GLenum type, GLsizei stride, +static void exec_TexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr) { GET_CURRENT_CONTEXT(ctx); @@ -5262,7 +5262,7 @@ static void exec_TexCoordPointer(GLint size, GLenum type, GLsizei stride, ctx->Exec->TexCoordPointer( size, type, stride, ptr); } -static void exec_GetCompressedTexImageARB(GLenum target, GLint level, +static void exec_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid *img) { GET_CURRENT_CONTEXT(ctx); @@ -5270,7 +5270,7 @@ static void exec_GetCompressedTexImageARB(GLenum target, GLint level, ctx->Exec->GetCompressedTexImageARB( target, level, img); } -static void exec_VertexPointer(GLint size, GLenum type, GLsizei stride, +static void exec_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr) { GET_CURRENT_CONTEXT(ctx); @@ -5278,7 +5278,7 @@ static void exec_VertexPointer(GLint size, GLenum type, GLsizei stride, ctx->Exec->VertexPointer( size, type, stride, ptr); } -static void exec_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, +static void exec_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width) { GET_CURRENT_CONTEXT(ctx); @@ -5304,7 +5304,7 @@ static void exec_GetColorTable( GLenum target, GLenum format, ctx->Exec->GetColorTable( target, format, type, data ); } -static void exec_GetColorTableParameterfv( GLenum target, GLenum pname, +static void exec_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params ) { GET_CURRENT_CONTEXT(ctx); @@ -5312,7 +5312,7 @@ static void exec_GetColorTableParameterfv( GLenum target, GLenum pname, ctx->Exec->GetColorTableParameterfv( target, pname, params ); } -static void exec_GetColorTableParameteriv( GLenum target, GLenum pname, +static void exec_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params ) { GET_CURRENT_CONTEXT(ctx); @@ -5328,7 +5328,7 @@ static void exec_GetConvolutionFilter(GLenum target, GLenum format, GLenum type, ctx->Exec->GetConvolutionFilter( target, format, type, image); } -static void exec_GetConvolutionParameterfv(GLenum target, GLenum pname, +static void exec_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); @@ -5344,7 +5344,7 @@ static void exec_GetConvolutionParameteriv(GLenum target, GLenum pname, ctx->Exec->GetConvolutionParameteriv( target, pname, params); } -static void exec_GetHistogram(GLenum target, GLboolean reset, GLenum format, +static void exec_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values) { GET_CURRENT_CONTEXT(ctx); @@ -5352,7 +5352,7 @@ static void exec_GetHistogram(GLenum target, GLboolean reset, GLenum format, ctx->Exec->GetHistogram( target, reset, format, type, values); } -static void exec_GetHistogramParameterfv(GLenum target, GLenum pname, +static void exec_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); @@ -5360,7 +5360,7 @@ static void exec_GetHistogramParameterfv(GLenum target, GLenum pname, ctx->Exec->GetHistogramParameterfv( target, pname, params); } -static void exec_GetHistogramParameteriv(GLenum target, GLenum pname, +static void exec_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); @@ -5368,7 +5368,7 @@ static void exec_GetHistogramParameteriv(GLenum target, GLenum pname, ctx->Exec->GetHistogramParameteriv( target, pname, params); } -static void exec_GetMinmax(GLenum target, GLboolean reset, GLenum format, +static void exec_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values) { GET_CURRENT_CONTEXT(ctx); @@ -5392,7 +5392,7 @@ static void exec_GetMinmaxParameteriv(GLenum target, GLenum pname, ctx->Exec->GetMinmaxParameteriv( target, pname, params); } -static void exec_GetSeparableFilter(GLenum target, GLenum format, GLenum type, +static void exec_GetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span) { GET_CURRENT_CONTEXT(ctx); @@ -5502,7 +5502,7 @@ static void exec_SecondaryColorPointerEXT(GLint size, GLenum type, ctx->Exec->SecondaryColorPointerEXT( size, type, stride, ptr); } -static void exec_FogCoordPointerEXT(GLenum type, GLsizei stride, +static void exec_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr) { GET_CURRENT_CONTEXT(ctx); diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h index ad98244e83..62623d9377 100644 --- a/src/mesa/main/dlist.h +++ b/src/mesa/main/dlist.h @@ -1,10 +1,10 @@ -/* $Id: dlist.h,v 1.13 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: dlist.h,v 1.14 2001/03/12 00:48:37 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"), @@ -91,7 +91,7 @@ _mesa_alloc_opcode( GLcontext *ctx, GLuint sz, void (*destroy)( GLcontext *, void * ), void (*print)( GLcontext *, void * ) ); -extern void _mesa_save_EvalMesh2(GLenum mode, GLint i1, GLint i2, +extern void _mesa_save_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 ); extern void _mesa_save_EvalMesh1( GLenum mode, GLint i1, GLint i2 ); extern void _mesa_save_CallLists( GLsizei n, GLenum type, const GLvoid *lists ); diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c index 77da0f7ed8..4d7d938a69 100644 --- a/src/mesa/main/drawpix.c +++ b/src/mesa/main/drawpix.c @@ -1,10 +1,10 @@ -/* $Id: drawpix.c,v 1.49 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: drawpix.c,v 1.50 2001/03/12 00:48:37 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"), @@ -102,4 +102,3 @@ _mesa_DrawPixels( GLsizei width, GLsizei height, } } } - diff --git a/src/mesa/main/drawpix.h b/src/mesa/main/drawpix.h index 37c8d3ab99..c199877e4a 100644 --- a/src/mesa/main/drawpix.h +++ b/src/mesa/main/drawpix.h @@ -1,10 +1,10 @@ -/* $Id: drawpix.h,v 1.5 2000/11/22 07:32:16 joukj Exp $ */ +/* $Id: drawpix.h,v 1.6 2001/03/12 00:48:37 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/main/enable.c b/src/mesa/main/enable.c index 3e0de24314..e9642cca5e 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -1,4 +1,4 @@ -/* $Id: enable.c,v 1.44 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: enable.c,v 1.45 2001/03/12 00:48:37 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -67,7 +67,7 @@ client_state( GLcontext *ctx, GLenum cap, GLboolean state ) var = &ctx->Array.Index.Enabled; flag = _NEW_ARRAY_INDEX; break; - case GL_TEXTURE_COORD_ARRAY: + case GL_TEXTURE_COORD_ARRAY: var = &ctx->Array.TexCoord[ctx->Array.ActiveTexture].Enabled; flag = _NEW_ARRAY_TEXCOORD(ctx->Array.ActiveTexture); break; @@ -95,7 +95,7 @@ client_state( GLcontext *ctx, GLenum cap, GLboolean state ) ctx->Array.NewState |= flag; *var = state; - if (state) + if (state) ctx->Array._Enabled |= flag; else ctx->Array._Enabled &= ~flag; @@ -139,7 +139,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) switch (cap) { case GL_ALPHA_TEST: - if (ctx->Color.AlphaEnabled == state) + if (ctx->Color.AlphaEnabled == state) return; FLUSH_VERTICES(ctx, _NEW_COLOR); ctx->Color.AlphaEnabled = state; @@ -151,13 +151,13 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) ctx->Eval.AutoNormal = state; break; case GL_BLEND: - if (ctx->Color.BlendEnabled == state) + if (ctx->Color.BlendEnabled == state) return; FLUSH_VERTICES(ctx, _NEW_COLOR); ctx->Color.BlendEnabled = state; /* The following needed to accomodate 1.0 RGB logic op blending */ - ctx->Color.ColorLogicOpEnabled = + ctx->Color.ColorLogicOpEnabled = (ctx->Color.BlendEquation == GL_LOGIC_OP && state); break; case GL_CLIP_PLANE0: @@ -167,7 +167,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) case GL_CLIP_PLANE4: case GL_CLIP_PLANE5: { GLuint p = cap-GL_CLIP_PLANE0; - + if (ctx->Transform.ClipEnabled[p] == state) return; @@ -177,11 +177,11 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) if (state) { ctx->_Enabled |= ENABLE_USERCLIP; ctx->Transform._AnyClip++; - + if (ctx->ProjectionMatrix.flags & MAT_DIRTY) { _math_matrix_analyse( &ctx->ProjectionMatrix ); } - + /* This derived state also calculated in clip.c and * from _mesa_update_state() on changes to EyeUserPlane * and ctx->ProjectionMatrix respectively. @@ -191,12 +191,12 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) ctx->ProjectionMatrix.inv ); } else { if (--ctx->Transform._AnyClip == 0) - ctx->_Enabled &= ~ENABLE_USERCLIP; - } + ctx->_Enabled &= ~ENABLE_USERCLIP; + } } break; case GL_COLOR_MATERIAL: - if (ctx->Light.ColorMaterialEnabled == state) + if (ctx->Light.ColorMaterialEnabled == state) return; FLUSH_VERTICES(ctx, _NEW_LIGHT); ctx->Light.ColorMaterialEnabled = state; @@ -206,7 +206,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) } break; case GL_CULL_FACE: - if (ctx->Polygon.CullFlag == state) + if (ctx->Polygon.CullFlag == state) return; FLUSH_VERTICES(ctx, _NEW_POLYGON); ctx->Polygon.CullFlag = state; @@ -216,7 +216,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) _mesa_warning(ctx,"glEnable(GL_DEPTH_TEST) but no depth buffer"); return; } - if (ctx->Depth.Test==state) + if (ctx->Depth.Test==state) return; FLUSH_VERTICES(ctx, _NEW_DEPTH); ctx->Depth.Test = state; @@ -225,13 +225,13 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) if (ctx->NoDither) { state = GL_FALSE; /* MESA_NO_DITHER env var */ } - if (ctx->Color.DitherFlag==state) + if (ctx->Color.DitherFlag==state) return; FLUSH_VERTICES(ctx, _NEW_COLOR); ctx->Color.DitherFlag = state; break; case GL_FOG: - if (ctx->Fog.Enabled==state) + if (ctx->Fog.Enabled==state) return; FLUSH_VERTICES(ctx, _NEW_FOG); ctx->Fog.Enabled = state; @@ -255,7 +255,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) case GL_LIGHT5: case GL_LIGHT6: case GL_LIGHT7: - if (ctx->Light.Light[cap-GL_LIGHT0].Enabled == state) + if (ctx->Light.Light[cap-GL_LIGHT0].Enabled == state) return; FLUSH_VERTICES(ctx, _NEW_LIGHT); ctx->Light.Light[cap-GL_LIGHT0].Enabled = state; @@ -268,7 +268,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) } break; case GL_LIGHTING: - if (ctx->Light.Enabled == state) + if (ctx->Light.Enabled == state) return; FLUSH_VERTICES(ctx, _NEW_LIGHT); ctx->Light.Enabled = state; @@ -277,33 +277,33 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) if ((ctx->Light.Enabled && ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR) || ctx->Fog.ColorSumEnabled) - ctx->_TriangleCaps |= DD_SEPERATE_SPECULAR; + ctx->_TriangleCaps |= DD_SEPERATE_SPECULAR; else - ctx->_TriangleCaps &= ~DD_SEPERATE_SPECULAR; + ctx->_TriangleCaps &= ~DD_SEPERATE_SPECULAR; break; case GL_LINE_SMOOTH: - if (ctx->Line.SmoothFlag == state) + if (ctx->Line.SmoothFlag == state) return; FLUSH_VERTICES(ctx, _NEW_LINE); ctx->Line.SmoothFlag = state; ctx->_TriangleCaps ^= DD_LINE_SMOOTH; break; case GL_LINE_STIPPLE: - if (ctx->Line.StippleFlag == state) + if (ctx->Line.StippleFlag == state) return; FLUSH_VERTICES(ctx, _NEW_LINE); ctx->Line.StippleFlag = state; ctx->_TriangleCaps ^= DD_LINE_STIPPLE; break; case GL_INDEX_LOGIC_OP: - if (ctx->Color.IndexLogicOpEnabled == state) + if (ctx->Color.IndexLogicOpEnabled == state) return; FLUSH_VERTICES(ctx, _NEW_COLOR); ctx->Color.IndexLogicOpEnabled = state; break; case GL_COLOR_LOGIC_OP: - if (ctx->Color.ColorLogicOpEnabled == state) + if (ctx->Color.ColorLogicOpEnabled == state) return; FLUSH_VERTICES(ctx, _NEW_COLOR); ctx->Color.ColorLogicOpEnabled = state; @@ -423,61 +423,61 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) ctx->Pixel.MinMaxEnabled = state; break; case GL_NORMALIZE: - if (ctx->Transform.Normalize == state) + if (ctx->Transform.Normalize == state) return; FLUSH_VERTICES(ctx, _NEW_TRANSFORM); ctx->Transform.Normalize = state; ctx->_Enabled ^= ENABLE_NORMALIZE; break; case GL_POINT_SMOOTH: - if (ctx->Point.SmoothFlag==state) + if (ctx->Point.SmoothFlag==state) return; FLUSH_VERTICES(ctx, _NEW_POINT); ctx->Point.SmoothFlag = state; ctx->_TriangleCaps ^= DD_POINT_SMOOTH; break; case GL_POLYGON_SMOOTH: - if (ctx->Polygon.SmoothFlag==state) + if (ctx->Polygon.SmoothFlag==state) return; FLUSH_VERTICES(ctx, _NEW_POLYGON); ctx->Polygon.SmoothFlag = state; ctx->_TriangleCaps ^= DD_TRI_SMOOTH; break; case GL_POLYGON_STIPPLE: - if (ctx->Polygon.StippleFlag==state) + if (ctx->Polygon.StippleFlag==state) return; FLUSH_VERTICES(ctx, _NEW_POLYGON); ctx->Polygon.StippleFlag = state; ctx->_TriangleCaps ^= DD_TRI_STIPPLE; break; case GL_POLYGON_OFFSET_POINT: - if (ctx->Polygon.OffsetPoint==state) + if (ctx->Polygon.OffsetPoint==state) return; FLUSH_VERTICES(ctx, _NEW_POLYGON); ctx->Polygon.OffsetPoint = state; break; case GL_POLYGON_OFFSET_LINE: - if (ctx->Polygon.OffsetLine==state) + if (ctx->Polygon.OffsetLine==state) return; FLUSH_VERTICES(ctx, _NEW_POLYGON); ctx->Polygon.OffsetLine = state; break; case GL_POLYGON_OFFSET_FILL: /*case GL_POLYGON_OFFSET_EXT:*/ - if (ctx->Polygon.OffsetFill==state) + if (ctx->Polygon.OffsetFill==state) return; FLUSH_VERTICES(ctx, _NEW_POLYGON); ctx->Polygon.OffsetFill = state; break; case GL_RESCALE_NORMAL_EXT: - if (ctx->Transform.RescaleNormals == state) + if (ctx->Transform.RescaleNormals == state) return; FLUSH_VERTICES(ctx, _NEW_TRANSFORM); ctx->Transform.RescaleNormals = state; ctx->_Enabled ^= ENABLE_RESCALE; break; case GL_SCISSOR_TEST: - if (ctx->Scissor.Enabled==state) + if (ctx->Scissor.Enabled==state) return; FLUSH_VERTICES(ctx, _NEW_SCISSOR); ctx->Scissor.Enabled = state; @@ -493,7 +493,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) _mesa_warning(ctx, "glEnable(GL_STENCIL_TEST) but no stencil buffer"); return; } - if (ctx->Stencil.Enabled==state) + if (ctx->Stencil.Enabled==state) return; FLUSH_VERTICES(ctx, _NEW_STENCIL); ctx->Stencil.Enabled = state; @@ -503,7 +503,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) const GLuint curr = ctx->Texture.CurrentUnit; struct gl_texture_unit *texUnit = &ctx->Texture.Unit[curr]; GLuint newenabled = texUnit->Enabled & ~TEXTURE0_1D; - if (state) + if (state) newenabled |= TEXTURE0_1D; if (!ctx->Visual.rgbMode || texUnit->Enabled == newenabled) return; @@ -515,7 +515,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) const GLuint curr = ctx->Texture.CurrentUnit; struct gl_texture_unit *texUnit = &ctx->Texture.Unit[curr]; GLuint newenabled = texUnit->Enabled & ~TEXTURE0_2D; - if (state) + if (state) newenabled |= TEXTURE0_2D; if (!ctx->Visual.rgbMode || texUnit->Enabled == newenabled) return; @@ -527,7 +527,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) const GLuint curr = ctx->Texture.CurrentUnit; struct gl_texture_unit *texUnit = &ctx->Texture.Unit[curr]; GLuint newenabled = texUnit->Enabled & ~TEXTURE0_3D; - if (state) + if (state) newenabled |= TEXTURE0_3D; if (!ctx->Visual.rgbMode || texUnit->Enabled == newenabled) return; @@ -558,7 +558,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) FLUSH_VERTICES(ctx, _NEW_TEXTURE); texUnit->TexGenEnabled = newenabled; break; - } + } break; case GL_TEXTURE_GEN_S: { GLuint unit = ctx->Texture.CurrentUnit; @@ -571,7 +571,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) FLUSH_VERTICES(ctx, _NEW_TEXTURE); texUnit->TexGenEnabled = newenabled; break; - } + } break; case GL_TEXTURE_GEN_T: { GLuint unit = ctx->Texture.CurrentUnit; @@ -594,7 +594,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) case GL_NORMAL_ARRAY: case GL_COLOR_ARRAY: case GL_INDEX_ARRAY: - case GL_TEXTURE_COORD_ARRAY: + case GL_TEXTURE_COORD_ARRAY: case GL_EDGE_FLAG_ARRAY: case GL_FOG_COORDINATE_ARRAY_EXT: case GL_SECONDARY_COLOR_ARRAY_EXT: @@ -710,7 +710,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) const GLuint curr = ctx->Texture.CurrentUnit; struct gl_texture_unit *texUnit = &ctx->Texture.Unit[curr]; GLuint newenabled = texUnit->Enabled & ~TEXTURE0_CUBE; - if (state) + if (state) newenabled |= TEXTURE0_CUBE; if (!ctx->Extensions.ARB_texture_cube_map) { _mesa_error(ctx, GL_INVALID_ENUM, state ? "glEnable" : "glDisable"); @@ -732,13 +732,13 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) return; FLUSH_VERTICES(ctx, _NEW_FOG); ctx->Fog.ColorSumEnabled = state; - + if ((ctx->Light.Enabled && ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR) || ctx->Fog.ColorSumEnabled) - ctx->_TriangleCaps |= DD_SEPERATE_SPECULAR; + ctx->_TriangleCaps |= DD_SEPERATE_SPECULAR; else - ctx->_TriangleCaps &= ~DD_SEPERATE_SPECULAR; + ctx->_TriangleCaps &= ~DD_SEPERATE_SPECULAR; break; @@ -1011,10 +1011,3 @@ _mesa_IsEnabled( GLenum cap ) return GL_FALSE; } } - - - - - - - diff --git a/src/mesa/main/enable.h b/src/mesa/main/enable.h index f47e807c59..24f48f0aef 100644 --- a/src/mesa/main/enable.h +++ b/src/mesa/main/enable.h @@ -1,10 +1,10 @@ -/* $Id: enable.h,v 1.3 2000/11/22 07:32:16 joukj Exp $ */ +/* $Id: enable.h,v 1.4 2001/03/12 00:48:37 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/main/enums.c b/src/mesa/main/enums.c index faaa92c658..bccd0a861d 100644 --- a/src/mesa/main/enums.c +++ b/src/mesa/main/enums.c @@ -1,10 +1,10 @@ -/* $Id: enums.c,v 1.13 2001/03/07 05:06:11 brianp Exp $ */ +/* $Id: enums.c,v 1.14 2001/03/12 00:48:37 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"), @@ -22,7 +22,7 @@ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * + * * Author: * Keith Whitwell <keithw@valinux.com> */ @@ -911,5 +911,3 @@ const char *_mesa_lookup_enum_by_nr( int nr ) return f ? (*f)->c : "(unknown)"; } - - diff --git a/src/mesa/main/enums.h b/src/mesa/main/enums.h index a6b2141f7a..6a85917253 100644 --- a/src/mesa/main/enums.h +++ b/src/mesa/main/enums.h @@ -1,21 +1,21 @@ -/* $Id: enums.h,v 1.2 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: enums.h,v 1.3 2001/03/12 00:48:37 gareth Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.1 - * - * Copyright (C) 1999 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/main/eval.c b/src/mesa/main/eval.c index d012ace8c5..a992a3922e 100644 --- a/src/mesa/main/eval.c +++ b/src/mesa/main/eval.c @@ -1,10 +1,10 @@ -/* $Id: eval.c,v 1.18 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: eval.c,v 1.19 2001/03/12 00:48:37 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"), @@ -252,7 +252,7 @@ map1(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint k; GLfloat *pnts; struct gl_1d_map *map = 0; - ASSERT_OUTSIDE_BEGIN_END(ctx); + ASSERT_OUTSIDE_BEGIN_END(ctx); assert(type == GL_FLOAT || type == GL_DOUBLE); @@ -432,8 +432,8 @@ map2( GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, else pnts = _mesa_copy_map_points2d(target, ustride, uorder, vstride, vorder, (GLdouble*) points); - - + + FLUSH_VERTICES(ctx, _NEW_EVAL); map->Uorder = uorder; map->u1 = u1; @@ -1354,7 +1354,3 @@ _mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2, { _mesa_MapGrid2f( un, u1, u2, vn, v1, v2 ); } - - - - diff --git a/src/mesa/main/eval.h b/src/mesa/main/eval.h index 8db01370a6..ce1e9b279b 100644 --- a/src/mesa/main/eval.h +++ b/src/mesa/main/eval.h @@ -1,10 +1,10 @@ -/* $Id: eval.h,v 1.5 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: eval.h,v 1.6 2001/03/12 00:48:37 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/main/extensions.h b/src/mesa/main/extensions.h index 6be585b085..c5015bf478 100644 --- a/src/mesa/main/extensions.h +++ b/src/mesa/main/extensions.h @@ -1,4 +1,4 @@ -/* $Id: extensions.h,v 1.12 2001/02/26 23:58:12 brianp Exp $ */ +/* $Id: extensions.h,v 1.13 2001/03/12 00:48:37 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -51,5 +51,3 @@ extern void _mesa_extensions_ctr( GLcontext *ctx ); extern const char *_mesa_extensions_get_string( GLcontext *ctx ); #endif - - diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c index 806f3e2cd2..85363b11d6 100644 --- a/src/mesa/main/feedback.c +++ b/src/mesa/main/feedback.c @@ -1,4 +1,4 @@ -/* $Id: feedback.c,v 1.22 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: feedback.c,v 1.23 2001/03/12 00:48:37 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -52,7 +52,7 @@ void _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer ) { GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END(ctx); + ASSERT_OUTSIDE_BEGIN_END(ctx); if (ctx->RenderMode==GL_FEEDBACK) { _mesa_error( ctx, GL_INVALID_OPERATION, "glFeedbackBuffer" ); @@ -64,7 +64,7 @@ _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer ) } if (!buffer) { _mesa_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(buffer==NULL)" ); - ctx->Feedback.BufferSize = 0; + ctx->Feedback.BufferSize = 0; return; } @@ -76,16 +76,16 @@ _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer ) ctx->Feedback._Mask = FB_3D; break; case GL_3D_COLOR: - ctx->Feedback._Mask = (FB_3D | + ctx->Feedback._Mask = (FB_3D | (ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX)); break; case GL_3D_COLOR_TEXTURE: - ctx->Feedback._Mask = (FB_3D | - (ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX) | + ctx->Feedback._Mask = (FB_3D | + (ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX) | FB_TEXTURE); break; case GL_4D_COLOR_TEXTURE: - ctx->Feedback._Mask = (FB_3D | FB_4D | + ctx->Feedback._Mask = (FB_3D | FB_4D | (ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX) | FB_TEXTURE); break; @@ -405,9 +405,8 @@ _mesa_RenderMode( GLenum mode ) } ctx->RenderMode = mode; - if (ctx->Driver.RenderMode) + if (ctx->Driver.RenderMode) ctx->Driver.RenderMode( ctx, mode ); return result; } - diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h index be2dd9a75f..1d77032d97 100644 --- a/src/mesa/main/feedback.h +++ b/src/mesa/main/feedback.h @@ -1,10 +1,10 @@ -/* $Id: feedback.h,v 1.6 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: feedback.h,v 1.7 2001/03/12 00:48:37 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"), @@ -75,4 +75,3 @@ _mesa_RenderMode( GLenum mode ); #endif - diff --git a/src/mesa/main/fog.c b/src/mesa/main/fog.c index 0c1214e9a3..a6ebb3e110 100644 --- a/src/mesa/main/fog.c +++ b/src/mesa/main/fog.c @@ -1,10 +1,10 @@ -/* $Id: fog.c,v 1.33 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: fog.c,v 1.34 2001/03/12 00:48:37 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"), @@ -132,7 +132,7 @@ _mesa_Fogfv( GLenum pname, const GLfloat *params ) ctx->Fog.Index = *params; break; case GL_FOG_COLOR: - if (TEST_EQ_4V(ctx->Fog.Color, params)) + if (TEST_EQ_4V(ctx->Fog.Color, params)) return; FLUSH_VERTICES(ctx, _NEW_FOG); ctx->Fog.Color[0] = params[0]; @@ -161,5 +161,3 @@ _mesa_Fogfv( GLenum pname, const GLfloat *params ) (*ctx->Driver.Fogfv)( ctx, pname, params ); } } - - diff --git a/src/mesa/main/fog.h b/src/mesa/main/fog.h index 2fdac07f5e..af448bfb83 100644 --- a/src/mesa/main/fog.h +++ b/src/mesa/main/fog.h @@ -1,10 +1,10 @@ -/* $Id: fog.h,v 1.11 2000/11/22 07:32:17 joukj Exp $ */ +/* $Id: fog.h,v 1.12 2001/03/12 00:48:37 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/main/get.c b/src/mesa/main/get.c index 200d66cd94..83c4d16f3a 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -1,4 +1,4 @@ -/* $Id: get.c,v 1.55 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: get.c,v 1.56 2001/03/12 00:48:37 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -1214,7 +1214,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params ) case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI: *params = ctx->Pixel.PostColorMatrixColorTableEnabled; break; - + /* GL_EXT_secondary_color */ case GL_COLOR_SUM_EXT: *params = ctx->Fog.ColorSumEnabled; @@ -4568,7 +4568,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params ) case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT: *params = ctx->Array.LockCount; break; - + /* GL_ARB_transpose_matrix */ case GL_TRANSPOSE_COLOR_MATRIX_ARB: { @@ -4937,4 +4937,3 @@ _mesa_GetError( void ) ctx->ErrorValue = (GLenum) GL_NO_ERROR; return e; } - diff --git a/src/mesa/main/get.h b/src/mesa/main/get.h index 530a0b5f05..92a927b045 100644 --- a/src/mesa/main/get.h +++ b/src/mesa/main/get.h @@ -1,10 +1,10 @@ -/* $Id: get.h,v 1.4 2000/11/22 07:32:17 joukj Exp $ */ +/* $Id: get.h,v 1.5 2001/03/12 00:48:38 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"), @@ -56,4 +56,3 @@ _mesa_GetError( void ); #endif - diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h index 401bbabb6d..65aeadfb2d 100644 --- a/src/mesa/main/glheader.h +++ b/src/mesa/main/glheader.h @@ -1,10 +1,10 @@ -/* $Id: glheader.h,v 1.17 2001/02/09 23:39:02 brianp Exp $ */ +/* $Id: glheader.h,v 1.18 2001/03/12 00:48:38 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"), @@ -61,7 +61,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> -#if defined(__linux__) && defined(__i386__) +#if defined(__linux__) && defined(__i386__) #include <fpu_control.h> #endif #endif diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c index 17bcd1c5f3..0d73fc9fd2 100644 --- a/src/mesa/main/hash.c +++ b/src/mesa/main/hash.c @@ -1,21 +1,21 @@ -/* $Id: hash.c,v 1.9 2000/03/21 22:20:42 brianp Exp $ */ +/* $Id: hash.c,v 1.10 2001/03/12 00:48:38 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/main/hash.h b/src/mesa/main/hash.h index 90659c81b4..e31c247e3d 100644 --- a/src/mesa/main/hash.h +++ b/src/mesa/main/hash.h @@ -1,21 +1,21 @@ -/* $Id: hash.h,v 1.4 2000/03/21 22:20:42 brianp Exp $ */ +/* $Id: hash.h,v 1.5 2001/03/12 00:48:38 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/main/hint.c b/src/mesa/main/hint.c index 4f132c4dd4..ce0b27394f 100644 --- a/src/mesa/main/hint.c +++ b/src/mesa/main/hint.c @@ -1,21 +1,21 @@ -/* $Id: hint.c,v 1.8 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: hint.c,v 1.9 2001/03/12 00:48:38 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 @@ -117,6 +117,6 @@ _mesa_try_Hint( GLcontext *ctx, GLenum target, GLenum mode ) if (ctx->Driver.Hint) { (*ctx->Driver.Hint)( ctx, target, mode ); } - + return GL_TRUE; } diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c index e616e4cf67..f115519dc6 100644 --- a/src/mesa/main/histogram.c +++ b/src/mesa/main/histogram.c @@ -1,4 +1,4 @@ -/* $Id: histogram.c,v 1.9 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: histogram.c,v 1.10 2001/03/12 00:48:38 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -950,7 +950,7 @@ _mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean s ctx->Histogram.AlphaSize = 8 * sizeof(GLuint); ctx->Histogram.LuminanceSize = 8 * sizeof(GLuint); } - + ctx->NewState |= _NEW_PIXEL; } @@ -975,7 +975,7 @@ _mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink) _mesa_error(ctx, GL_INVALID_ENUM, "glMinMax(internalFormat)"); return; } - + if (ctx->MinMax.Sink == sink) return; FLUSH_VERTICES(ctx, _NEW_PIXEL); diff --git a/src/mesa/main/histogram.h b/src/mesa/main/histogram.h index 66928e772e..6432d91cf5 100644 --- a/src/mesa/main/histogram.h +++ b/src/mesa/main/histogram.h @@ -1,10 +1,10 @@ -/* $Id: histogram.h,v 1.2 2000/11/22 07:32:17 joukj Exp $ */ +/* $Id: histogram.h,v 1.3 2001/03/12 00:48:38 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/main/imports.c b/src/mesa/main/imports.c index d611c6e8d7..5dcd7fc64f 100644 --- a/src/mesa/main/imports.c +++ b/src/mesa/main/imports.c @@ -1,4 +1,4 @@ -/* $Id: imports.c,v 1.7 2001/03/07 05:06:12 brianp Exp $ */ +/* $Id: imports.c,v 1.8 2001/03/12 00:48:38 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -79,7 +79,7 @@ _mesa_warning(__GLcontext *gc, char *str) /* Whacko XFree86 macro: */ #ifdef getenv -#undef getenv +#undef getenv #endif if (gc->imports.getenv(gc, "MESA_DEBUG")) { debug = GL_TRUE; diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h index 6153ce117d..cf4ca182b6 100644 --- a/src/mesa/main/imports.h +++ b/src/mesa/main/imports.h @@ -1,10 +1,10 @@ -/* $Id: imports.h,v 1.1 2000/09/26 20:53:53 brianp Exp $ */ +/* $Id: imports.h,v 1.2 2001/03/12 00:48:38 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/main/light.c b/src/mesa/main/light.c index 1ce12e35ff..ed449b9f58 100644 --- a/src/mesa/main/light.c +++ b/src/mesa/main/light.c @@ -1,10 +1,10 @@ -/* $Id: light.c,v 1.40 2001/03/07 05:06:12 brianp Exp $ */ +/* $Id: light.c,v 1.41 2001/03/12 00:48:38 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"), @@ -64,7 +64,7 @@ _mesa_ShadeModel( GLenum mode ) return; } - if (ctx->Light.ShadeModel == mode) + if (ctx->Light.ShadeModel == mode) return; FLUSH_VERTICES(ctx, _NEW_LIGHT); @@ -146,7 +146,7 @@ _mesa_Lightfv( GLenum light, GLenum pname, const GLfloat *params ) _mesa_error( ctx, GL_INVALID_VALUE, "glLight" ); return; } - if (l->SpotExponent == params[0]) + if (l->SpotExponent == params[0]) return; FLUSH_VERTICES(ctx, _NEW_LIGHT); l->SpotExponent = params[0]; @@ -409,9 +409,9 @@ _mesa_LightModelfv( GLenum pname, const GLfloat *params ) ctx->Light.Model.TwoSide = newbool; break; case GL_LIGHT_MODEL_COLOR_CONTROL: - if (params[0] == (GLfloat) GL_SINGLE_COLOR) + if (params[0] == (GLfloat) GL_SINGLE_COLOR) newenum = GL_SINGLE_COLOR; - else if (params[0] == (GLfloat) GL_SEPARATE_SPECULAR_COLOR) + else if (params[0] == (GLfloat) GL_SEPARATE_SPECULAR_COLOR) newenum = GL_SEPARATE_SPECULAR_COLOR; else { _mesa_error( ctx, GL_INVALID_ENUM, "glLightModel(param)" ); @@ -425,9 +425,9 @@ _mesa_LightModelfv( GLenum pname, const GLfloat *params ) if ((ctx->Light.Enabled && ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR) || ctx->Fog.ColorSumEnabled) - ctx->_TriangleCaps |= DD_SEPERATE_SPECULAR; + ctx->_TriangleCaps |= DD_SEPERATE_SPECULAR; else - ctx->_TriangleCaps &= ~DD_SEPERATE_SPECULAR; + ctx->_TriangleCaps &= ~DD_SEPERATE_SPECULAR; break; default: @@ -600,7 +600,7 @@ void _mesa_copy_material_pairs( struct gl_material dst[2], * * src[0] is front material, src[1] is back material * - * Additionally keeps the precomputed lighting state uptodate. + * Additionally keeps the precomputed lighting state uptodate. */ void _mesa_update_material( GLcontext *ctx, const struct gl_material src[2], @@ -647,13 +647,13 @@ void _mesa_update_material( GLcontext *ctx, if (bitmask & (FRONT_EMISSION_BIT | FRONT_AMBIENT_BIT)) { struct gl_material *mat = &ctx->Light.Material[0]; COPY_3V( ctx->Light._BaseColor[0], mat->Emission ); - ACC_SCALE_3V( ctx->Light._BaseColor[0], mat->Ambient, + ACC_SCALE_3V( ctx->Light._BaseColor[0], mat->Ambient, ctx->Light.Model.Ambient ); } if (bitmask & (BACK_EMISSION_BIT | BACK_AMBIENT_BIT)) { struct gl_material *mat = &ctx->Light.Material[1]; COPY_3V( ctx->Light._BaseColor[1], mat->Emission ); - ACC_SCALE_3V( ctx->Light._BaseColor[1], mat->Ambient, + ACC_SCALE_3V( ctx->Light._BaseColor[1], mat->Ambient, ctx->Light.Model.Ambient ); } @@ -1071,7 +1071,7 @@ static void validate_spot_exp_table( struct gl_light *l ) l->_SpotExpTable[i][0] = tmp; } for (i = 0; i < EXP_TABLE_SIZE - 1; i++) { - l->_SpotExpTable[i][1] = (l->_SpotExpTable[i+1][0] - + l->_SpotExpTable[i][1] = (l->_SpotExpTable[i+1][0] - l->_SpotExpTable[i][0]); } l->_SpotExpTable[EXP_TABLE_SIZE-1][1] = 0.0; @@ -1087,7 +1087,7 @@ static void validate_spot_exp_table( struct gl_light *l ) void _mesa_invalidate_shine_table( GLcontext *ctx, GLuint i ) { - if (ctx->_ShineTable[i]) + if (ctx->_ShineTable[i]) ctx->_ShineTable[i]->refcount--; ctx->_ShineTable[i] = 0; } @@ -1132,7 +1132,7 @@ static void validate_shine_table( GLcontext *ctx, GLuint i, GLfloat shininess ) s->shininess = shininess; } - if (ctx->_ShineTable[i]) + if (ctx->_ShineTable[i]) ctx->_ShineTable[i]->refcount--; ctx->_ShineTable[i] = s; @@ -1140,7 +1140,7 @@ static void validate_shine_table( GLcontext *ctx, GLuint i, GLfloat shininess ) s->refcount++; } -void +void _mesa_validate_all_lighting_tables( GLcontext *ctx ) { GLint i; @@ -1154,7 +1154,7 @@ _mesa_validate_all_lighting_tables( GLcontext *ctx ) if (!ctx->_ShineTable[1] || ctx->_ShineTable[1]->shininess != shininess) validate_shine_table( ctx, 1, shininess ); - for (i = 0 ; i < MAX_LIGHTS ; i++) + for (i = 0 ; i < MAX_LIGHTS ; i++) if (ctx->Light.Light[i]._SpotExpTable[0][0] == -1) validate_spot_exp_table( &ctx->Light.Light[i] ); } @@ -1210,7 +1210,7 @@ _mesa_update_lighting( GLcontext *ctx ) /* Precompute some shading values. Although we reference * Light.Material here, we can get away without flushing * FLUSH_UPDATE_CURRENT, as when any outstanding material changes - * are flushed, they will update the derived state at that time. + * are flushed, they will update the derived state at that time. */ if (ctx->Visual.rgbMode) { GLuint sides = ctx->Light.Model.TwoSide ? 2 : 1; @@ -1227,7 +1227,7 @@ _mesa_update_lighting( GLcontext *ctx ) ctx->Light.Material[side].Diffuse[3] ); } - foreach (light, &ctx->Light.EnabledList) { + foreach (light, &ctx->Light.EnabledList) { for (side=0; side< sides; side++) { const struct gl_material *mat = &ctx->Light.Material[side]; SCALE_3V( light->_MatDiffuse[side], light->Diffuse, mat->Diffuse ); @@ -1323,5 +1323,3 @@ _mesa_compute_light_positions( GLcontext *ctx ) } } } - - diff --git a/src/mesa/main/light.h b/src/mesa/main/light.h index 82f6d7884c..82b6d74a55 100644 --- a/src/mesa/main/light.h +++ b/src/mesa/main/light.h @@ -1,10 +1,10 @@ -/* $Id: light.h,v 1.11 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: light.h,v 1.12 2001/03/12 00:48:38 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"), @@ -120,4 +120,3 @@ extern void _mesa_update_color_material( GLcontext *ctx, #endif - diff --git a/src/mesa/main/lines.c b/src/mesa/main/lines.c index 13e50832ad..303ab71379 100644 --- a/src/mesa/main/lines.c +++ b/src/mesa/main/lines.c @@ -1,10 +1,10 @@ -/* $Id: lines.c,v 1.28 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: lines.c,v 1.29 2001/03/12 00:48:38 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"), @@ -51,17 +51,17 @@ _mesa_LineWidth( GLfloat width ) return; } - if (ctx->Line.Width == width) + if (ctx->Line.Width == width) return; FLUSH_VERTICES(ctx, _NEW_LINE); ctx->Line.Width = width; - ctx->Line._Width = CLAMP(width, + ctx->Line._Width = CLAMP(width, ctx->Const.MinLineWidth, ctx->Const.MaxLineWidth); - if (width != 1.0) + if (width != 1.0) ctx->_TriangleCaps |= DD_LINE_WIDTH; else ctx->_TriangleCaps &= ~DD_LINE_WIDTH; @@ -91,5 +91,3 @@ _mesa_LineStipple( GLint factor, GLushort pattern ) if (ctx->Driver.LineStipple) ctx->Driver.LineStipple( ctx, factor, pattern ); } - - diff --git a/src/mesa/main/lines.h b/src/mesa/main/lines.h index 163663d78b..08848ea7b1 100644 --- a/src/mesa/main/lines.h +++ b/src/mesa/main/lines.h @@ -1,10 +1,10 @@ -/* $Id: lines.h,v 1.4 2000/11/22 07:32:17 joukj Exp $ */ +/* $Id: lines.h,v 1.5 2001/03/12 00:48:38 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/main/macros.h b/src/mesa/main/macros.h index 9a3f227758..1cfb55552d 100644 --- a/src/mesa/main/macros.h +++ b/src/mesa/main/macros.h @@ -1,21 +1,21 @@ -/* $Id: macros.h,v 1.18 2001/01/24 00:04:58 brianp Exp $ */ +/* $Id: macros.h,v 1.19 2001/03/12 00:48:38 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 @@ -68,7 +68,7 @@ #define TEST_BITS(WORD, BITS) ((WORD) & (BITS)) -/* Stepping a GLfloat pointer by a byte stride +/* Stepping a GLfloat pointer by a byte stride */ #define STRIDE_F(p, i) (p = (GLfloat *)((GLubyte *)p + i)) #define STRIDE_UI(p, i) (p = (GLuint *)((GLubyte *)p + i)) @@ -92,7 +92,7 @@ (a)[2] == (b)[2]) #if defined(__i386__) -#define TEST_EQ_4UBV(DST, SRC) *((GLuint*)(DST)) == *((GLuint*)(SRC)) +#define TEST_EQ_4UBV(DST, SRC) *((GLuint*)(DST)) == *((GLuint*)(SRC)) #else #define TEST_EQ_4UBV(DST, SRC) TEST_EQ_4V(DST, SRC) #endif @@ -169,7 +169,7 @@ do { \ case 2: (DST)[1] = (SRC)[1]; \ case 1: (DST)[0] = (SRC)[0]; \ } \ -} while(0) +} while(0) #define COPY_CLEAN_4V(DST, SZ, SRC) \ do { \ diff --git a/src/mesa/main/matrix.h b/src/mesa/main/matrix.h index 53fd29aa31..59c0a6fad4 100644 --- a/src/mesa/main/matrix.h +++ b/src/mesa/main/matrix.h @@ -1,10 +1,10 @@ -/* $Id: matrix.h,v 1.11 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: matrix.h,v 1.12 2001/03/12 00:48:38 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/main/pixel.c b/src/mesa/main/pixel.c index 3b4cada93b..6a31d5a59f 100644 --- a/src/mesa/main/pixel.c +++ b/src/mesa/main/pixel.c @@ -1,4 +1,4 @@ -/* $Id: pixel.c,v 1.26 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: pixel.c,v 1.27 2001/03/12 00:48:38 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -75,13 +75,13 @@ _mesa_PixelStorei( GLenum pname, GLint param ) switch (pname) { case GL_PACK_SWAP_BYTES: - if (param == (GLint)ctx->Pack.SwapBytes) + if (param == (GLint)ctx->Pack.SwapBytes) return; FLUSH_VERTICES(ctx, _NEW_PACKUNPACK); ctx->Pack.SwapBytes = param ? GL_TRUE : GL_FALSE; break; case GL_PACK_LSB_FIRST: - if (param == (GLint)ctx->Pack.LsbFirst) + if (param == (GLint)ctx->Pack.LsbFirst) return; FLUSH_VERTICES(ctx, _NEW_PACKUNPACK); ctx->Pack.LsbFirst = param ? GL_TRUE : GL_FALSE; @@ -147,7 +147,7 @@ _mesa_PixelStorei( GLenum pname, GLint param ) ctx->Pack.Alignment = param; break; case GL_UNPACK_SWAP_BYTES: - if (param == (GLint)ctx->Unpack.SwapBytes) + if (param == (GLint)ctx->Unpack.SwapBytes) return; if ((GLint)ctx->Unpack.SwapBytes == param) return; @@ -155,7 +155,7 @@ _mesa_PixelStorei( GLenum pname, GLint param ) ctx->Unpack.SwapBytes = param ? GL_TRUE : GL_FALSE; break; case GL_UNPACK_LSB_FIRST: - if (param == (GLint)ctx->Unpack.LsbFirst) + if (param == (GLint)ctx->Unpack.LsbFirst) return; if ((GLint)ctx->Unpack.LsbFirst == param) return; diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h index 6698d8c13f..94f84e0fe0 100644 --- a/src/mesa/main/pixel.h +++ b/src/mesa/main/pixel.h @@ -1,10 +1,10 @@ -/* $Id: pixel.h,v 1.9 2000/12/13 00:46:21 brianp Exp $ */ +/* $Id: pixel.h,v 1.10 2001/03/12 00:48:38 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/main/points.c b/src/mesa/main/points.c index 895bf75271..493a96c0e9 100644 --- a/src/mesa/main/points.c +++ b/src/mesa/main/points.c @@ -1,10 +1,10 @@ -/* $Id: points.c,v 1.29 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: points.c,v 1.30 2001/03/12 00:48:38 gareth Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.4 + * 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"), @@ -50,12 +50,12 @@ _mesa_PointSize( GLfloat size ) return; } - if (ctx->Point.Size == size) + if (ctx->Point.Size == size) return; FLUSH_VERTICES(ctx, _NEW_POINT); ctx->Point.Size = size; - ctx->Point._Size = CLAMP(size, + ctx->Point._Size = CLAMP(size, ctx->Const.MinPointSize, ctx->Const.MaxPointSize); @@ -146,4 +146,3 @@ _mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params) if (ctx->Driver.PointParameterfv) (*ctx->Driver.PointParameterfv)(ctx, pname, params); } - diff --git a/src/mesa/main/points.h b/src/mesa/main/points.h index 58973c8038..283432c6c1 100644 --- a/src/mesa/main/points.h +++ b/src/mesa/main/points.h @@ -1,10 +1,10 @@ -/* $Id: points.h,v 1.4 2000/11/22 07:32:17 joukj Exp $ */ +/* $Id: points.h,v 1.5 2001/03/12 00:48:38 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/main/polygon.c b/src/mesa/main/polygon.c index 396c897b70..3126ff6087 100644 --- a/src/mesa/main/polygon.c +++ b/src/mesa/main/polygon.c @@ -1,4 +1,4 @@ -/* $Id: polygon.c,v 1.19 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: polygon.c,v 1.20 2001/03/12 00:48:38 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -137,7 +137,7 @@ _mesa_PolygonMode( GLenum face, GLenum mode ) } ctx->_TriangleCaps &= ~DD_TRI_UNFILLED; - if (ctx->Polygon.FrontMode!=GL_FILL || ctx->Polygon.BackMode!=GL_FILL) + if (ctx->Polygon.FrontMode!=GL_FILL || ctx->Polygon.BackMode!=GL_FILL) ctx->_TriangleCaps |= DD_TRI_UNFILLED; if (ctx->Driver.PolygonMode) { diff --git a/src/mesa/main/polygon.h b/src/mesa/main/polygon.h index af8b34b53e..5801336965 100644 --- a/src/mesa/main/polygon.h +++ b/src/mesa/main/polygon.h @@ -1,10 +1,10 @@ -/* $Id: polygon.h,v 1.3 2000/11/22 07:32:17 joukj Exp $ */ +/* $Id: polygon.h,v 1.4 2001/03/12 00:48:38 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"), @@ -55,4 +55,3 @@ _mesa_GetPolygonStipple( GLubyte *mask ); #endif - diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c index 730d925685..09a4ebe8c6 100644 --- a/src/mesa/main/rastpos.c +++ b/src/mesa/main/rastpos.c @@ -1,4 +1,4 @@ -/* $Id: rastpos.c,v 1.21 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: rastpos.c,v 1.22 2001/03/12 00:48:38 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -128,10 +128,10 @@ shade_rastpos(GLcontext *ctx, } else { GLfloat d; - + SUB_3V(VP, light->_Position, vertex); d = LEN_3FV( VP ); - + if ( d > 1e-6) { GLfloat invd = 1.0F / d; SELF_SCALE_SCALAR_3V(VP, invd); @@ -139,10 +139,10 @@ shade_rastpos(GLcontext *ctx, attenuation = 1.0F / (light->ConstantAttenuation + d * (light->LinearAttenuation + d * light->QuadraticAttenuation)); - + if (light->_Flags & LIGHT_SPOT) { GLfloat PV_dot_dir = - DOT3(VP, light->_NormDirection); - + if (PV_dot_dir<light->_CosCutoff) { continue; } @@ -188,7 +188,7 @@ shade_rastpos(GLcontext *ctx, h = light->_h_inf_norm; normalized = 1; } - + n_dot_h = DOT3(normal, h); if (n_dot_h > 0.0F) { @@ -201,7 +201,7 @@ shade_rastpos(GLcontext *ctx, n_dot_h /= LEN_SQUARED_3FV( h ); shininess *= .5; } - + GET_SHINE_TAB_ENTRY( ctx->_ShineTable[0], n_dot_h, spec_coef ); if (spec_coef > 1.0e-10) { diff --git a/src/mesa/main/rastpos.h b/src/mesa/main/rastpos.h index 49223ce236..40ccc9760c 100644 --- a/src/mesa/main/rastpos.h +++ b/src/mesa/main/rastpos.h @@ -1,21 +1,21 @@ -/* $Id: rastpos.h,v 1.2 1999/11/11 01:22:27 brianp Exp $ */ +/* $Id: rastpos.h,v 1.3 2001/03/12 00:48:38 gareth Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 - * - * Copyright (C) 1999 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 @@ -106,4 +106,3 @@ _mesa_RasterPos4sv(const GLshort *v); #endif - diff --git a/src/mesa/main/simple_list.h b/src/mesa/main/simple_list.h index 994d955b7f..3755e70f12 100644 --- a/src/mesa/main/simple_list.h +++ b/src/mesa/main/simple_list.h @@ -1,21 +1,21 @@ -/* $Id: simple_list.h,v 1.1 1999/08/19 00:55:41 jtg Exp $ */ +/* $Id: simple_list.h,v 1.2 2001/03/12 00:48:38 gareth Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.1 - * - * Copyright (C) 1999 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 @@ -28,7 +28,7 @@ * (C) 1997, Keith Whitwell * * Intended to work with a list sentinal which is created as an empty - * list. Insert & delete are O(1). + * list. Insert & delete are O(1). */ @@ -96,4 +96,3 @@ do { \ #endif - diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 4bd1ade6dc..9c4685ed85 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -1,4 +1,4 @@ -/* $Id: state.c,v 1.60 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: state.c,v 1.61 2001/03/12 00:48:38 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -566,14 +566,14 @@ update_tnl_spaces( GLcontext *ctx, GLuint oldneedeyecoords ) GLuint new_state = ctx->NewState; /* Recalculate that same state only if it has been invalidated - * by other statechanges. + * by other statechanges. */ if (new_state & _NEW_MODELVIEW) update_modelview_scale(ctx); if (new_state & (_NEW_MODELVIEW|_NEW_PROJECTION)) calculate_model_project_matrix(ctx); - + if (new_state & (_NEW_LIGHT|_NEW_MODELVIEW)) _mesa_compute_light_positions( ctx ); } @@ -613,7 +613,7 @@ static void update_projection( GLcontext *ctx ) { _math_matrix_analyse( &ctx->ProjectionMatrix ); - + /* Recompute clip plane positions in clipspace. This is also done * in _mesa_ClipPlane(). */ @@ -865,7 +865,7 @@ update_texture_state( GLcontext *ctx ) * state references this value, and must be treated with care to * ensure that updates are done correctly. All state dependent on * _NeedEyeCoords is calculated from within _mesa_update_tnl_spaces(), - * and from nowhere else. + * and from nowhere else. */ void _mesa_update_state( GLcontext *ctx ) { @@ -926,7 +926,7 @@ void _mesa_update_state( GLcontext *ctx ) * normal transform. * * If the lighting space hasn't changed, may still need to recompute - * light positions & normal transforms for other reasons. + * light positions & normal transforms for other reasons. */ if (new_state & (_NEW_MODELVIEW | _NEW_PROJECTION | @@ -948,12 +948,12 @@ void _mesa_update_state( GLcontext *ctx ) ctx->Array.NewState = 0; /* At this point we can do some assertions to be sure the required - * device driver function pointers are all initialized. + * device driver function pointers are all initialized. * * KW: Moved the some of these asserts to t_vb_render.c, as they * are strictly only required for that stage. The Driver struct * should probably be split; the read/write span/pixels functions - * should be referenced only from swrast, for instance. + * should be referenced only from swrast, for instance. */ ASSERT(ctx->Driver.GetString); ASSERT(ctx->Driver.UpdateState); diff --git a/src/mesa/main/state.h b/src/mesa/main/state.h index 8a45096c66..67a62c3d4e 100644 --- a/src/mesa/main/state.h +++ b/src/mesa/main/state.h @@ -1,10 +1,10 @@ -/* $Id: state.h,v 1.6 2001/03/03 20:33:27 brianp Exp $ */ +/* $Id: state.h,v 1.7 2001/03/12 00:48:38 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/main/stencil.c b/src/mesa/main/stencil.c index 1520fe8c96..86050b24a6 100644 --- a/src/mesa/main/stencil.c +++ b/src/mesa/main/stencil.c @@ -1,10 +1,10 @@ -/* $Id: stencil.c,v 1.25 2001/03/03 20:33:28 brianp Exp $ */ +/* $Id: stencil.c,v 1.26 2001/03/12 00:48:38 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"), @@ -46,7 +46,7 @@ _mesa_ClearStencil( GLint s ) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); - + if (ctx->Stencil.Clear == (GLstencil) s) return; @@ -197,4 +197,3 @@ _mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass) (*ctx->Driver.StencilOp)(ctx, fail, zfail, zpass); } } - diff --git a/src/mesa/main/stencil.h b/src/mesa/main/stencil.h index dda7b043d1..6d659d3eb8 100644 --- a/src/mesa/main/stencil.h +++ b/src/mesa/main/stencil.h @@ -1,10 +1,10 @@ -/* $Id: stencil.h,v 1.8 2000/11/22 07:32:17 joukj Exp $ */ +/* $Id: stencil.h,v 1.9 2001/03/12 00:48:38 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/main/teximage.c b/src/mesa/main/teximage.c index 53fcffb512..5a231d182d 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1,10 +1,10 @@ -/* $Id: teximage.c,v 1.83 2001/03/07 05:06:12 brianp Exp $ */ +/* $Id: teximage.c,v 1.84 2001/03/12 00:48:38 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/main/teximage.h b/src/mesa/main/teximage.h index e547a352b1..a19f806118 100644 --- a/src/mesa/main/teximage.h +++ b/src/mesa/main/teximage.h @@ -1,10 +1,10 @@ -/* $Id: teximage.h,v 1.16 2001/02/06 21:42:48 brianp Exp $ */ +/* $Id: teximage.h,v 1.17 2001/03/12 00:48:38 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"), @@ -188,4 +188,3 @@ _mesa_GetCompressedTexImageARB(GLenum target, GLint lod, GLvoid *img); #endif - diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index ca405bd78e..0bcc0deae8 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -1,10 +1,10 @@ -/* $Id: texobj.c,v 1.43 2001/03/08 15:23:46 brianp Exp $ */ +/* $Id: texobj.c,v 1.44 2001/03/12 00:48:39 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"), @@ -54,7 +54,7 @@ * Return: pointer to new texture object */ struct gl_texture_object * -_mesa_alloc_texture_object( struct gl_shared_state *shared, +_mesa_alloc_texture_object( struct gl_shared_state *shared, GLuint name, GLuint dimensions ) { struct gl_texture_object *obj; @@ -609,7 +609,7 @@ _mesa_BindTexture( GLenum target, GLuint texName ) newTexObj->RefCount++; - + /* do the actual binding, but first flush outstanding vertices: */ FLUSH_VERTICES(ctx, _NEW_TEXTURE); @@ -743,4 +743,3 @@ _mesa_IsTexture( GLuint texture ) ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); return texture > 0 && _mesa_HashLookup(ctx->Shared->TexObjects, texture); } - diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h index b58c02fb8f..d359aa9ba2 100644 --- a/src/mesa/main/texobj.h +++ b/src/mesa/main/texobj.h @@ -1,10 +1,10 @@ -/* $Id: texobj.h,v 1.5 2000/11/22 07:32:17 joukj Exp $ */ +/* $Id: texobj.h,v 1.6 2001/03/12 00:48:39 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/main/texstate.h b/src/mesa/main/texstate.h index a3e825513c..551da19dcc 100644 --- a/src/mesa/main/texstate.h +++ b/src/mesa/main/texstate.h @@ -1,4 +1,4 @@ -/* $Id: texstate.h,v 1.6 2001/02/06 21:42:48 brianp Exp $ */ +/* $Id: texstate.h,v 1.7 2001/03/12 00:48:39 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -123,4 +123,3 @@ _mesa_ClientActiveTextureARB( GLenum target ); #endif - diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 4164e7a0df..3354f86407 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -1,4 +1,4 @@ -/* $Id: texstore.c,v 1.10 2001/03/07 05:06:12 brianp Exp $ */ +/* $Id: texstore.c,v 1.11 2001/03/12 00:48:39 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -1450,4 +1450,3 @@ _mesa_test_proxy_teximage(GLcontext *ctx, GLenum target, GLint level, return GL_TRUE; } - diff --git a/src/mesa/main/texutil.c b/src/mesa/main/texutil.c index 08e991f4aa..345d431d6e 100644 --- a/src/mesa/main/texutil.c +++ b/src/mesa/main/texutil.c @@ -1,10 +1,10 @@ -/* $Id: texutil.c,v 1.13 2001/03/07 05:06:12 brianp Exp $ */ +/* $Id: texutil.c,v 1.14 2001/03/12 00:48:39 gareth Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.4 + * 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/main/texutil.h b/src/mesa/main/texutil.h index 3cdd554550..03f7d28bf4 100644 --- a/src/mesa/main/texutil.h +++ b/src/mesa/main/texutil.h @@ -1,10 +1,10 @@ -/* $Id: texutil.h,v 1.7 2001/01/24 00:04:58 brianp Exp $ */ +/* $Id: texutil.h,v 1.8 2001/03/12 00:48:39 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"), @@ -90,4 +90,3 @@ _mesa_set_teximage_component_sizes(MesaIntTexFormat mesaFormat, #endif - diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index 6d63bc1195..54e471a5e8 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -1,10 +1,10 @@ -/* $Id: varray.c,v 1.38 2001/03/07 05:06:12 brianp Exp $ */ +/* $Id: varray.c,v 1.39 2001/03/12 00:48:39 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"), @@ -711,7 +711,7 @@ _mesa_LockArraysEXT(GLint first, GLsizei count) count <= (GLint) ctx->Const.MaxArrayLockSize) { ctx->Array.LockFirst = first; ctx->Array.LockCount = count; - } + } else { ctx->Array.LockFirst = 0; ctx->Array.LockCount = 0; diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h index c365d914a5..a99c0ab863 100644 --- a/src/mesa/main/varray.h +++ b/src/mesa/main/varray.h @@ -1,10 +1,10 @@ -/* $Id: varray.h,v 1.11 2000/11/24 10:25:06 keithw Exp $ */ +/* $Id: varray.h,v 1.12 2001/03/12 00:48:39 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/main/vtxfmt.c b/src/mesa/main/vtxfmt.c index b248cb8532..a9e7e67433 100644 --- a/src/mesa/main/vtxfmt.c +++ b/src/mesa/main/vtxfmt.c @@ -1,4 +1,4 @@ -/* $Id: vtxfmt.c,v 1.4 2001/03/11 23:55:19 gareth Exp $ */ +/* $Id: vtxfmt.c,v 1.5 2001/03/12 00:48:39 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -23,7 +23,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - * Author: + * Authors: * Keith Whitwell <keithw@valinux.com> * Gareth Hughes <gareth@valinux.com> */ @@ -154,6 +154,7 @@ void _mesa_init_exec_vtxfmt( GLcontext *ctx ) install_vtxfmt( ctx->Exec, &neutral_vtxfmt ); } + void _mesa_install_exec_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt ) { ctx->TnlModule.Current = vfmt; @@ -169,6 +170,7 @@ void _mesa_install_save_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt ) _mesa_loopback_prefer_float( ctx->Save, vfmt->prefer_float_colors ); } + void _mesa_restore_exec_vtxfmt( GLcontext *ctx ) { struct gl_tnl_module *tnl = &(ctx->TnlModule); diff --git a/src/mesa/main/vtxfmt.h b/src/mesa/main/vtxfmt.h index 945457ebd7..25a458936e 100644 --- a/src/mesa/main/vtxfmt.h +++ b/src/mesa/main/vtxfmt.h @@ -1,4 +1,4 @@ -/* $Id: vtxfmt.h,v 1.3 2001/03/11 23:49:20 gareth Exp $ */ +/* $Id: vtxfmt.h,v 1.4 2001/03/12 00:48:39 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -23,7 +23,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - * Author: + * Authors: * Keith Whitwell <keithw@valinux.com> * Gareth Hughes <gareth@valinux.com> */ diff --git a/src/mesa/main/vtxfmt_tmp.h b/src/mesa/main/vtxfmt_tmp.h index faea1d48c6..028e6dd9da 100644 --- a/src/mesa/main/vtxfmt_tmp.h +++ b/src/mesa/main/vtxfmt_tmp.h @@ -1,4 +1,4 @@ -/* $Id: vtxfmt_tmp.h,v 1.3 2001/03/11 18:49:11 gareth Exp $ */ +/* $Id: vtxfmt_tmp.h,v 1.4 2001/03/12 00:48:39 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -23,7 +23,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - * Author: + * Authors: * Gareth Hughes <gareth@valinux.com> */ |