diff options
| author | alanh <alanh> | 2002-02-21 11:42:58 +0000 |
|---|---|---|
| committer | alanh <alanh> | 2002-02-21 11:42:58 +0000 |
| commit | 2d199d5213980b750d501173dd77ba197e3d630d (patch) | |
| tree | 4486743646aea7423d4720f51320355d5c0f0db6 | |
| parent | 8ff570ee91379ead89e7b9141cdedda23ca60de9 (diff) | |
merge in current Mesa-4.0.x branch code
322 files changed, 415 insertions, 373 deletions
diff --git a/xc/extras/Mesa/docs/RELNOTES-4.0 b/xc/extras/Mesa/docs/RELNOTES-4.0 index 3e8ab0f0c..aa7e6e139 100644 --- a/xc/extras/Mesa/docs/RELNOTES-4.0 +++ b/xc/extras/Mesa/docs/RELNOTES-4.0 @@ -160,4 +160,4 @@ See the VERSIONS file for more details about bug fixes, etc. in Mesa 4.0. ---------------------------------------------------------------------- -$Id: RELNOTES-4.0,v 1.2 2002/02/14 01:59:27 dawes Exp $ +$Id: RELNOTES-4.0,v 1.3 2002/02/21 11:42:58 alanh Exp $ diff --git a/xc/extras/Mesa/docs/RELNOTES-4.0.1 b/xc/extras/Mesa/docs/RELNOTES-4.0.1 index 9425d2023..eb1f9a836 100644 --- a/xc/extras/Mesa/docs/RELNOTES-4.0.1 +++ b/xc/extras/Mesa/docs/RELNOTES-4.0.1 @@ -1,7 +1,7 @@ Mesa 4.0.1 release notes - November ??, 2001 + December 17, 2001 PLEASE READ!!!! @@ -16,7 +16,7 @@ Even numbered versions (such as 3.4) designate stable releases. Mesa 4.0.1 only contains bug fixes since version 4.0. -See the docs/VERSIONS file for a list of bug fixes. +See the docs/VERSIONS file for the list of bug fixes. ---------------------------------------------------------------------- -$Id: RELNOTES-4.0.1,v 1.2 2002/02/14 01:59:27 dawes Exp $ +$Id: RELNOTES-4.0.1,v 1.3 2002/02/21 11:42:58 alanh Exp $ diff --git a/xc/extras/Mesa/docs/VERSIONS b/xc/extras/Mesa/docs/VERSIONS index 69829e97a..87a65f2f4 100644 --- a/xc/extras/Mesa/docs/VERSIONS +++ b/xc/extras/Mesa/docs/VERSIONS @@ -1,4 +1,4 @@ -$Id: VERSIONS,v 1.4 2002/02/14 01:59:27 dawes Exp $ +$Id: VERSIONS,v 1.5 2002/02/21 11:42:58 alanh Exp $ Mesa Version History @@ -898,7 +898,7 @@ Mesa Version History - lighting didn't always produce the correct alpha value - fixed 3DNow! code to not read past end of arrays (Andrew Lewycky) -4.0.1 December 17, 2001 +4.0.1 December 17, 2001 New: - better sub-pixel sample positions for AA triangles (Ray Tice) - slightly faster blending for (GL_ZERO, GL_ONE) and (GL_ONE, GL_ZERO) @@ -925,3 +925,19 @@ Mesa Version History - feedback attributes for glDraw/CopyPixels and glBitmap were wrong - fixed bug in normal length caching (ParaView lighting bug) - fixed separate_specular color bug found in Chimera (18 Dec 2001) + +4.0.2 February ??, 2002 + New: + - New DOS (DJGPP) driver written by Daniel Borca + - New driver interface functions for TCL drivers (such as Radeon DRI) + Bug fixes: + - GL_BLEND with non-black texture env color wasn't always correct + - GL_REPLACE with GL_RGB texture format wasn't always correct (alpha) + - glTexEnviv( pname != GL_TEXTURE_ENV_COLOR ) was broken + - glReadPixels was sometimes mistakenly clipped by the scissor box + - glDraw/ReadPixels didn't catch all the errors that they should have + - Fixed 24bpp rendering problem in Windows driver (Karl Schultz) + - 16-bit GLchan mode fixes (m_trans_tmp.h, s_triangle.c) + - Fixed 1-bit float->int conversion bug in glDrawPixels(GL_DEPTH_COMP) + - glColorMask as sometimes effecting glXSwapBuffers() + - fixed a potential bug in XMesaGarbageCollect() diff --git a/xc/extras/Mesa/include/GL/gl.h b/xc/extras/Mesa/include/GL/gl.h index 6b3ef2e91..396287ec1 100644 --- a/xc/extras/Mesa/include/GL/gl.h +++ b/xc/extras/Mesa/include/GL/gl.h @@ -1,4 +1,4 @@ -/* $Id: gl.h,v 1.21 2002/02/14 01:59:27 dawes Exp $ */ +/* $Id: gl.h,v 1.22 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/include/GL/osmesa.h b/xc/extras/Mesa/include/GL/osmesa.h index e0d1b2b29..32b31b81d 100644 --- a/xc/extras/Mesa/include/GL/osmesa.h +++ b/xc/extras/Mesa/include/GL/osmesa.h @@ -1,4 +1,5 @@ -/* $XFree86: xc/extras/Mesa/include/GL/osmesa.h,v 1.3 2001/10/28 03:32:06 tsi Exp $ */ +/* $Id: osmesa.h,v 1.7 2002/02/21 11:42:58 alanh Exp $ */ + /* * Mesa 3-D graphics library * Version: 4.0 diff --git a/xc/extras/Mesa/include/GL/xmesa.h b/xc/extras/Mesa/include/GL/xmesa.h index 4e75acb0d..2fd151e76 100644 --- a/xc/extras/Mesa/include/GL/xmesa.h +++ b/xc/extras/Mesa/include/GL/xmesa.h @@ -1,4 +1,4 @@ -/* $Id: xmesa.h,v 1.9 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: xmesa.h,v 1.10 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/include/GL/xmesa_x.h b/xc/extras/Mesa/include/GL/xmesa_x.h index b0108ce52..4ac6c8dc9 100644 --- a/xc/extras/Mesa/include/GL/xmesa_x.h +++ b/xc/extras/Mesa/include/GL/xmesa_x.h @@ -30,7 +30,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Authors: * Kevin E. Martin <kevin@precisioninsight.com> * - * $Header: /home/ajax/dri-backup/xc/xc/extras/Mesa/include/GL/Attic/xmesa_x.h,v 1.5 2002/02/14 01:59:28 dawes Exp $ + * $Header: /home/ajax/dri-backup/xc/xc/extras/Mesa/include/GL/Attic/xmesa_x.h,v 1.6 2002/02/21 11:42:58 alanh Exp $ */ #ifndef _XMESA_X_H_ diff --git a/xc/extras/Mesa/include/GL/xmesa_xf86.h b/xc/extras/Mesa/include/GL/xmesa_xf86.h index 9818fe12c..d2dd74687 100644 --- a/xc/extras/Mesa/include/GL/xmesa_xf86.h +++ b/xc/extras/Mesa/include/GL/xmesa_xf86.h @@ -30,7 +30,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Authors: * Kevin E. Martin <kevin@precisioninsight.com> * - * $Header: /home/ajax/dri-backup/xc/xc/extras/Mesa/include/GL/Attic/xmesa_xf86.h,v 1.6 2002/02/14 01:59:28 dawes Exp $ + * $Header: /home/ajax/dri-backup/xc/xc/extras/Mesa/include/GL/Attic/xmesa_xf86.h,v 1.7 2002/02/21 11:42:58 alanh Exp $ */ #ifndef _XMESA_XF86_H_ diff --git a/xc/extras/Mesa/src/OSmesa/osmesa.c b/xc/extras/Mesa/src/OSmesa/osmesa.c index b3df78c47..afca3fbf0 100644 --- a/xc/extras/Mesa/src/OSmesa/osmesa.c +++ b/xc/extras/Mesa/src/OSmesa/osmesa.c @@ -1,3 +1,5 @@ +/* $Id: osmesa.c,v 1.11 2002/02/21 11:43:05 alanh Exp $ */ + /* * Mesa 3-D graphics library * Version: 3.5 diff --git a/xc/extras/Mesa/src/SPARC/clip.S b/xc/extras/Mesa/src/SPARC/clip.S index 20a450570..2d1e832f0 100644 --- a/xc/extras/Mesa/src/SPARC/clip.S +++ b/xc/extras/Mesa/src/SPARC/clip.S @@ -1,4 +1,4 @@ -/* $Id: clip.S,v 1.2 2002/02/14 01:59:35 dawes Exp $ */ +/* $Id: clip.S,v 1.3 2002/02/21 11:43:05 alanh Exp $ */ #ifdef __sparc_v9__ #define LDPTR ldx diff --git a/xc/extras/Mesa/src/SPARC/glapi_sparc.S b/xc/extras/Mesa/src/SPARC/glapi_sparc.S index f4dc927f2..9d3eb8e20 100644 --- a/xc/extras/Mesa/src/SPARC/glapi_sparc.S +++ b/xc/extras/Mesa/src/SPARC/glapi_sparc.S @@ -6114,9 +6114,9 @@ glFrustum: jmpl %g3, %g0 nop -GLOBL_FN(GL_PREFIX(LoadIdentity)) +.globl glLoadIdentity .type glLoadIdentity,#function -GL_PREFIX(LoadIdentity): +glLoadIdentity: #ifdef __sparc_v9__ sethi %hi(0x00000000), %g2 sethi %hi(0x00000000), %g1 diff --git a/xc/extras/Mesa/src/SPARC/norm.S b/xc/extras/Mesa/src/SPARC/norm.S index 6c3093494..f3f28943b 100644 --- a/xc/extras/Mesa/src/SPARC/norm.S +++ b/xc/extras/Mesa/src/SPARC/norm.S @@ -1,4 +1,4 @@ -/* $Id: norm.S,v 1.2 2002/02/14 01:59:35 dawes Exp $ */ +/* $Id: norm.S,v 1.3 2002/02/21 11:43:05 alanh Exp $ */ #include "sparc_matrix.h" diff --git a/xc/extras/Mesa/src/SPARC/sparc.c b/xc/extras/Mesa/src/SPARC/sparc.c index 07849131b..07095a683 100644 --- a/xc/extras/Mesa/src/SPARC/sparc.c +++ b/xc/extras/Mesa/src/SPARC/sparc.c @@ -1,4 +1,4 @@ -/* $Id: sparc.c,v 1.2 2002/02/14 01:59:35 dawes Exp $ */ +/* $Id: sparc.c,v 1.3 2002/02/21 11:43:05 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/SPARC/sparc.h b/xc/extras/Mesa/src/SPARC/sparc.h index a70dbe41d..b8b5235fa 100644 --- a/xc/extras/Mesa/src/SPARC/sparc.h +++ b/xc/extras/Mesa/src/SPARC/sparc.h @@ -1,4 +1,4 @@ -/* $Id: sparc.h,v 1.2 2002/02/14 01:59:35 dawes Exp $ */ +/* $Id: sparc.h,v 1.3 2002/02/21 11:43:05 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/SPARC/sparc_matrix.h b/xc/extras/Mesa/src/SPARC/sparc_matrix.h index 32f10bc52..740eee6ae 100644 --- a/xc/extras/Mesa/src/SPARC/sparc_matrix.h +++ b/xc/extras/Mesa/src/SPARC/sparc_matrix.h @@ -1,4 +1,4 @@ -/* $Id: sparc_matrix.h,v 1.2 2002/02/14 01:59:35 dawes Exp $ */ +/* $Id: sparc_matrix.h,v 1.3 2002/02/21 11:43:05 alanh Exp $ */ #ifndef _SPARC_MATRIX_H #define _SPARC_MATRIX_H diff --git a/xc/extras/Mesa/src/SPARC/xform.S b/xc/extras/Mesa/src/SPARC/xform.S index e822143dd..8a408a206 100644 --- a/xc/extras/Mesa/src/SPARC/xform.S +++ b/xc/extras/Mesa/src/SPARC/xform.S @@ -1,4 +1,4 @@ -/* $Id: xform.S,v 1.2 2002/02/14 01:59:35 dawes Exp $ */ +/* $Id: xform.S,v 1.3 2002/02/21 11:43:05 alanh Exp $ */ /* TODO * diff --git a/xc/extras/Mesa/src/X/fakeglx.c b/xc/extras/Mesa/src/X/fakeglx.c index 59f8fdcf6..2e85819cd 100644 --- a/xc/extras/Mesa/src/X/fakeglx.c +++ b/xc/extras/Mesa/src/X/fakeglx.c @@ -1,10 +1,10 @@ -/* $Id: fakeglx.c,v 1.16 2002/02/14 01:59:35 dawes Exp $ */ +/* $Id: fakeglx.c,v 1.17 2002/02/21 11:43:05 alanh Exp $ */ /* * Mesa 3-D graphics library - * Version: 4.0.1 + * Version: 4.0.2 * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -66,7 +66,7 @@ #define SERVER_MINOR_VERSION 4 /* This is appended onto the glXGetClient/ServerString version strings. */ -#define MESA_GLX_VERSION "Mesa 4.0.1" +#define MESA_GLX_VERSION "Mesa 4.0.2" /* Who implemented this GLX? */ #define VENDOR "Brian Paul" diff --git a/xc/extras/Mesa/src/X/glxapi.c b/xc/extras/Mesa/src/X/glxapi.c index 2a9e26861..6b3b0f25f 100644 --- a/xc/extras/Mesa/src/X/glxapi.c +++ b/xc/extras/Mesa/src/X/glxapi.c @@ -1,4 +1,4 @@ -/* $Id: glxapi.c,v 1.8 2002/02/14 01:59:35 dawes Exp $ */ +/* $Id: glxapi.c,v 1.9 2002/02/21 11:43:05 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X/glxapi.h b/xc/extras/Mesa/src/X/glxapi.h index 7db20d21a..bc5c71977 100644 --- a/xc/extras/Mesa/src/X/glxapi.h +++ b/xc/extras/Mesa/src/X/glxapi.h @@ -1,4 +1,4 @@ -/* $Id: glxapi.h,v 1.8 2002/02/14 01:59:35 dawes Exp $ */ +/* $Id: glxapi.h,v 1.9 2002/02/21 11:43:05 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X/glxheader.h b/xc/extras/Mesa/src/X/glxheader.h index 24e8b6994..3bbb26c4f 100644 --- a/xc/extras/Mesa/src/X/glxheader.h +++ b/xc/extras/Mesa/src/X/glxheader.h @@ -1,4 +1,4 @@ -/* $Id: glxheader.h,v 1.6 2002/02/14 01:59:35 dawes Exp $ */ +/* $Id: glxheader.h,v 1.7 2002/02/21 11:43:06 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X/realglx.c b/xc/extras/Mesa/src/X/realglx.c index 291e93cd8..07160645a 100644 --- a/xc/extras/Mesa/src/X/realglx.c +++ b/xc/extras/Mesa/src/X/realglx.c @@ -1,4 +1,4 @@ -/* $Id: realglx.c,v 1.5 2002/02/14 01:59:35 dawes Exp $ */ +/* $Id: realglx.c,v 1.6 2002/02/21 11:43:06 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X/realglx.h b/xc/extras/Mesa/src/X/realglx.h index 59d2539d1..94aa3b1de 100644 --- a/xc/extras/Mesa/src/X/realglx.h +++ b/xc/extras/Mesa/src/X/realglx.h @@ -1,4 +1,4 @@ -/* $Id: realglx.h,v 1.5 2002/02/14 01:59:35 dawes Exp $ */ +/* $Id: realglx.h,v 1.6 2002/02/21 11:43:06 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X/xfonts.c b/xc/extras/Mesa/src/X/xfonts.c index c8bc65d0c..147384995 100644 --- a/xc/extras/Mesa/src/X/xfonts.c +++ b/xc/extras/Mesa/src/X/xfonts.c @@ -1,4 +1,4 @@ -/* $Id: xfonts.c,v 1.10 2002/02/14 01:59:35 dawes Exp $ */ +/* $Id: xfonts.c,v 1.11 2002/02/21 11:43:06 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X/xfonts.h b/xc/extras/Mesa/src/X/xfonts.h index c206c48b2..0d778610f 100644 --- a/xc/extras/Mesa/src/X/xfonts.h +++ b/xc/extras/Mesa/src/X/xfonts.h @@ -1,4 +1,4 @@ -/* $Id: xfonts.h,v 1.2 2002/02/14 01:59:35 dawes Exp $ */ +/* $Id: xfonts.h,v 1.3 2002/02/21 11:43:06 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X/xm_api.c b/xc/extras/Mesa/src/X/xm_api.c index a8b96e18b..5149f759f 100644 --- a/xc/extras/Mesa/src/X/xm_api.c +++ b/xc/extras/Mesa/src/X/xm_api.c @@ -1,10 +1,10 @@ -/* $Id: xm_api.c,v 1.2 2002/02/14 01:59:35 dawes Exp $ */ +/* $Id: xm_api.c,v 1.3 2002/02/21 11:43:06 alanh Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 4.0.2 * - * Copyright (C) 1999-2000 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -1306,23 +1306,31 @@ static GLboolean initialize_visual_and_buffer( int client, #endif XMesaSetFunction( v->display, b->gc, GXcopy ); + /* cleargc - for glClear() */ +#ifdef XFree86Server + b->cleargc = CreateScratchGC(v->display, window->depth); +#else + b->cleargc = XCreateGC( v->display, window, 0, NULL ); +#endif + XMesaSetFunction( v->display, b->cleargc, GXcopy ); + /* * Don't generate Graphics Expose/NoExpose events in swapbuffers(). * Patch contributed by Michael Pichler May 15, 1995. */ #ifdef XFree86Server - b->cleargc = CreateScratchGC(v->display, window->depth); + b->swapgc = CreateScratchGC(v->display, window->depth); { CARD32 v[1]; v[0] = FALSE; - dixChangeGC(NullClient, b->cleargc, GCGraphicsExposures, v, NULL); + dixChangeGC(NullClient, b->swapgc, GCGraphicsExposures, v, NULL); } #else gcvalues.graphics_exposures = False; - b->cleargc = XCreateGC( v->display, window, + b->swapgc = XCreateGC( v->display, window, GCGraphicsExposures, &gcvalues); #endif - XMesaSetFunction( v->display, b->cleargc, GXcopy ); + XMesaSetFunction( v->display, b->swapgc, GXcopy ); /* * Set fill style and tile pixmap once for all for HPCR stuff * (instead of doing it each time in clear_color_HPCR_pixmap()) @@ -2022,6 +2030,7 @@ void XMesaDestroyBuffer( XMesaBuffer b ) if (b->gc) XMesaFreeGC( b->xm_visual->display, b->gc ); if (b->cleargc) XMesaFreeGC( b->xm_visual->display, b->cleargc ); + if (b->swapgc) XMesaFreeGC( b->xm_visual->display, b->swapgc ); if (b->backimage) { #if defined(USE_XSHM) && !defined(XFree86Server) @@ -2396,7 +2405,7 @@ void XMesaSwapBuffers( XMesaBuffer b ) if (b->shm) { /*_glthread_LOCK_MUTEX(_xmesa_lock);*/ XShmPutImage( b->xm_visual->display, b->frontbuffer, - b->cleargc, + b->swapgc, b->backimage, 0, 0, 0, 0, b->width, b->height, False ); /*_glthread_UNLOCK_MUTEX(_xmesa_lock);*/ @@ -2406,7 +2415,7 @@ void XMesaSwapBuffers( XMesaBuffer b ) { /*_glthread_LOCK_MUTEX(_xmesa_lock);*/ XMesaPutImage( b->xm_visual->display, b->frontbuffer, - b->cleargc, + b->swapgc, b->backimage, 0, 0, 0, 0, b->width, b->height ); /*_glthread_UNLOCK_MUTEX(_xmesa_lock);*/ @@ -2418,7 +2427,7 @@ void XMesaSwapBuffers( XMesaBuffer b ) XMesaCopyArea( b->xm_visual->display, b->backpixmap, /* source drawable */ b->frontbuffer, /* dest. drawable */ - b->cleargc, + b->swapgc, 0, 0, b->width, b->height, /* source region */ 0, 0 /* dest region */ ); @@ -2462,7 +2471,7 @@ void XMesaCopySubBuffer( XMesaBuffer b, int x, int y, int width, int height ) if (b->shm) { /* XXX assuming width and height aren't too large! */ XShmPutImage( b->xm_visual->display, b->frontbuffer, - b->cleargc, + b->swapgc, b->backimage, x, yTop, x, yTop, width, height, False ); /* wait for finished event??? */ @@ -2472,7 +2481,7 @@ void XMesaCopySubBuffer( XMesaBuffer b, int x, int y, int width, int height ) { /* XXX assuming width and height aren't too large! */ XMesaPutImage( b->xm_visual->display, b->frontbuffer, - b->cleargc, + b->swapgc, b->backimage, x, yTop, x, yTop, width, height ); } @@ -2482,7 +2491,7 @@ void XMesaCopySubBuffer( XMesaBuffer b, int x, int y, int width, int height ) XMesaCopyArea( b->xm_visual->display, b->backpixmap, /* source drawable */ b->frontbuffer, /* dest. drawable */ - b->cleargc, + b->swapgc, x, yTop, width, height, /* source region */ x, yTop /* dest region */ ); @@ -2596,7 +2605,7 @@ void XMesaGarbageCollect( void ) XMesaBuffer b, next; for (b=XMesaBufferList; b; b=next) { next = b->Next; - if (!b->pixmap_flag) { + if (b->display && b->frontbuffer && !b->pixmap_flag) { #ifdef XFree86Server /* NOT_NEEDED */ #else diff --git a/xc/extras/Mesa/src/X/xm_dd.c b/xc/extras/Mesa/src/X/xm_dd.c index b60c1a0e6..e226d63b5 100644 --- a/xc/extras/Mesa/src/X/xm_dd.c +++ b/xc/extras/Mesa/src/X/xm_dd.c @@ -1,10 +1,10 @@ -/* $Id: xm_dd.c,v 1.2 2002/02/14 01:59:36 dawes Exp $ */ +/* $Id: xm_dd.c,v 1.3 2002/02/21 11:43:06 alanh Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 4.0.2 * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -267,6 +267,7 @@ index_mask( GLcontext *ctx, GLuint mask ) else { m = (unsigned long) mask; } + XMesaSetPlaneMask( xmesa->display, xmesa->xm_buffer->gc, m ); XMesaSetPlaneMask( xmesa->display, xmesa->xm_buffer->cleargc, m ); } } @@ -281,8 +282,7 @@ color_mask(GLcontext *ctx, int xclass = GET_VISUAL_CLASS(xmesa->xm_visual); (void) amask; - if (xmesa->xm_buffer->buffer != XIMAGE - && (xclass == TrueColor || xclass == DirectColor)) { + if (xclass == TrueColor || xclass == DirectColor) { unsigned long m; if (rmask && gmask && bmask) { m = ((unsigned long)~0L); @@ -293,6 +293,7 @@ color_mask(GLcontext *ctx, if (gmask) m |= GET_GREENMASK(xmesa->xm_visual); if (bmask) m |= GET_BLUEMASK(xmesa->xm_visual); } + XMesaSetPlaneMask( xmesa->display, xmesa->xm_buffer->gc, m ); XMesaSetPlaneMask( xmesa->display, xmesa->xm_buffer->cleargc, m ); } } diff --git a/xc/extras/Mesa/src/X/xm_line.c b/xc/extras/Mesa/src/X/xm_line.c index 0137c8b95..771353dc9 100644 --- a/xc/extras/Mesa/src/X/xm_line.c +++ b/xc/extras/Mesa/src/X/xm_line.c @@ -1,4 +1,4 @@ -/* $Id: xm_line.c,v 1.2 2002/02/14 01:59:36 dawes Exp $ */ +/* $Id: xm_line.c,v 1.3 2002/02/21 11:43:06 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X/xm_span.c b/xc/extras/Mesa/src/X/xm_span.c index 416f17568..74329d3ff 100644 --- a/xc/extras/Mesa/src/X/xm_span.c +++ b/xc/extras/Mesa/src/X/xm_span.c @@ -1,4 +1,4 @@ -/* $Id: xm_span.c,v 1.2 2002/02/14 01:59:36 dawes Exp $ */ +/* $Id: xm_span.c,v 1.3 2002/02/21 11:43:06 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X/xm_tri.c b/xc/extras/Mesa/src/X/xm_tri.c index 8aa92f0f0..ee38a1550 100644 --- a/xc/extras/Mesa/src/X/xm_tri.c +++ b/xc/extras/Mesa/src/X/xm_tri.c @@ -1,4 +1,4 @@ -/* $Id: xm_tri.c,v 1.2 2002/02/14 01:59:36 dawes Exp $ */ +/* $Id: xm_tri.c,v 1.3 2002/02/21 11:43:06 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X/xmesaP.h b/xc/extras/Mesa/src/X/xmesaP.h index fe4e41765..037b28a5f 100644 --- a/xc/extras/Mesa/src/X/xmesaP.h +++ b/xc/extras/Mesa/src/X/xmesaP.h @@ -1,10 +1,10 @@ -/* $Id: xmesaP.h,v 1.15 2002/02/14 01:59:36 dawes Exp $ */ +/* $Id: xmesaP.h,v 1.16 2002/02/21 11:43:06 alanh Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 4.0.2 * - * Copyright (C) 1999-2000 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -190,6 +190,7 @@ struct xmesa_buffer { XMesaGC gc; /* scratch GC for span, line, tri drawing */ XMesaGC cleargc; /* GC for clearing the color buffer */ + XMesaGC swapgc; /* GC for swapping the color buffers */ /* The following are here instead of in the XMesaVisual * because they depend on the window's colormap. diff --git a/xc/extras/Mesa/src/X86/3dnow.c b/xc/extras/Mesa/src/X86/3dnow.c index 8cea7cfc6..73950f5af 100644 --- a/xc/extras/Mesa/src/X86/3dnow.c +++ b/xc/extras/Mesa/src/X86/3dnow.c @@ -1,4 +1,4 @@ -/* $Id: 3dnow.c,v 1.10 2002/02/14 01:59:36 dawes Exp $ */ +/* $Id: 3dnow.c,v 1.11 2002/02/21 11:43:06 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/3dnow.h b/xc/extras/Mesa/src/X86/3dnow.h index 458939fe2..7a17cf9e5 100644 --- a/xc/extras/Mesa/src/X86/3dnow.h +++ b/xc/extras/Mesa/src/X86/3dnow.h @@ -1,4 +1,4 @@ -/* $Id: 3dnow.h,v 1.7 2002/02/14 01:59:36 dawes Exp $ */ +/* $Id: 3dnow.h,v 1.8 2002/02/21 11:43:06 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/3dnow_normal.S b/xc/extras/Mesa/src/X86/3dnow_normal.S index 93826ded0..be6bfd44a 100644 --- a/xc/extras/Mesa/src/X86/3dnow_normal.S +++ b/xc/extras/Mesa/src/X86/3dnow_normal.S @@ -1,4 +1,4 @@ -/* $Id: 3dnow_normal.S,v 1.2 2002/02/14 01:59:36 dawes Exp $ */ +/* $Id: 3dnow_normal.S,v 1.3 2002/02/21 11:43:06 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/3dnow_xform1.S b/xc/extras/Mesa/src/X86/3dnow_xform1.S index a297167d2..24526dc3c 100644 --- a/xc/extras/Mesa/src/X86/3dnow_xform1.S +++ b/xc/extras/Mesa/src/X86/3dnow_xform1.S @@ -1,4 +1,4 @@ -/* $Id: 3dnow_xform1.S,v 1.2 2002/02/14 01:59:37 dawes Exp $ */ +/* $Id: 3dnow_xform1.S,v 1.3 2002/02/21 11:43:06 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/3dnow_xform2.S b/xc/extras/Mesa/src/X86/3dnow_xform2.S index 8f5a094b5..99347d91d 100644 --- a/xc/extras/Mesa/src/X86/3dnow_xform2.S +++ b/xc/extras/Mesa/src/X86/3dnow_xform2.S @@ -1,4 +1,4 @@ -/* $Id: 3dnow_xform2.S,v 1.2 2002/02/14 01:59:37 dawes Exp $ */ +/* $Id: 3dnow_xform2.S,v 1.3 2002/02/21 11:43:06 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/3dnow_xform3.S b/xc/extras/Mesa/src/X86/3dnow_xform3.S index 2bca747d1..9360b8c64 100644 --- a/xc/extras/Mesa/src/X86/3dnow_xform3.S +++ b/xc/extras/Mesa/src/X86/3dnow_xform3.S @@ -1,4 +1,4 @@ -/* $Id: 3dnow_xform3.S,v 1.2 2002/02/14 01:59:37 dawes Exp $ */ +/* $Id: 3dnow_xform3.S,v 1.3 2002/02/21 11:43:06 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/3dnow_xform4.S b/xc/extras/Mesa/src/X86/3dnow_xform4.S index a5985e008..a23529341 100644 --- a/xc/extras/Mesa/src/X86/3dnow_xform4.S +++ b/xc/extras/Mesa/src/X86/3dnow_xform4.S @@ -1,4 +1,4 @@ -/* $Id: 3dnow_xform4.S,v 1.2 2002/02/14 01:59:37 dawes Exp $ */ +/* $Id: 3dnow_xform4.S,v 1.3 2002/02/21 11:43:06 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/assyntax.h b/xc/extras/Mesa/src/X86/assyntax.h index cc703e3a0..ee56080e7 100644 --- a/xc/extras/Mesa/src/X86/assyntax.h +++ b/xc/extras/Mesa/src/X86/assyntax.h @@ -1,4 +1,4 @@ -/* $Id: assyntax.h,v 1.9 2002/02/14 01:59:37 dawes Exp $ */ +/* $Id: assyntax.h,v 1.10 2002/02/21 11:43:07 alanh Exp $ */ #ifndef __ASSYNTAX_H__ #define __ASSYNTAX_H__ diff --git a/xc/extras/Mesa/src/X86/clip_args.h b/xc/extras/Mesa/src/X86/clip_args.h index 17572bb38..80041ea54 100644 --- a/xc/extras/Mesa/src/X86/clip_args.h +++ b/xc/extras/Mesa/src/X86/clip_args.h @@ -1,4 +1,4 @@ -/* $Id: clip_args.h,v 1.3 2002/02/14 01:59:37 dawes Exp $ */ +/* $Id: clip_args.h,v 1.4 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/common_x86.c b/xc/extras/Mesa/src/X86/common_x86.c index 345e6b309..00e516f8d 100644 --- a/xc/extras/Mesa/src/X86/common_x86.c +++ b/xc/extras/Mesa/src/X86/common_x86.c @@ -1,4 +1,4 @@ -/* $Id: common_x86.c,v 1.12 2002/02/14 01:59:37 dawes Exp $ */ +/* $Id: common_x86.c,v 1.13 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/common_x86_asm.S b/xc/extras/Mesa/src/X86/common_x86_asm.S index 87ca702a3..13fe40f41 100644 --- a/xc/extras/Mesa/src/X86/common_x86_asm.S +++ b/xc/extras/Mesa/src/X86/common_x86_asm.S @@ -1,4 +1,4 @@ -/* $Id: common_x86_asm.S,v 1.8 2002/02/14 01:59:37 dawes Exp $ */ +/* $Id: common_x86_asm.S,v 1.9 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/common_x86_asm.h b/xc/extras/Mesa/src/X86/common_x86_asm.h index 2a0424e4d..1fb050b67 100644 --- a/xc/extras/Mesa/src/X86/common_x86_asm.h +++ b/xc/extras/Mesa/src/X86/common_x86_asm.h @@ -1,4 +1,4 @@ -/* $Id: common_x86_asm.h,v 1.4 2002/02/14 01:59:37 dawes Exp $ */ +/* $Id: common_x86_asm.h,v 1.5 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/common_x86_features.h b/xc/extras/Mesa/src/X86/common_x86_features.h index 9fa14b3a4..ee402e763 100644 --- a/xc/extras/Mesa/src/X86/common_x86_features.h +++ b/xc/extras/Mesa/src/X86/common_x86_features.h @@ -1,4 +1,4 @@ -/* $Id: common_x86_features.h,v 1.3 2002/02/14 01:59:37 dawes Exp $ */ +/* $Id: common_x86_features.h,v 1.4 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/common_x86_macros.h b/xc/extras/Mesa/src/X86/common_x86_macros.h index 58705afa7..fdf148e13 100644 --- a/xc/extras/Mesa/src/X86/common_x86_macros.h +++ b/xc/extras/Mesa/src/X86/common_x86_macros.h @@ -1,4 +1,4 @@ -/* $Id: common_x86_macros.h,v 1.2 2002/02/14 01:59:37 dawes Exp $ */ +/* $Id: common_x86_macros.h,v 1.3 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/gen_matypes.c b/xc/extras/Mesa/src/X86/gen_matypes.c index 19250af14..0552ae4d0 100644 --- a/xc/extras/Mesa/src/X86/gen_matypes.c +++ b/xc/extras/Mesa/src/X86/gen_matypes.c @@ -1,4 +1,4 @@ -/* $Id: gen_matypes.c,v 1.2 2002/02/14 01:59:37 dawes Exp $ */ +/* $Id: gen_matypes.c,v 1.3 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/mmx.h b/xc/extras/Mesa/src/X86/mmx.h index c12e7551b..5b81fd22a 100644 --- a/xc/extras/Mesa/src/X86/mmx.h +++ b/xc/extras/Mesa/src/X86/mmx.h @@ -1,4 +1,4 @@ -/* $Id: mmx.h,v 1.4 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: mmx.h,v 1.5 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/norm_args.h b/xc/extras/Mesa/src/X86/norm_args.h index c34795ce7..aaea3a512 100644 --- a/xc/extras/Mesa/src/X86/norm_args.h +++ b/xc/extras/Mesa/src/X86/norm_args.h @@ -1,4 +1,4 @@ -/* $Id: norm_args.h,v 1.2 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: norm_args.h,v 1.3 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/sse.c b/xc/extras/Mesa/src/X86/sse.c index e531ced9d..89c46958a 100644 --- a/xc/extras/Mesa/src/X86/sse.c +++ b/xc/extras/Mesa/src/X86/sse.c @@ -1,4 +1,4 @@ -/* $Id: sse.c,v 1.2 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: sse.c,v 1.3 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/sse.h b/xc/extras/Mesa/src/X86/sse.h index ec58c8fe4..a62fced2c 100644 --- a/xc/extras/Mesa/src/X86/sse.h +++ b/xc/extras/Mesa/src/X86/sse.h @@ -1,4 +1,4 @@ -/* $Id: sse.h,v 1.2 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: sse.h,v 1.3 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/sse_normal.S b/xc/extras/Mesa/src/X86/sse_normal.S index 50bbc10be..2453839af 100644 --- a/xc/extras/Mesa/src/X86/sse_normal.S +++ b/xc/extras/Mesa/src/X86/sse_normal.S @@ -1,4 +1,4 @@ -/* $Id: sse_normal.S,v 1.2 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: sse_normal.S,v 1.3 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/sse_xform1.S b/xc/extras/Mesa/src/X86/sse_xform1.S index 4ca91aa22..3c45a1c8b 100644 --- a/xc/extras/Mesa/src/X86/sse_xform1.S +++ b/xc/extras/Mesa/src/X86/sse_xform1.S @@ -1,4 +1,4 @@ -/* $Id: sse_xform1.S,v 1.2 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: sse_xform1.S,v 1.3 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/sse_xform2.S b/xc/extras/Mesa/src/X86/sse_xform2.S index 50709a32d..be383b8e8 100644 --- a/xc/extras/Mesa/src/X86/sse_xform2.S +++ b/xc/extras/Mesa/src/X86/sse_xform2.S @@ -1,4 +1,4 @@ -/* $Id: sse_xform2.S,v 1.2 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: sse_xform2.S,v 1.3 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/sse_xform3.S b/xc/extras/Mesa/src/X86/sse_xform3.S index 647741e59..c56712a10 100644 --- a/xc/extras/Mesa/src/X86/sse_xform3.S +++ b/xc/extras/Mesa/src/X86/sse_xform3.S @@ -1,4 +1,4 @@ -/* $Id: sse_xform3.S,v 1.2 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: sse_xform3.S,v 1.3 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/sse_xform4.S b/xc/extras/Mesa/src/X86/sse_xform4.S index d8b76120c..b821706a5 100644 --- a/xc/extras/Mesa/src/X86/sse_xform4.S +++ b/xc/extras/Mesa/src/X86/sse_xform4.S @@ -1,4 +1,4 @@ -/* $Id: sse_xform4.S,v 1.2 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: sse_xform4.S,v 1.3 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/x86.c b/xc/extras/Mesa/src/X86/x86.c index dfd38101e..231751d2a 100644 --- a/xc/extras/Mesa/src/X86/x86.c +++ b/xc/extras/Mesa/src/X86/x86.c @@ -1,4 +1,4 @@ -/* $Id: x86.c,v 1.10 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: x86.c,v 1.11 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/x86.h b/xc/extras/Mesa/src/X86/x86.h index b6dbd7b98..480a6d53b 100644 --- a/xc/extras/Mesa/src/X86/x86.h +++ b/xc/extras/Mesa/src/X86/x86.h @@ -1,4 +1,4 @@ -/* $Id: x86.h,v 1.6 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: x86.h,v 1.7 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/x86_cliptest.S b/xc/extras/Mesa/src/X86/x86_cliptest.S index 4a07de438..e065f077e 100644 --- a/xc/extras/Mesa/src/X86/x86_cliptest.S +++ b/xc/extras/Mesa/src/X86/x86_cliptest.S @@ -1,4 +1,4 @@ -/* $Id: x86_cliptest.S,v 1.3 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: x86_cliptest.S,v 1.4 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/x86_xform2.S b/xc/extras/Mesa/src/X86/x86_xform2.S index ba6ab56e4..bc808d590 100644 --- a/xc/extras/Mesa/src/X86/x86_xform2.S +++ b/xc/extras/Mesa/src/X86/x86_xform2.S @@ -1,4 +1,4 @@ -/* $Id: x86_xform2.S,v 1.2 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: x86_xform2.S,v 1.3 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/x86_xform3.S b/xc/extras/Mesa/src/X86/x86_xform3.S index 2a863a65b..ad33271aa 100644 --- a/xc/extras/Mesa/src/X86/x86_xform3.S +++ b/xc/extras/Mesa/src/X86/x86_xform3.S @@ -1,4 +1,4 @@ -/* $Id: x86_xform3.S,v 1.2 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: x86_xform3.S,v 1.3 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/x86_xform4.S b/xc/extras/Mesa/src/X86/x86_xform4.S index ef3ae192c..7da9b4df4 100644 --- a/xc/extras/Mesa/src/X86/x86_xform4.S +++ b/xc/extras/Mesa/src/X86/x86_xform4.S @@ -1,4 +1,4 @@ -/* $Id: x86_xform4.S,v 1.2 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: x86_xform4.S,v 1.3 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/X86/xform_args.h b/xc/extras/Mesa/src/X86/xform_args.h index 7030caf36..9618749a7 100644 --- a/xc/extras/Mesa/src/X86/xform_args.h +++ b/xc/extras/Mesa/src/X86/xform_args.h @@ -1,4 +1,4 @@ -/* $Id: xform_args.h,v 1.3 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: xform_args.h,v 1.4 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/accum.c b/xc/extras/Mesa/src/accum.c index c6bfc129b..2de4a3d51 100644 --- a/xc/extras/Mesa/src/accum.c +++ b/xc/extras/Mesa/src/accum.c @@ -1,4 +1,4 @@ -/* $Id: accum.c,v 1.15 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: accum.c,v 1.16 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/accum.h b/xc/extras/Mesa/src/accum.h index 72d67737b..f972b1579 100644 --- a/xc/extras/Mesa/src/accum.h +++ b/xc/extras/Mesa/src/accum.h @@ -1,4 +1,4 @@ -/* $Id: accum.h,v 1.7 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: accum.h,v 1.8 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/all.h b/xc/extras/Mesa/src/all.h index 4686d03ac..4a0118155 100644 --- a/xc/extras/Mesa/src/all.h +++ b/xc/extras/Mesa/src/all.h @@ -1,4 +1,4 @@ -/* $Id: all.h,v 1.8 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: all.h,v 1.9 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/api_arrayelt.c b/xc/extras/Mesa/src/api_arrayelt.c index 4e38d3a7d..cacf2abe8 100644 --- a/xc/extras/Mesa/src/api_arrayelt.c +++ b/xc/extras/Mesa/src/api_arrayelt.c @@ -1,4 +1,4 @@ -/* $Id: api_arrayelt.c,v 1.2 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: api_arrayelt.c,v 1.3 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/api_arrayelt.h b/xc/extras/Mesa/src/api_arrayelt.h index bc8e7ca24..fb73ca04d 100644 --- a/xc/extras/Mesa/src/api_arrayelt.h +++ b/xc/extras/Mesa/src/api_arrayelt.h @@ -1,4 +1,4 @@ -/* $Id: api_arrayelt.h,v 1.2 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: api_arrayelt.h,v 1.3 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/api_eval.c b/xc/extras/Mesa/src/api_eval.c index d69340c76..b17056347 100644 --- a/xc/extras/Mesa/src/api_eval.c +++ b/xc/extras/Mesa/src/api_eval.c @@ -1,4 +1,4 @@ -/* $Id: api_eval.c,v 1.2 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: api_eval.c,v 1.3 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/api_eval.h b/xc/extras/Mesa/src/api_eval.h index b1a340be4..1a1b41ef4 100644 --- a/xc/extras/Mesa/src/api_eval.h +++ b/xc/extras/Mesa/src/api_eval.h @@ -1,4 +1,4 @@ -/* $Id: api_eval.h,v 1.2 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: api_eval.h,v 1.3 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/api_loopback.c b/xc/extras/Mesa/src/api_loopback.c index 9a61e4a9e..3fe93d85c 100644 --- a/xc/extras/Mesa/src/api_loopback.c +++ b/xc/extras/Mesa/src/api_loopback.c @@ -1,4 +1,4 @@ -/* $Id: api_loopback.c,v 1.2 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: api_loopback.c,v 1.3 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/api_loopback.h b/xc/extras/Mesa/src/api_loopback.h index 4bfe22207..47fb9d1b1 100644 --- a/xc/extras/Mesa/src/api_loopback.h +++ b/xc/extras/Mesa/src/api_loopback.h @@ -1,4 +1,4 @@ -/* $Id: api_loopback.h,v 1.2 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: api_loopback.h,v 1.3 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/api_noop.c b/xc/extras/Mesa/src/api_noop.c index 8a90927e9..a6b58b5d6 100644 --- a/xc/extras/Mesa/src/api_noop.c +++ b/xc/extras/Mesa/src/api_noop.c @@ -1,4 +1,4 @@ -/* $Id: api_noop.c,v 1.2 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: api_noop.c,v 1.3 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/api_noop.h b/xc/extras/Mesa/src/api_noop.h index f29a1cdc8..7efe16aa5 100644 --- a/xc/extras/Mesa/src/api_noop.h +++ b/xc/extras/Mesa/src/api_noop.h @@ -1,4 +1,4 @@ -/* $Id: api_noop.h,v 1.2 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: api_noop.h,v 1.3 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/api_validate.c b/xc/extras/Mesa/src/api_validate.c index 933b813d9..1f3df89b8 100644 --- a/xc/extras/Mesa/src/api_validate.c +++ b/xc/extras/Mesa/src/api_validate.c @@ -1,4 +1,4 @@ -/* $Id: api_validate.c,v 1.2 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: api_validate.c,v 1.3 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/api_validate.h b/xc/extras/Mesa/src/api_validate.h index 99189e033..08e22a985 100644 --- a/xc/extras/Mesa/src/api_validate.h +++ b/xc/extras/Mesa/src/api_validate.h @@ -1,4 +1,4 @@ -/* $Id: api_validate.h,v 1.2 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: api_validate.h,v 1.3 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/array_cache/ac_context.c b/xc/extras/Mesa/src/array_cache/ac_context.c index 163967e12..5c7f0477d 100644 --- a/xc/extras/Mesa/src/array_cache/ac_context.c +++ b/xc/extras/Mesa/src/array_cache/ac_context.c @@ -1,4 +1,4 @@ -/* $Id: ac_context.c,v 1.2 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: ac_context.c,v 1.3 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/array_cache/ac_context.h b/xc/extras/Mesa/src/array_cache/ac_context.h index f5986022b..26f192791 100644 --- a/xc/extras/Mesa/src/array_cache/ac_context.h +++ b/xc/extras/Mesa/src/array_cache/ac_context.h @@ -1,4 +1,4 @@ -/* $Id: ac_context.h,v 1.2 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: ac_context.h,v 1.3 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/array_cache/ac_import.c b/xc/extras/Mesa/src/array_cache/ac_import.c index f4c14ead4..44fa869cd 100644 --- a/xc/extras/Mesa/src/array_cache/ac_import.c +++ b/xc/extras/Mesa/src/array_cache/ac_import.c @@ -1,4 +1,4 @@ -/* $Id: ac_import.c,v 1.2 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: ac_import.c,v 1.3 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/array_cache/acache.h b/xc/extras/Mesa/src/array_cache/acache.h index 4b81fb6b8..931a11b77 100644 --- a/xc/extras/Mesa/src/array_cache/acache.h +++ b/xc/extras/Mesa/src/array_cache/acache.h @@ -1,4 +1,4 @@ -/* $Id: acache.h,v 1.2 2002/02/14 01:59:38 dawes Exp $ */ +/* $Id: acache.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/attrib.c b/xc/extras/Mesa/src/attrib.c index e261eca29..a1ac6aa3c 100644 --- a/xc/extras/Mesa/src/attrib.c +++ b/xc/extras/Mesa/src/attrib.c @@ -1,4 +1,4 @@ -/* $Id: attrib.c,v 1.15 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: attrib.c,v 1.16 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/attrib.h b/xc/extras/Mesa/src/attrib.h index 738e194ee..94f1f5ce7 100644 --- a/xc/extras/Mesa/src/attrib.h +++ b/xc/extras/Mesa/src/attrib.h @@ -1,4 +1,4 @@ -/* $Id: attrib.h,v 1.7 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: attrib.h,v 1.8 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/blend.c b/xc/extras/Mesa/src/blend.c index ae14ea0cd..35ff97f09 100644 --- a/xc/extras/Mesa/src/blend.c +++ b/xc/extras/Mesa/src/blend.c @@ -1,4 +1,4 @@ -/* $Id: blend.c,v 1.13 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: blend.c,v 1.14 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/blend.h b/xc/extras/Mesa/src/blend.h index df33150cb..3433a60f8 100644 --- a/xc/extras/Mesa/src/blend.h +++ b/xc/extras/Mesa/src/blend.h @@ -1,4 +1,4 @@ -/* $Id: blend.h,v 1.8 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: blend.h,v 1.9 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/buffers.c b/xc/extras/Mesa/src/buffers.c index 3635622ed..374a4ef11 100644 --- a/xc/extras/Mesa/src/buffers.c +++ b/xc/extras/Mesa/src/buffers.c @@ -1,4 +1,4 @@ -/* $Id: buffers.c,v 1.10 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: buffers.c,v 1.11 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/buffers.h b/xc/extras/Mesa/src/buffers.h index df437e38f..d413cbe64 100644 --- a/xc/extras/Mesa/src/buffers.h +++ b/xc/extras/Mesa/src/buffers.h @@ -1,4 +1,4 @@ -/* $Id: buffers.h,v 1.4 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: buffers.h,v 1.5 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/clip.c b/xc/extras/Mesa/src/clip.c index 59e0e4f34..dcf2f9e0f 100644 --- a/xc/extras/Mesa/src/clip.c +++ b/xc/extras/Mesa/src/clip.c @@ -1,4 +1,4 @@ -/* $Id: clip.c,v 1.10 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: clip.c,v 1.11 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/clip.h b/xc/extras/Mesa/src/clip.h index 33a26b811..e70ca1383 100644 --- a/xc/extras/Mesa/src/clip.h +++ b/xc/extras/Mesa/src/clip.h @@ -1,4 +1,4 @@ -/* $Id: clip.h,v 1.7 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: clip.h,v 1.8 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/colormac.h b/xc/extras/Mesa/src/colormac.h index fccf0bd93..d561b4ee8 100644 --- a/xc/extras/Mesa/src/colormac.h +++ b/xc/extras/Mesa/src/colormac.h @@ -1,4 +1,4 @@ -/* $Id: colormac.h,v 1.2 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: colormac.h,v 1.3 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/colortab.c b/xc/extras/Mesa/src/colortab.c index 4c58594c2..478e9ad90 100644 --- a/xc/extras/Mesa/src/colortab.c +++ b/xc/extras/Mesa/src/colortab.c @@ -1,4 +1,4 @@ -/* $Id: colortab.c,v 1.17 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: colortab.c,v 1.18 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/colortab.h b/xc/extras/Mesa/src/colortab.h index df364bb9a..905cc8231 100644 --- a/xc/extras/Mesa/src/colortab.h +++ b/xc/extras/Mesa/src/colortab.h @@ -1,4 +1,4 @@ -/* $Id: colortab.h,v 1.9 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: colortab.h,v 1.10 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/config.c b/xc/extras/Mesa/src/config.c index 180cf7e1f..f885e0970 100644 --- a/xc/extras/Mesa/src/config.c +++ b/xc/extras/Mesa/src/config.c @@ -1,4 +1,4 @@ -/* $Id: config.c,v 1.13 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: config.c,v 1.14 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/config.h b/xc/extras/Mesa/src/config.h index 17e371c35..a2cecf508 100644 --- a/xc/extras/Mesa/src/config.h +++ b/xc/extras/Mesa/src/config.h @@ -1,4 +1,4 @@ -/* $Id: config.h,v 1.15 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: config.h,v 1.16 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/context.c b/xc/extras/Mesa/src/context.c index ba26e321e..c3112315e 100644 --- a/xc/extras/Mesa/src/context.c +++ b/xc/extras/Mesa/src/context.c @@ -1,4 +1,4 @@ -/* $Id: context.c,v 1.19 2002/02/14 01:59:28 dawes Exp $ */ +/* $Id: context.c,v 1.20 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/context.h b/xc/extras/Mesa/src/context.h index 996d09e3d..dfe5eaf05 100644 --- a/xc/extras/Mesa/src/context.h +++ b/xc/extras/Mesa/src/context.h @@ -1,4 +1,4 @@ -/* $Id: context.h,v 1.11 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: context.h,v 1.12 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/convolve.c b/xc/extras/Mesa/src/convolve.c index e2776311d..4eb21ac8c 100644 --- a/xc/extras/Mesa/src/convolve.c +++ b/xc/extras/Mesa/src/convolve.c @@ -1,4 +1,4 @@ -/* $Id: convolve.c,v 1.3 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: convolve.c,v 1.4 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/convolve.h b/xc/extras/Mesa/src/convolve.h index 212297819..bde897f7a 100644 --- a/xc/extras/Mesa/src/convolve.h +++ b/xc/extras/Mesa/src/convolve.h @@ -1,4 +1,4 @@ -/* $Id: convolve.h,v 1.2 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: convolve.h,v 1.3 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/dd.h b/xc/extras/Mesa/src/dd.h index a4158f6c0..083abade0 100644 --- a/xc/extras/Mesa/src/dd.h +++ b/xc/extras/Mesa/src/dd.h @@ -1,4 +1,5 @@ -/* $XFree86: xc/extras/Mesa/src/dd.h,v 1.11 2001/10/28 03:32:06 tsi Exp $ */ +/* $Id: dd.h,v 1.16 2002/02/21 11:42:59 alanh Exp $ */ + /* * Mesa 3-D graphics library * Version: 3.5 @@ -469,8 +470,6 @@ struct dd_function_table { void (*BlendFuncSeparate)(GLcontext *ctx, GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorA, GLenum dfactorA); - void (*BlendConstColor)(GLcontext *ctx, GLfloat red, GLfloat green, - GLfloat blue, GLfloat alpha); void (*ClearColor)(GLcontext *ctx, const GLchan color[4]); void (*ClearDepth)(GLcontext *ctx, GLclampd d); void (*ClearIndex)(GLcontext *ctx, GLuint index); diff --git a/xc/extras/Mesa/src/debug.c b/xc/extras/Mesa/src/debug.c index a312a1567..5b7a65ac8 100644 --- a/xc/extras/Mesa/src/debug.c +++ b/xc/extras/Mesa/src/debug.c @@ -1,4 +1,4 @@ -/* $Id: debug.c,v 1.2 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: debug.c,v 1.3 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/debug.h b/xc/extras/Mesa/src/debug.h index 2c25f53b9..4c843bdd1 100644 --- a/xc/extras/Mesa/src/debug.h +++ b/xc/extras/Mesa/src/debug.h @@ -1,4 +1,4 @@ -/* $Id: debug.h,v 1.2 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: debug.h,v 1.3 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/depth.c b/xc/extras/Mesa/src/depth.c index 39c1e93bd..131ad19b9 100644 --- a/xc/extras/Mesa/src/depth.c +++ b/xc/extras/Mesa/src/depth.c @@ -1,4 +1,4 @@ -/* $Id: depth.c,v 1.11 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: depth.c,v 1.12 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/depth.h b/xc/extras/Mesa/src/depth.h index e4e202df4..44ab427d0 100644 --- a/xc/extras/Mesa/src/depth.h +++ b/xc/extras/Mesa/src/depth.h @@ -1,4 +1,4 @@ -/* $Id: depth.h,v 1.9 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: depth.h,v 1.10 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/dispatch.c b/xc/extras/Mesa/src/dispatch.c index e054feb93..a2df4143b 100644 --- a/xc/extras/Mesa/src/dispatch.c +++ b/xc/extras/Mesa/src/dispatch.c @@ -1,4 +1,4 @@ -/* $Id: dispatch.c,v 1.6 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: dispatch.c,v 1.7 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/dlist.c b/xc/extras/Mesa/src/dlist.c index 7b325c181..712c37ade 100644 --- a/xc/extras/Mesa/src/dlist.c +++ b/xc/extras/Mesa/src/dlist.c @@ -1,4 +1,4 @@ -/* $Id: dlist.c,v 1.17 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: dlist.c,v 1.18 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/dlist.h b/xc/extras/Mesa/src/dlist.h index 717e6783f..81cff1aeb 100644 --- a/xc/extras/Mesa/src/dlist.h +++ b/xc/extras/Mesa/src/dlist.h @@ -1,4 +1,4 @@ -/* $Id: dlist.h,v 1.9 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: dlist.h,v 1.10 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/drawpix.c b/xc/extras/Mesa/src/drawpix.c index 05ac9a0b0..9a07b1f87 100644 --- a/xc/extras/Mesa/src/drawpix.c +++ b/xc/extras/Mesa/src/drawpix.c @@ -1,4 +1,4 @@ -/* $Id: drawpix.c,v 1.14 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: drawpix.c,v 1.15 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/drawpix.h b/xc/extras/Mesa/src/drawpix.h index a722e1dbd..b482529b4 100644 --- a/xc/extras/Mesa/src/drawpix.h +++ b/xc/extras/Mesa/src/drawpix.h @@ -1,4 +1,4 @@ -/* $Id: drawpix.h,v 1.7 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: drawpix.h,v 1.8 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/enable.c b/xc/extras/Mesa/src/enable.c index 16c721b7a..81c420198 100644 --- a/xc/extras/Mesa/src/enable.c +++ b/xc/extras/Mesa/src/enable.c @@ -1,4 +1,4 @@ -/* $Id: enable.c,v 1.14 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: enable.c,v 1.15 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/enable.h b/xc/extras/Mesa/src/enable.h index 656deb554..2b33e7308 100644 --- a/xc/extras/Mesa/src/enable.h +++ b/xc/extras/Mesa/src/enable.h @@ -1,4 +1,4 @@ -/* $Id: enable.h,v 1.7 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: enable.h,v 1.8 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/enums.c b/xc/extras/Mesa/src/enums.c index 16ffad877..ac2f14fe4 100644 --- a/xc/extras/Mesa/src/enums.c +++ b/xc/extras/Mesa/src/enums.c @@ -1,4 +1,4 @@ -/* $Id: enums.c,v 1.14 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: enums.c,v 1.15 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/enums.h b/xc/extras/Mesa/src/enums.h index e253bc26f..02ab12039 100644 --- a/xc/extras/Mesa/src/enums.h +++ b/xc/extras/Mesa/src/enums.h @@ -1,4 +1,4 @@ -/* $Id: enums.h,v 1.7 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: enums.h,v 1.8 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/eval.c b/xc/extras/Mesa/src/eval.c index afcc678c7..35f500bb6 100644 --- a/xc/extras/Mesa/src/eval.c +++ b/xc/extras/Mesa/src/eval.c @@ -1,4 +1,4 @@ -/* $Id: eval.c,v 1.10 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: eval.c,v 1.11 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/eval.h b/xc/extras/Mesa/src/eval.h index fb9433cc4..a3d8962f7 100644 --- a/xc/extras/Mesa/src/eval.h +++ b/xc/extras/Mesa/src/eval.h @@ -1,4 +1,4 @@ -/* $Id: eval.h,v 1.7 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: eval.h,v 1.8 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/extensions.c b/xc/extras/Mesa/src/extensions.c index 19eca11ba..1f6a3f932 100644 --- a/xc/extras/Mesa/src/extensions.c +++ b/xc/extras/Mesa/src/extensions.c @@ -1,4 +1,4 @@ -/* $Id: extensions.c,v 1.18 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: extensions.c,v 1.19 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/extensions.h b/xc/extras/Mesa/src/extensions.h index 15760333a..f0e3994b6 100644 --- a/xc/extras/Mesa/src/extensions.h +++ b/xc/extras/Mesa/src/extensions.h @@ -1,4 +1,4 @@ -/* $Id: extensions.h,v 1.8 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: extensions.h,v 1.9 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/feedback.c b/xc/extras/Mesa/src/feedback.c index b9b5756da..c8ef8da7c 100644 --- a/xc/extras/Mesa/src/feedback.c +++ b/xc/extras/Mesa/src/feedback.c @@ -1,4 +1,4 @@ -/* $Id: feedback.c,v 1.10 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: feedback.c,v 1.11 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/feedback.h b/xc/extras/Mesa/src/feedback.h index fb2f2f7bb..63cabbd41 100644 --- a/xc/extras/Mesa/src/feedback.h +++ b/xc/extras/Mesa/src/feedback.h @@ -1,4 +1,4 @@ -/* $Id: feedback.h,v 1.7 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: feedback.h,v 1.8 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/fog.c b/xc/extras/Mesa/src/fog.c index 2e76f7dc1..5c852600d 100644 --- a/xc/extras/Mesa/src/fog.c +++ b/xc/extras/Mesa/src/fog.c @@ -1,4 +1,4 @@ -/* $Id: fog.c,v 1.15 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: fog.c,v 1.16 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/fog.h b/xc/extras/Mesa/src/fog.h index 624690a57..9711528d9 100644 --- a/xc/extras/Mesa/src/fog.h +++ b/xc/extras/Mesa/src/fog.h @@ -1,4 +1,4 @@ -/* $Id: fog.h,v 1.9 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: fog.h,v 1.10 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/get.c b/xc/extras/Mesa/src/get.c index 56dfcc9c0..64fcad3f7 100644 --- a/xc/extras/Mesa/src/get.c +++ b/xc/extras/Mesa/src/get.c @@ -1,10 +1,10 @@ -/* $Id: get.c,v 1.19 2002/02/14 01:59:29 dawes Exp $ */ +/* $Id: get.c,v 1.20 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library - * Version: 4.0.1 + * Version: 4.0.2 * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -5366,8 +5366,8 @@ _mesa_GetString( GLenum name ) GET_CURRENT_CONTEXT(ctx); static const char *vendor = "Brian Paul"; static const char *renderer = "Mesa"; - static const char *version_1_2 = "1.2 Mesa 4.0.1"; - static const char *version_1_3 = "1.3 Mesa 4.0.1"; + static const char *version_1_2 = "1.2 Mesa 4.0.2"; + static const char *version_1_3 = "1.3 Mesa 4.0.2"; ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0); diff --git a/xc/extras/Mesa/src/get.h b/xc/extras/Mesa/src/get.h index 7804e1392..a1449b44e 100644 --- a/xc/extras/Mesa/src/get.h +++ b/xc/extras/Mesa/src/get.h @@ -1,4 +1,4 @@ -/* $Id: get.h,v 1.7 2002/02/14 01:59:30 dawes Exp $ */ +/* $Id: get.h,v 1.8 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/glapi.c b/xc/extras/Mesa/src/glapi.c index 98211b847..d13d27ed1 100644 --- a/xc/extras/Mesa/src/glapi.c +++ b/xc/extras/Mesa/src/glapi.c @@ -1,4 +1,5 @@ -/* $XFree86: xc/extras/Mesa/src/glapi.c,v 1.10 2001/12/19 15:44:34 tsi Exp $ */ +/* $Id: glapi.c,v 1.12 2002/02/21 11:42:59 alanh Exp $ */ + /* * Mesa 3-D graphics library * Version: 4.0.1 @@ -2083,7 +2084,6 @@ _glapi_get_proc_name(GLuint offset) void _glapi_check_table(const struct _glapi_table *table) { -#ifdef DEBUG const GLuint entries = _glapi_get_dispatch_table_size(); const void **tab = (const void **) table; GLuint i; @@ -2091,6 +2091,7 @@ _glapi_check_table(const struct _glapi_table *table) assert(tab[i]); } +#ifdef DEBUG /* Do some spot checks to be sure that the dispatch table * slots are assigned correctly. */ diff --git a/xc/extras/Mesa/src/glapi.h b/xc/extras/Mesa/src/glapi.h index 922577e21..3bfa00a31 100644 --- a/xc/extras/Mesa/src/glapi.h +++ b/xc/extras/Mesa/src/glapi.h @@ -1,4 +1,4 @@ -/* $Id: glapi.h,v 1.5 2002/02/14 01:59:30 dawes Exp $ */ +/* $Id: glapi.h,v 1.6 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/glapitemp.h b/xc/extras/Mesa/src/glapitemp.h index cf761a60c..847af41b9 100644 --- a/xc/extras/Mesa/src/glapitemp.h +++ b/xc/extras/Mesa/src/glapitemp.h @@ -1,4 +1,4 @@ -/* $Id: glapitemp.h,v 1.9 2002/02/14 01:59:30 dawes Exp $ */ +/* $Id: glapitemp.h,v 1.10 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/glheader.h b/xc/extras/Mesa/src/glheader.h index 2af615df8..09063486d 100644 --- a/xc/extras/Mesa/src/glheader.h +++ b/xc/extras/Mesa/src/glheader.h @@ -1,4 +1,4 @@ -/* $Id: glheader.h,v 1.18 2002/02/14 01:59:30 dawes Exp $ */ +/* $Id: glheader.h,v 1.19 2002/02/21 11:43:00 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/glthread.c b/xc/extras/Mesa/src/glthread.c index ce6b56310..d0e8f2328 100644 --- a/xc/extras/Mesa/src/glthread.c +++ b/xc/extras/Mesa/src/glthread.c @@ -1,4 +1,4 @@ -/* $Id: glthread.c,v 1.5 2002/02/14 01:59:30 dawes Exp $ */ +/* $Id: glthread.c,v 1.6 2002/02/21 11:43:00 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/glthread.h b/xc/extras/Mesa/src/glthread.h index db4ab5616..0088dc385 100644 --- a/xc/extras/Mesa/src/glthread.h +++ b/xc/extras/Mesa/src/glthread.h @@ -1,4 +1,4 @@ -/* $Id: glthread.h,v 1.6 2002/02/14 01:59:30 dawes Exp $ */ +/* $Id: glthread.h,v 1.7 2002/02/21 11:43:00 alanh 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. */ -/* $XFree86: xc/extras/Mesa/src/glthread.h,v 1.3 2001/10/28 03:32:06 tsi Exp $ */ + /* * Thread support for gl dispatch. @@ -186,13 +186,8 @@ typedef xthread_t _glthread_Thread; typedef xmutex_rec _glthread_Mutex; -#ifdef XMUTEX_INITIALIZER #define _glthread_DECLARE_STATIC_MUTEX(name) \ static _glthread_Mutex name = XMUTEX_INITIALIZER -#else -#define _glthread_DECLARE_STATIC_MUTEX(name) \ - static _glthread_Mutex name -#endif #define _glthread_INIT_MUTEX(name) \ xmutex_init(&(name)) diff --git a/xc/extras/Mesa/src/hash.c b/xc/extras/Mesa/src/hash.c index e1c914951..e06648f3e 100644 --- a/xc/extras/Mesa/src/hash.c +++ b/xc/extras/Mesa/src/hash.c @@ -1,4 +1,4 @@ -/* $Id: hash.c,v 1.10 2002/02/14 01:59:30 dawes Exp $ */ +/* $Id: hash.c,v 1.11 2002/02/21 11:43:00 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/hash.h b/xc/extras/Mesa/src/hash.h index 3abdc4fb5..53d1893f8 100644 --- a/xc/extras/Mesa/src/hash.h +++ b/xc/extras/Mesa/src/hash.h @@ -1,4 +1,4 @@ -/* $Id: hash.h,v 1.8 2002/02/14 01:59:30 dawes Exp $ */ +/* $Id: hash.h,v 1.9 2002/02/21 11:43:00 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/highpc.c b/xc/extras/Mesa/src/highpc.c index 3fa4ae97b..bf58961bd 100644 --- a/xc/extras/Mesa/src/highpc.c +++ b/xc/extras/Mesa/src/highpc.c @@ -1,4 +1,4 @@ -/* $Id: highpc.c,v 1.7 2002/02/14 01:59:30 dawes Exp $ */ +/* $Id: highpc.c,v 1.8 2002/02/21 11:43:00 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/hint.c b/xc/extras/Mesa/src/hint.c index b635df608..196d8fbf4 100644 --- a/xc/extras/Mesa/src/hint.c +++ b/xc/extras/Mesa/src/hint.c @@ -1,4 +1,4 @@ -/* $Id: hint.c,v 1.7 2002/02/14 01:59:30 dawes Exp $ */ +/* $Id: hint.c,v 1.8 2002/02/21 11:43:00 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/hint.h b/xc/extras/Mesa/src/hint.h index 3deda9067..3378f2ad1 100644 --- a/xc/extras/Mesa/src/hint.h +++ b/xc/extras/Mesa/src/hint.h @@ -1,4 +1,4 @@ -/* $Id: hint.h,v 1.4 2002/02/14 01:59:30 dawes Exp $ */ +/* $Id: hint.h,v 1.5 2002/02/21 11:43:00 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/histogram.c b/xc/extras/Mesa/src/histogram.c index 57f1ff559..826e48a2d 100644 --- a/xc/extras/Mesa/src/histogram.c +++ b/xc/extras/Mesa/src/histogram.c @@ -1,4 +1,4 @@ -/* $Id: histogram.c,v 1.2 2002/02/14 01:59:30 dawes Exp $ */ +/* $Id: histogram.c,v 1.3 2002/02/21 11:43:00 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/histogram.h b/xc/extras/Mesa/src/histogram.h index 714227c75..7977c78fa 100644 --- a/xc/extras/Mesa/src/histogram.h +++ b/xc/extras/Mesa/src/histogram.h @@ -1,4 +1,4 @@ -/* $Id: histogram.h,v 1.2 2002/02/14 01:59:30 dawes Exp $ */ +/* $Id: histogram.h,v 1.3 2002/02/21 11:43:00 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/image.c b/xc/extras/Mesa/src/image.c index 62fb4056d..140cb1403 100644 --- a/xc/extras/Mesa/src/image.c +++ b/xc/extras/Mesa/src/image.c @@ -1,4 +1,4 @@ -/* $Id: image.c,v 1.20 2002/02/14 01:59:30 dawes Exp $ */ +/* $Id: image.c,v 1.21 2002/02/21 11:43:00 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/image.h b/xc/extras/Mesa/src/image.h index e764dabe7..7ea8aa195 100644 --- a/xc/extras/Mesa/src/image.h +++ b/xc/extras/Mesa/src/image.h @@ -1,4 +1,4 @@ -/* $Id: image.h,v 1.11 2002/02/14 01:59:30 dawes Exp $ */ +/* $Id: image.h,v 1.12 2002/02/21 11:43:00 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/imports.c b/xc/extras/Mesa/src/imports.c index 3f4332097..ebf25f40c 100644 --- a/xc/extras/Mesa/src/imports.c +++ b/xc/extras/Mesa/src/imports.c @@ -1,4 +1,4 @@ -/* $Id: imports.c,v 1.2 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: imports.c,v 1.3 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/imports.h b/xc/extras/Mesa/src/imports.h index 48fc469f2..160e83c25 100644 --- a/xc/extras/Mesa/src/imports.h +++ b/xc/extras/Mesa/src/imports.h @@ -1,4 +1,4 @@ -/* $Id: imports.h,v 1.2 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: imports.h,v 1.3 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/light.c b/xc/extras/Mesa/src/light.c index b8d455109..a9671c1b8 100644 --- a/xc/extras/Mesa/src/light.c +++ b/xc/extras/Mesa/src/light.c @@ -1,4 +1,4 @@ -/* $Id: light.c,v 1.11 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: light.c,v 1.12 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/light.h b/xc/extras/Mesa/src/light.h index e9b963250..0a27187eb 100644 --- a/xc/extras/Mesa/src/light.h +++ b/xc/extras/Mesa/src/light.h @@ -1,4 +1,4 @@ -/* $Id: light.h,v 1.10 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: light.h,v 1.11 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/lines.c b/xc/extras/Mesa/src/lines.c index da93af2e6..62ead379d 100644 --- a/xc/extras/Mesa/src/lines.c +++ b/xc/extras/Mesa/src/lines.c @@ -1,4 +1,4 @@ -/* $Id: lines.c,v 1.14 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: lines.c,v 1.15 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/lines.h b/xc/extras/Mesa/src/lines.h index 32b43e20d..a086b3185 100644 --- a/xc/extras/Mesa/src/lines.h +++ b/xc/extras/Mesa/src/lines.h @@ -1,4 +1,4 @@ -/* $Id: lines.h,v 1.7 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: lines.h,v 1.8 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/lowpc.c b/xc/extras/Mesa/src/lowpc.c index c26b71c1b..4b3e9f5b4 100644 --- a/xc/extras/Mesa/src/lowpc.c +++ b/xc/extras/Mesa/src/lowpc.c @@ -1,4 +1,4 @@ -/* $Id: lowpc.c,v 1.7 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: lowpc.c,v 1.8 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/macros.h b/xc/extras/Mesa/src/macros.h index 1961aeb3f..d9c6c19b7 100644 --- a/xc/extras/Mesa/src/macros.h +++ b/xc/extras/Mesa/src/macros.h @@ -1,4 +1,4 @@ -/* $Id: macros.h,v 1.11 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: macros.h,v 1.12 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_clip_tmp.h b/xc/extras/Mesa/src/math/m_clip_tmp.h index d43827f18..724c56b0f 100644 --- a/xc/extras/Mesa/src/math/m_clip_tmp.h +++ b/xc/extras/Mesa/src/math/m_clip_tmp.h @@ -1,4 +1,4 @@ -/* $Id: m_clip_tmp.h,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_clip_tmp.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_copy_tmp.h b/xc/extras/Mesa/src/math/m_copy_tmp.h index 686ccdab3..ad9c3326e 100644 --- a/xc/extras/Mesa/src/math/m_copy_tmp.h +++ b/xc/extras/Mesa/src/math/m_copy_tmp.h @@ -1,4 +1,4 @@ -/* $Id: m_copy_tmp.h,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_copy_tmp.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_debug.h b/xc/extras/Mesa/src/math/m_debug.h index 451415b44..b453e110a 100644 --- a/xc/extras/Mesa/src/math/m_debug.h +++ b/xc/extras/Mesa/src/math/m_debug.h @@ -1,4 +1,4 @@ -/* $Id: m_debug.h,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_debug.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_debug_clip.c b/xc/extras/Mesa/src/math/m_debug_clip.c index 8ea465932..4f529d7bf 100644 --- a/xc/extras/Mesa/src/math/m_debug_clip.c +++ b/xc/extras/Mesa/src/math/m_debug_clip.c @@ -1,4 +1,4 @@ -/* $Id: m_debug_clip.c,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_debug_clip.c,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_debug_norm.c b/xc/extras/Mesa/src/math/m_debug_norm.c index a6691d8d9..7f6590e19 100644 --- a/xc/extras/Mesa/src/math/m_debug_norm.c +++ b/xc/extras/Mesa/src/math/m_debug_norm.c @@ -1,4 +1,4 @@ -/* $Id: m_debug_norm.c,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_debug_norm.c,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_debug_util.h b/xc/extras/Mesa/src/math/m_debug_util.h index cb394a6c9..6cb8c2a54 100644 --- a/xc/extras/Mesa/src/math/m_debug_util.h +++ b/xc/extras/Mesa/src/math/m_debug_util.h @@ -1,4 +1,4 @@ -/* $Id: m_debug_util.h,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_debug_util.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_debug_vertex.c b/xc/extras/Mesa/src/math/m_debug_vertex.c index 8860f2b6f..44459a5c4 100644 --- a/xc/extras/Mesa/src/math/m_debug_vertex.c +++ b/xc/extras/Mesa/src/math/m_debug_vertex.c @@ -1,4 +1,4 @@ -/* $Id: m_debug_vertex.c,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_debug_vertex.c,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_debug_xform.c b/xc/extras/Mesa/src/math/m_debug_xform.c index 39c1889a0..7e29c4146 100644 --- a/xc/extras/Mesa/src/math/m_debug_xform.c +++ b/xc/extras/Mesa/src/math/m_debug_xform.c @@ -1,4 +1,4 @@ -/* $Id: m_debug_xform.c,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_debug_xform.c,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_dotprod_tmp.h b/xc/extras/Mesa/src/math/m_dotprod_tmp.h index 18c94c1c1..4a2aaacb4 100644 --- a/xc/extras/Mesa/src/math/m_dotprod_tmp.h +++ b/xc/extras/Mesa/src/math/m_dotprod_tmp.h @@ -1,4 +1,4 @@ -/* $Id: m_dotprod_tmp.h,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_dotprod_tmp.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_eval.c b/xc/extras/Mesa/src/math/m_eval.c index b2bb4bb57..3a3531128 100644 --- a/xc/extras/Mesa/src/math/m_eval.c +++ b/xc/extras/Mesa/src/math/m_eval.c @@ -1,4 +1,4 @@ -/* $Id: m_eval.c,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_eval.c,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_eval.h b/xc/extras/Mesa/src/math/m_eval.h index 6db072fef..0a19bb2ec 100644 --- a/xc/extras/Mesa/src/math/m_eval.h +++ b/xc/extras/Mesa/src/math/m_eval.h @@ -1,4 +1,4 @@ -/* $Id: m_eval.h,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_eval.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_matrix.c b/xc/extras/Mesa/src/math/m_matrix.c index 6707210fb..aa0ef8969 100644 --- a/xc/extras/Mesa/src/math/m_matrix.c +++ b/xc/extras/Mesa/src/math/m_matrix.c @@ -1,4 +1,4 @@ -/* $Id: m_matrix.c,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_matrix.c,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_matrix.h b/xc/extras/Mesa/src/math/m_matrix.h index 470bc6651..cb0b29d68 100644 --- a/xc/extras/Mesa/src/math/m_matrix.h +++ b/xc/extras/Mesa/src/math/m_matrix.h @@ -1,4 +1,4 @@ -/* $Id: m_matrix.h,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_matrix.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_norm_tmp.h b/xc/extras/Mesa/src/math/m_norm_tmp.h index e4aa1baca..3f8d8b3fa 100644 --- a/xc/extras/Mesa/src/math/m_norm_tmp.h +++ b/xc/extras/Mesa/src/math/m_norm_tmp.h @@ -1,4 +1,4 @@ -/* $Id: m_norm_tmp.h,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_norm_tmp.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_trans_tmp.h b/xc/extras/Mesa/src/math/m_trans_tmp.h index 992a0f521..11924459e 100644 --- a/xc/extras/Mesa/src/math/m_trans_tmp.h +++ b/xc/extras/Mesa/src/math/m_trans_tmp.h @@ -1,10 +1,10 @@ -/* $Id: m_trans_tmp.h,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_trans_tmp.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 4.0.2 * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -132,8 +132,8 @@ static void DEST_4US( GLushort (*t)[4], GLuint stride, ARGS ) { - const GLushort *f = (GLushort *) ptr + SRC_START * stride; - const GLushort *first = f; + const GLubyte *f = (GLubyte *) ((GLubyte *) ptr + SRC_START * stride); + const GLubyte *first = f; GLuint i; (void) start; (void) first; diff --git a/xc/extras/Mesa/src/math/m_translate.c b/xc/extras/Mesa/src/math/m_translate.c index e84dd221b..8e5e5aa72 100644 --- a/xc/extras/Mesa/src/math/m_translate.c +++ b/xc/extras/Mesa/src/math/m_translate.c @@ -1,4 +1,4 @@ -/* $Id: m_translate.c,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_translate.c,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_translate.h b/xc/extras/Mesa/src/math/m_translate.h index 885718933..0da26b6fd 100644 --- a/xc/extras/Mesa/src/math/m_translate.h +++ b/xc/extras/Mesa/src/math/m_translate.h @@ -1,4 +1,4 @@ -/* $Id: m_translate.h,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_translate.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_vector.c b/xc/extras/Mesa/src/math/m_vector.c index 885942c85..b50b39130 100644 --- a/xc/extras/Mesa/src/math/m_vector.c +++ b/xc/extras/Mesa/src/math/m_vector.c @@ -1,4 +1,4 @@ -/* $Id: m_vector.c,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_vector.c,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_vector.h b/xc/extras/Mesa/src/math/m_vector.h index c0373edae..b04bfbd3e 100644 --- a/xc/extras/Mesa/src/math/m_vector.h +++ b/xc/extras/Mesa/src/math/m_vector.h @@ -1,4 +1,4 @@ -/* $Id: m_vector.h,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_vector.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_vertices.c b/xc/extras/Mesa/src/math/m_vertices.c index d48772d5c..915fd1369 100644 --- a/xc/extras/Mesa/src/math/m_vertices.c +++ b/xc/extras/Mesa/src/math/m_vertices.c @@ -1,4 +1,4 @@ -/* $Id: m_vertices.c,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_vertices.c,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_vertices.h b/xc/extras/Mesa/src/math/m_vertices.h index 4a8cb69a1..0dd349bdf 100644 --- a/xc/extras/Mesa/src/math/m_vertices.h +++ b/xc/extras/Mesa/src/math/m_vertices.h @@ -1,4 +1,4 @@ -/* $Id: m_vertices.h,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_vertices.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_xform.c b/xc/extras/Mesa/src/math/m_xform.c index fe13369f0..6010c8798 100644 --- a/xc/extras/Mesa/src/math/m_xform.c +++ b/xc/extras/Mesa/src/math/m_xform.c @@ -1,4 +1,4 @@ -/* $Id: m_xform.c,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_xform.c,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_xform.h b/xc/extras/Mesa/src/math/m_xform.h index 41378fcba..043a1eb43 100644 --- a/xc/extras/Mesa/src/math/m_xform.h +++ b/xc/extras/Mesa/src/math/m_xform.h @@ -1,4 +1,4 @@ -/* $Id: m_xform.h,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_xform.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/m_xform_tmp.h b/xc/extras/Mesa/src/math/m_xform_tmp.h index 32b891e2e..7ed4c2efa 100644 --- a/xc/extras/Mesa/src/math/m_xform_tmp.h +++ b/xc/extras/Mesa/src/math/m_xform_tmp.h @@ -1,4 +1,4 @@ -/* $Id: m_xform_tmp.h,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: m_xform_tmp.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/math/mathmod.h b/xc/extras/Mesa/src/math/mathmod.h index 48440d554..9ded6f4f9 100644 --- a/xc/extras/Mesa/src/math/mathmod.h +++ b/xc/extras/Mesa/src/math/mathmod.h @@ -1,4 +1,4 @@ -/* $Id: mathmod.h,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: mathmod.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/matrix.c b/xc/extras/Mesa/src/matrix.c index 8f39be0b3..9849721a9 100644 --- a/xc/extras/Mesa/src/matrix.c +++ b/xc/extras/Mesa/src/matrix.c @@ -1,4 +1,4 @@ -/* $Id: matrix.c,v 1.14 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: matrix.c,v 1.15 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/matrix.h b/xc/extras/Mesa/src/matrix.h index c56901312..6a8c46da9 100644 --- a/xc/extras/Mesa/src/matrix.h +++ b/xc/extras/Mesa/src/matrix.h @@ -1,4 +1,4 @@ -/* $Id: matrix.h,v 1.10 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: matrix.h,v 1.11 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/mem.c b/xc/extras/Mesa/src/mem.c index 3c7cf5bc6..bb2438e96 100644 --- a/xc/extras/Mesa/src/mem.c +++ b/xc/extras/Mesa/src/mem.c @@ -1,4 +1,4 @@ -/* $Id: mem.c,v 1.8 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: mem.c,v 1.9 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/mem.h b/xc/extras/Mesa/src/mem.h index aa99fece8..ea41f220d 100644 --- a/xc/extras/Mesa/src/mem.h +++ b/xc/extras/Mesa/src/mem.h @@ -1,4 +1,4 @@ -/* $Id: mem.h,v 1.10 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: mem.h,v 1.11 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/mmath.c b/xc/extras/Mesa/src/mmath.c index bdbce88ef..fb5a1c048 100644 --- a/xc/extras/Mesa/src/mmath.c +++ b/xc/extras/Mesa/src/mmath.c @@ -1,3 +1,5 @@ +/* $Id: mmath.c,v 1.11 2002/02/21 11:43:01 alanh Exp $ */ + /* * Mesa 3-D graphics library * Version: 3.5 @@ -27,7 +29,6 @@ #include "all.h" #else #include "glheader.h" -#include "macros.h" #include "mmath.h" #endif diff --git a/xc/extras/Mesa/src/mmath.h b/xc/extras/Mesa/src/mmath.h index 96f3692f2..65cbb55e9 100644 --- a/xc/extras/Mesa/src/mmath.h +++ b/xc/extras/Mesa/src/mmath.h @@ -1,4 +1,5 @@ -/* $XFree86: xc/extras/Mesa/src/mmath.h,v 1.15 2002/01/07 17:26:06 alanh Exp $ */ +/* $Id: mmath.h,v 1.24 2002/02/21 11:43:01 alanh Exp $ */ + /* * Mesa 3-D graphics library * Version: 4.0 @@ -169,8 +170,8 @@ extern float gl_sqrt(float x); #define NORMALIZE_3FV( V ) \ do { \ GLfloat len = LEN_SQUARED_3FV(V); \ - if (len) { \ - len = 1.0 / GL_SQRT(len); \ + if (len) { \ + len = (GLfloat) (1.0 / GL_SQRT(len)); \ V[0] = (GLfloat) (V[0] * len); \ V[1] = (GLfloat) (V[1] * len); \ V[2] = (GLfloat) (V[2] * len); \ @@ -199,7 +200,6 @@ do { \ #if defined(__i386__) || defined(__sparc__) || defined(__s390x__) || \ - defined(__ppc__) || defined(__powerpc__) || \ ( defined(__alpha__) && ( defined( __IEEE_FLOAT ) || !defined( VMS ) ) ) #define USE_IEEE #endif diff --git a/xc/extras/Mesa/src/mtypes.h b/xc/extras/Mesa/src/mtypes.h index 676be2490..fad6b146e 100644 --- a/xc/extras/Mesa/src/mtypes.h +++ b/xc/extras/Mesa/src/mtypes.h @@ -1,4 +1,4 @@ -/* $Id: mtypes.h,v 1.2 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: mtypes.h,v 1.3 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/pixel.c b/xc/extras/Mesa/src/pixel.c index 733c3b0fd..68cd9a265 100644 --- a/xc/extras/Mesa/src/pixel.c +++ b/xc/extras/Mesa/src/pixel.c @@ -1,4 +1,4 @@ -/* $Id: pixel.c,v 1.11 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: pixel.c,v 1.12 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/pixel.h b/xc/extras/Mesa/src/pixel.h index 11d7ebc16..34b424cc8 100644 --- a/xc/extras/Mesa/src/pixel.h +++ b/xc/extras/Mesa/src/pixel.h @@ -1,4 +1,4 @@ -/* $Id: pixel.h,v 1.8 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: pixel.h,v 1.9 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/points.c b/xc/extras/Mesa/src/points.c index 12ca20689..183159464 100644 --- a/xc/extras/Mesa/src/points.c +++ b/xc/extras/Mesa/src/points.c @@ -1,3 +1,5 @@ +/* $Id: points.c,v 1.14 2002/02/21 11:43:01 alanh Exp $ */ + /* * Mesa 3-D graphics library * Version: 3.5 diff --git a/xc/extras/Mesa/src/points.h b/xc/extras/Mesa/src/points.h index b6ee9072a..bbddc964a 100644 --- a/xc/extras/Mesa/src/points.h +++ b/xc/extras/Mesa/src/points.h @@ -1,4 +1,4 @@ -/* $Id: points.h,v 1.7 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: points.h,v 1.8 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/polygon.c b/xc/extras/Mesa/src/polygon.c index b5693e87a..e1994c779 100644 --- a/xc/extras/Mesa/src/polygon.c +++ b/xc/extras/Mesa/src/polygon.c @@ -1,4 +1,4 @@ -/* $Id: polygon.c,v 1.8 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: polygon.c,v 1.9 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/polygon.h b/xc/extras/Mesa/src/polygon.h index 9504e6eca..059c01efc 100644 --- a/xc/extras/Mesa/src/polygon.h +++ b/xc/extras/Mesa/src/polygon.h @@ -1,4 +1,4 @@ -/* $Id: polygon.h,v 1.7 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: polygon.h,v 1.8 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/rastpos.c b/xc/extras/Mesa/src/rastpos.c index 1531da7b7..5bb035a0d 100644 --- a/xc/extras/Mesa/src/rastpos.c +++ b/xc/extras/Mesa/src/rastpos.c @@ -1,4 +1,4 @@ -/* $Id: rastpos.c,v 1.8 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: rastpos.c,v 1.9 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/rastpos.h b/xc/extras/Mesa/src/rastpos.h index 5bfbe0a54..554a609b7 100644 --- a/xc/extras/Mesa/src/rastpos.h +++ b/xc/extras/Mesa/src/rastpos.h @@ -1,4 +1,4 @@ -/* $Id: rastpos.h,v 1.7 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: rastpos.h,v 1.8 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/simple_list.h b/xc/extras/Mesa/src/simple_list.h index 0f60466b4..98c2105f6 100644 --- a/xc/extras/Mesa/src/simple_list.h +++ b/xc/extras/Mesa/src/simple_list.h @@ -1,4 +1,4 @@ -/* $Id: simple_list.h,v 1.7 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: simple_list.h,v 1.8 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/state.c b/xc/extras/Mesa/src/state.c index 067e25dfb..37e344ae2 100644 --- a/xc/extras/Mesa/src/state.c +++ b/xc/extras/Mesa/src/state.c @@ -1,4 +1,4 @@ -/* $Id: state.c,v 1.14 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: state.c,v 1.15 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/state.h b/xc/extras/Mesa/src/state.h index a0342a86e..fa0d4d9ae 100644 --- a/xc/extras/Mesa/src/state.h +++ b/xc/extras/Mesa/src/state.h @@ -1,4 +1,4 @@ -/* $Id: state.h,v 1.5 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: state.h,v 1.6 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/stencil.c b/xc/extras/Mesa/src/stencil.c index ba6926fbc..78a0770d7 100644 --- a/xc/extras/Mesa/src/stencil.c +++ b/xc/extras/Mesa/src/stencil.c @@ -1,4 +1,4 @@ -/* $Id: stencil.c,v 1.14 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: stencil.c,v 1.15 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/stencil.h b/xc/extras/Mesa/src/stencil.h index 0e29d7100..b6c6e3a47 100644 --- a/xc/extras/Mesa/src/stencil.h +++ b/xc/extras/Mesa/src/stencil.h @@ -1,4 +1,4 @@ -/* $Id: stencil.h,v 1.8 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: stencil.h,v 1.9 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_aaline.c b/xc/extras/Mesa/src/swrast/s_aaline.c index 6f629766a..0617d68e4 100644 --- a/xc/extras/Mesa/src/swrast/s_aaline.c +++ b/xc/extras/Mesa/src/swrast/s_aaline.c @@ -1,4 +1,4 @@ -/* $Id: s_aaline.c,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: s_aaline.c,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_aaline.h b/xc/extras/Mesa/src/swrast/s_aaline.h index db6f15358..83936fd9c 100644 --- a/xc/extras/Mesa/src/swrast/s_aaline.h +++ b/xc/extras/Mesa/src/swrast/s_aaline.h @@ -1,4 +1,4 @@ -/* $Id: s_aaline.h,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: s_aaline.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_aalinetemp.h b/xc/extras/Mesa/src/swrast/s_aalinetemp.h index 86dd6476e..0e0a9e3b6 100644 --- a/xc/extras/Mesa/src/swrast/s_aalinetemp.h +++ b/xc/extras/Mesa/src/swrast/s_aalinetemp.h @@ -1,4 +1,4 @@ -/* $Id: s_aalinetemp.h,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: s_aalinetemp.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_aatriangle.c b/xc/extras/Mesa/src/swrast/s_aatriangle.c index 9a90eb989..d87ec11db 100644 --- a/xc/extras/Mesa/src/swrast/s_aatriangle.c +++ b/xc/extras/Mesa/src/swrast/s_aatriangle.c @@ -1,4 +1,4 @@ -/* $Id: s_aatriangle.c,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: s_aatriangle.c,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_aatriangle.h b/xc/extras/Mesa/src/swrast/s_aatriangle.h index 5c619d0e5..fca5a363c 100644 --- a/xc/extras/Mesa/src/swrast/s_aatriangle.h +++ b/xc/extras/Mesa/src/swrast/s_aatriangle.h @@ -1,4 +1,4 @@ -/* $Id: s_aatriangle.h,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: s_aatriangle.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_aatritemp.h b/xc/extras/Mesa/src/swrast/s_aatritemp.h index 0d0a5b84f..b659b97ee 100644 --- a/xc/extras/Mesa/src/swrast/s_aatritemp.h +++ b/xc/extras/Mesa/src/swrast/s_aatritemp.h @@ -1,4 +1,4 @@ -/* $Id: s_aatritemp.h,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: s_aatritemp.h,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_accum.c b/xc/extras/Mesa/src/swrast/s_accum.c index fe708cbbc..9121e9db6 100644 --- a/xc/extras/Mesa/src/swrast/s_accum.c +++ b/xc/extras/Mesa/src/swrast/s_accum.c @@ -1,4 +1,4 @@ -/* $Id: s_accum.c,v 1.2 2002/02/14 01:59:39 dawes Exp $ */ +/* $Id: s_accum.c,v 1.3 2002/02/21 11:43:08 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_accum.h b/xc/extras/Mesa/src/swrast/s_accum.h index 4160b948a..2a62b35d1 100644 --- a/xc/extras/Mesa/src/swrast/s_accum.h +++ b/xc/extras/Mesa/src/swrast/s_accum.h @@ -1,4 +1,4 @@ -/* $Id: s_accum.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_accum.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_alpha.c b/xc/extras/Mesa/src/swrast/s_alpha.c index f17147ce5..d9e75afd9 100644 --- a/xc/extras/Mesa/src/swrast/s_alpha.c +++ b/xc/extras/Mesa/src/swrast/s_alpha.c @@ -1,4 +1,4 @@ -/* $Id: s_alpha.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_alpha.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_alpha.h b/xc/extras/Mesa/src/swrast/s_alpha.h index dc1072d2b..63cc69698 100644 --- a/xc/extras/Mesa/src/swrast/s_alpha.h +++ b/xc/extras/Mesa/src/swrast/s_alpha.h @@ -1,4 +1,4 @@ -/* $Id: s_alpha.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_alpha.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_alphabuf.c b/xc/extras/Mesa/src/swrast/s_alphabuf.c index ecff04d24..af4183757 100644 --- a/xc/extras/Mesa/src/swrast/s_alphabuf.c +++ b/xc/extras/Mesa/src/swrast/s_alphabuf.c @@ -1,4 +1,4 @@ -/* $Id: s_alphabuf.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_alphabuf.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_alphabuf.h b/xc/extras/Mesa/src/swrast/s_alphabuf.h index 8bd8c664c..029eff87e 100644 --- a/xc/extras/Mesa/src/swrast/s_alphabuf.h +++ b/xc/extras/Mesa/src/swrast/s_alphabuf.h @@ -1,4 +1,4 @@ -/* $Id: s_alphabuf.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_alphabuf.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_bitmap.c b/xc/extras/Mesa/src/swrast/s_bitmap.c index 05faf90be..540d092bf 100644 --- a/xc/extras/Mesa/src/swrast/s_bitmap.c +++ b/xc/extras/Mesa/src/swrast/s_bitmap.c @@ -1,4 +1,4 @@ -/* $Id: s_bitmap.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_bitmap.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_blend.c b/xc/extras/Mesa/src/swrast/s_blend.c index 436ec278e..4fa8e46d7 100644 --- a/xc/extras/Mesa/src/swrast/s_blend.c +++ b/xc/extras/Mesa/src/swrast/s_blend.c @@ -1,4 +1,4 @@ -/* $Id: s_blend.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_blend.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -52,7 +52,7 @@ static void _BLENDAPI blend_noop( GLcontext *ctx, GLuint n, const GLubyte mask[], GLchan rgba[][4], CONST GLchan dest[][4] ) { - int i; + GLuint i; ASSERT(ctx->Color.BlendEquation==GL_FUNC_ADD_EXT); ASSERT(ctx->Color.BlendSrcRGB==GL_ZERO); ASSERT(ctx->Color.BlendDstRGB==GL_ONE); diff --git a/xc/extras/Mesa/src/swrast/s_blend.h b/xc/extras/Mesa/src/swrast/s_blend.h index efaa66e5a..eed71fbc2 100644 --- a/xc/extras/Mesa/src/swrast/s_blend.h +++ b/xc/extras/Mesa/src/swrast/s_blend.h @@ -1,4 +1,4 @@ -/* $Id: s_blend.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_blend.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_buffers.c b/xc/extras/Mesa/src/swrast/s_buffers.c index db682bec2..2e889f1ba 100644 --- a/xc/extras/Mesa/src/swrast/s_buffers.c +++ b/xc/extras/Mesa/src/swrast/s_buffers.c @@ -1,4 +1,4 @@ -/* $Id: s_buffers.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_buffers.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_context.c b/xc/extras/Mesa/src/swrast/s_context.c index 9c6c5d2ec..58f96363e 100644 --- a/xc/extras/Mesa/src/swrast/s_context.c +++ b/xc/extras/Mesa/src/swrast/s_context.c @@ -1,4 +1,4 @@ -/* $Id: s_context.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_context.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_context.h b/xc/extras/Mesa/src/swrast/s_context.h index fd7a6bbe1..8d0008078 100644 --- a/xc/extras/Mesa/src/swrast/s_context.h +++ b/xc/extras/Mesa/src/swrast/s_context.h @@ -1,4 +1,4 @@ -/* $Id: s_context.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_context.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_copypix.c b/xc/extras/Mesa/src/swrast/s_copypix.c index 4220e47ca..630601c9e 100644 --- a/xc/extras/Mesa/src/swrast/s_copypix.c +++ b/xc/extras/Mesa/src/swrast/s_copypix.c @@ -1,4 +1,4 @@ -/* $Id: s_copypix.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_copypix.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_depth.c b/xc/extras/Mesa/src/swrast/s_depth.c index ea9941501..a8694730c 100644 --- a/xc/extras/Mesa/src/swrast/s_depth.c +++ b/xc/extras/Mesa/src/swrast/s_depth.c @@ -1,4 +1,4 @@ -/* $Id: s_depth.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_depth.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_depth.h b/xc/extras/Mesa/src/swrast/s_depth.h index cb843e394..f46496480 100644 --- a/xc/extras/Mesa/src/swrast/s_depth.h +++ b/xc/extras/Mesa/src/swrast/s_depth.h @@ -1,4 +1,4 @@ -/* $Id: s_depth.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_depth.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_drawpix.c b/xc/extras/Mesa/src/swrast/s_drawpix.c index 0b535eeb6..52978aabc 100644 --- a/xc/extras/Mesa/src/swrast/s_drawpix.c +++ b/xc/extras/Mesa/src/swrast/s_drawpix.c @@ -1,10 +1,10 @@ -/* $Id: s_drawpix.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_drawpix.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 4.0.2 * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -643,7 +643,7 @@ draw_depth_pixels( GLcontext *ctx, GLint x, GLint y, } } - if (type==GL_UNSIGNED_SHORT && sizeof(GLdepth)==sizeof(GLushort) + if (type==GL_UNSIGNED_SHORT && ctx->Visual.depthBits == 16 && !bias_or_scale && !zoom && ctx->Visual.rgbMode) { /* Special case: directly write 16-bit depth values */ GLint row; @@ -686,7 +686,7 @@ draw_depth_pixels( GLcontext *ctx, GLint x, GLint y, const GLfloat zs = ctx->DepthMaxF; GLint i; for (i = 0; i < drawWidth; i++) { - zspan[i] = (GLdepth) (fspan[i] * zs); + zspan[i] = (GLdepth) (fspan[i] * zs + 0.5F); } } diff --git a/xc/extras/Mesa/src/swrast/s_drawpix.h b/xc/extras/Mesa/src/swrast/s_drawpix.h index ba6ba2ce1..2fd60706d 100644 --- a/xc/extras/Mesa/src/swrast/s_drawpix.h +++ b/xc/extras/Mesa/src/swrast/s_drawpix.h @@ -1,4 +1,4 @@ -/* $Id: s_drawpix.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_drawpix.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_feedback.c b/xc/extras/Mesa/src/swrast/s_feedback.c index f06bdd3ef..daa54a333 100644 --- a/xc/extras/Mesa/src/swrast/s_feedback.c +++ b/xc/extras/Mesa/src/swrast/s_feedback.c @@ -1,4 +1,4 @@ -/* $Id: s_feedback.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_feedback.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_feedback.h b/xc/extras/Mesa/src/swrast/s_feedback.h index 7a4618374..e29379c3a 100644 --- a/xc/extras/Mesa/src/swrast/s_feedback.h +++ b/xc/extras/Mesa/src/swrast/s_feedback.h @@ -1,4 +1,4 @@ -/* $Id: s_feedback.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_feedback.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_fog.c b/xc/extras/Mesa/src/swrast/s_fog.c index 7e0a82a66..17ebc9f5a 100644 --- a/xc/extras/Mesa/src/swrast/s_fog.c +++ b/xc/extras/Mesa/src/swrast/s_fog.c @@ -1,4 +1,4 @@ -/* $Id: s_fog.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_fog.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_fog.h b/xc/extras/Mesa/src/swrast/s_fog.h index cdd36efab..cd1404689 100644 --- a/xc/extras/Mesa/src/swrast/s_fog.h +++ b/xc/extras/Mesa/src/swrast/s_fog.h @@ -1,4 +1,4 @@ -/* $Id: s_fog.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_fog.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_histogram.c b/xc/extras/Mesa/src/swrast/s_histogram.c index 90b3ac2c3..b2f0a8adc 100644 --- a/xc/extras/Mesa/src/swrast/s_histogram.c +++ b/xc/extras/Mesa/src/swrast/s_histogram.c @@ -1,4 +1,4 @@ -/* $Id: s_histogram.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_histogram.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_histogram.h b/xc/extras/Mesa/src/swrast/s_histogram.h index 72f8282cc..7f33e760e 100644 --- a/xc/extras/Mesa/src/swrast/s_histogram.h +++ b/xc/extras/Mesa/src/swrast/s_histogram.h @@ -1,4 +1,4 @@ -/* $Id: s_histogram.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_histogram.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_imaging.c b/xc/extras/Mesa/src/swrast/s_imaging.c index 885135678..c38364e18 100644 --- a/xc/extras/Mesa/src/swrast/s_imaging.c +++ b/xc/extras/Mesa/src/swrast/s_imaging.c @@ -1,4 +1,4 @@ -/* $Id: s_imaging.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_imaging.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_lines.c b/xc/extras/Mesa/src/swrast/s_lines.c index c2379e821..a64cfa58b 100644 --- a/xc/extras/Mesa/src/swrast/s_lines.c +++ b/xc/extras/Mesa/src/swrast/s_lines.c @@ -1,4 +1,4 @@ -/* $Id: s_lines.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_lines.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_lines.h b/xc/extras/Mesa/src/swrast/s_lines.h index 2b3f74dc7..89b9e3751 100644 --- a/xc/extras/Mesa/src/swrast/s_lines.h +++ b/xc/extras/Mesa/src/swrast/s_lines.h @@ -1,4 +1,4 @@ -/* $Id: s_lines.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_lines.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_linetemp.h b/xc/extras/Mesa/src/swrast/s_linetemp.h index c0b2e2510..e019c2421 100644 --- a/xc/extras/Mesa/src/swrast/s_linetemp.h +++ b/xc/extras/Mesa/src/swrast/s_linetemp.h @@ -1,4 +1,4 @@ -/* $Id: s_linetemp.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_linetemp.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_logic.c b/xc/extras/Mesa/src/swrast/s_logic.c index df0e740bc..55f1b0964 100644 --- a/xc/extras/Mesa/src/swrast/s_logic.c +++ b/xc/extras/Mesa/src/swrast/s_logic.c @@ -1,4 +1,4 @@ -/* $Id: s_logic.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_logic.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_logic.h b/xc/extras/Mesa/src/swrast/s_logic.h index 44c9a7bbd..c95583090 100644 --- a/xc/extras/Mesa/src/swrast/s_logic.h +++ b/xc/extras/Mesa/src/swrast/s_logic.h @@ -1,4 +1,4 @@ -/* $Id: s_logic.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_logic.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_masking.c b/xc/extras/Mesa/src/swrast/s_masking.c index 08a4567b2..12a02ed05 100644 --- a/xc/extras/Mesa/src/swrast/s_masking.c +++ b/xc/extras/Mesa/src/swrast/s_masking.c @@ -1,4 +1,4 @@ -/* $Id: s_masking.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_masking.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_masking.h b/xc/extras/Mesa/src/swrast/s_masking.h index 1cbf065f7..fc78f8d0f 100644 --- a/xc/extras/Mesa/src/swrast/s_masking.h +++ b/xc/extras/Mesa/src/swrast/s_masking.h @@ -1,4 +1,4 @@ -/* $Id: s_masking.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_masking.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_pb.c b/xc/extras/Mesa/src/swrast/s_pb.c index 53aeb6b16..109a6c0c0 100644 --- a/xc/extras/Mesa/src/swrast/s_pb.c +++ b/xc/extras/Mesa/src/swrast/s_pb.c @@ -1,4 +1,4 @@ -/* $Id: s_pb.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_pb.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_pb.h b/xc/extras/Mesa/src/swrast/s_pb.h index c1361bd32..d7c2cca80 100644 --- a/xc/extras/Mesa/src/swrast/s_pb.h +++ b/xc/extras/Mesa/src/swrast/s_pb.h @@ -1,4 +1,4 @@ -/* $Id: s_pb.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_pb.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_pixeltex.c b/xc/extras/Mesa/src/swrast/s_pixeltex.c index 95f6b18e8..3feaf3c4a 100644 --- a/xc/extras/Mesa/src/swrast/s_pixeltex.c +++ b/xc/extras/Mesa/src/swrast/s_pixeltex.c @@ -1,4 +1,4 @@ -/* $Id: s_pixeltex.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_pixeltex.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_pixeltex.h b/xc/extras/Mesa/src/swrast/s_pixeltex.h index 285cc5e4a..8963019d7 100644 --- a/xc/extras/Mesa/src/swrast/s_pixeltex.h +++ b/xc/extras/Mesa/src/swrast/s_pixeltex.h @@ -1,4 +1,4 @@ -/* $Id: s_pixeltex.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_pixeltex.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_points.c b/xc/extras/Mesa/src/swrast/s_points.c index 48419d11f..cf8bfd778 100644 --- a/xc/extras/Mesa/src/swrast/s_points.c +++ b/xc/extras/Mesa/src/swrast/s_points.c @@ -1,4 +1,4 @@ -/* $Id: s_points.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_points.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_points.h b/xc/extras/Mesa/src/swrast/s_points.h index bfd34a8bc..2d2b2c120 100644 --- a/xc/extras/Mesa/src/swrast/s_points.h +++ b/xc/extras/Mesa/src/swrast/s_points.h @@ -1,4 +1,4 @@ -/* $Id: s_points.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_points.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_pointtemp.h b/xc/extras/Mesa/src/swrast/s_pointtemp.h index 56bfd97b6..8971c2738 100644 --- a/xc/extras/Mesa/src/swrast/s_pointtemp.h +++ b/xc/extras/Mesa/src/swrast/s_pointtemp.h @@ -1,4 +1,4 @@ -/* $Id: s_pointtemp.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_pointtemp.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_readpix.c b/xc/extras/Mesa/src/swrast/s_readpix.c index 1d5078733..b491a0964 100644 --- a/xc/extras/Mesa/src/swrast/s_readpix.c +++ b/xc/extras/Mesa/src/swrast/s_readpix.c @@ -1,4 +1,4 @@ -/* $Id: s_readpix.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_readpix.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_scissor.c b/xc/extras/Mesa/src/swrast/s_scissor.c index 8d43ca3e3..5c595b710 100644 --- a/xc/extras/Mesa/src/swrast/s_scissor.c +++ b/xc/extras/Mesa/src/swrast/s_scissor.c @@ -1,4 +1,4 @@ -/* $Id: s_scissor.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_scissor.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_scissor.h b/xc/extras/Mesa/src/swrast/s_scissor.h index 9e75a23f7..30f9153fe 100644 --- a/xc/extras/Mesa/src/swrast/s_scissor.h +++ b/xc/extras/Mesa/src/swrast/s_scissor.h @@ -1,4 +1,4 @@ -/* $Id: s_scissor.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_scissor.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_span.c b/xc/extras/Mesa/src/swrast/s_span.c index e41d2c0ff..dd2578dd7 100644 --- a/xc/extras/Mesa/src/swrast/s_span.c +++ b/xc/extras/Mesa/src/swrast/s_span.c @@ -1,4 +1,4 @@ -/* $Id: s_span.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_span.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_span.h b/xc/extras/Mesa/src/swrast/s_span.h index 9b2eb6604..859f5f27e 100644 --- a/xc/extras/Mesa/src/swrast/s_span.h +++ b/xc/extras/Mesa/src/swrast/s_span.h @@ -1,4 +1,4 @@ -/* $Id: s_span.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_span.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_stencil.c b/xc/extras/Mesa/src/swrast/s_stencil.c index 5438b4a94..7415dc346 100644 --- a/xc/extras/Mesa/src/swrast/s_stencil.c +++ b/xc/extras/Mesa/src/swrast/s_stencil.c @@ -1,4 +1,4 @@ -/* $Id: s_stencil.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_stencil.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_stencil.h b/xc/extras/Mesa/src/swrast/s_stencil.h index b4eb45f1a..b628f8fc8 100644 --- a/xc/extras/Mesa/src/swrast/s_stencil.h +++ b/xc/extras/Mesa/src/swrast/s_stencil.h @@ -1,4 +1,4 @@ -/* $Id: s_stencil.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_stencil.h,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_texstore.c b/xc/extras/Mesa/src/swrast/s_texstore.c index 3300eb289..5c4e52b2f 100644 --- a/xc/extras/Mesa/src/swrast/s_texstore.c +++ b/xc/extras/Mesa/src/swrast/s_texstore.c @@ -1,4 +1,4 @@ -/* $Id: s_texstore.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_texstore.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_texture.c b/xc/extras/Mesa/src/swrast/s_texture.c index e0d9f780c..41e78e4d3 100644 --- a/xc/extras/Mesa/src/swrast/s_texture.c +++ b/xc/extras/Mesa/src/swrast/s_texture.c @@ -1,4 +1,4 @@ -/* $Id: s_texture.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_texture.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_texture.h b/xc/extras/Mesa/src/swrast/s_texture.h index 7242ffad0..e285a038c 100644 --- a/xc/extras/Mesa/src/swrast/s_texture.h +++ b/xc/extras/Mesa/src/swrast/s_texture.h @@ -1,4 +1,4 @@ -/* $Id: s_texture.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_texture.h,v 1.3 2002/02/21 11:43:10 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_triangle.c b/xc/extras/Mesa/src/swrast/s_triangle.c index c84718a0a..24eacba11 100644 --- a/xc/extras/Mesa/src/swrast/s_triangle.c +++ b/xc/extras/Mesa/src/swrast/s_triangle.c @@ -1,4 +1,4 @@ -/* $Id: s_triangle.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_triangle.c,v 1.3 2002/02/21 11:43:10 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -1717,7 +1717,7 @@ _swrast_choose_triangle( GLcontext *ctx ) } } else { -#if CHAN_TYPE == GL_FLOAT +#if (CHAN_BITS == 16 || CHAN_BITS == 32) USE(general_textured_triangle); #else USE(affine_textured_triangle); @@ -1725,7 +1725,7 @@ _swrast_choose_triangle( GLcontext *ctx ) } } else { -#if CHAN_TYPE == GL_FLOAT +#if (CHAN_BITS == 16 || CHAN_BITS == 32) USE(general_textured_triangle); #else USE(persp_textured_triangle); diff --git a/xc/extras/Mesa/src/swrast/s_triangle.h b/xc/extras/Mesa/src/swrast/s_triangle.h index 45b3f1ebc..24bb57a69 100644 --- a/xc/extras/Mesa/src/swrast/s_triangle.h +++ b/xc/extras/Mesa/src/swrast/s_triangle.h @@ -1,4 +1,4 @@ -/* $Id: s_triangle.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_triangle.h,v 1.3 2002/02/21 11:43:10 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_trispan.h b/xc/extras/Mesa/src/swrast/s_trispan.h index 22b2fff15..0a370cf04 100644 --- a/xc/extras/Mesa/src/swrast/s_trispan.h +++ b/xc/extras/Mesa/src/swrast/s_trispan.h @@ -1,4 +1,4 @@ -/* $Id: s_trispan.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_trispan.h,v 1.3 2002/02/21 11:43:10 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_tritemp.h b/xc/extras/Mesa/src/swrast/s_tritemp.h index c06eac51b..bdac05b61 100644 --- a/xc/extras/Mesa/src/swrast/s_tritemp.h +++ b/xc/extras/Mesa/src/swrast/s_tritemp.h @@ -1,4 +1,4 @@ -/* $Id: s_tritemp.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_tritemp.h,v 1.3 2002/02/21 11:43:10 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -126,6 +126,19 @@ (void) fixedToDepthShift; #endif + /* + printf("%s()\n", __FUNCTION__); + printf(" %g, %g, %g\n", v0->win[0], v0->win[1], v0->win[2]); + printf(" %d, %d, %d, %d\n", + v0->color[0], v0->color[1], v0->color[2], v0->color[3]); + printf(" %g, %g, %g\n", v1->win[0], v1->win[1], v1->win[2]); + printf(" %d, %d, %d, %d\n", + v1->color[0], v1->color[1], v1->color[2], v1->color[3]); + printf(" %g, %g, %g\n", v2->win[0], v2->win[1], v2->win[2]); + printf(" %d, %d, %d, %d\n", + v2->color[0], v2->color[1], v2->color[2], v2->color[3]); + */ + /* Compute fixed point x,y coords w/ half-pixel offsets and snapping. * And find the order of the 3 vertices along the Y axis. */ diff --git a/xc/extras/Mesa/src/swrast/s_zoom.c b/xc/extras/Mesa/src/swrast/s_zoom.c index 4a3b07d7b..c94d61d0a 100644 --- a/xc/extras/Mesa/src/swrast/s_zoom.c +++ b/xc/extras/Mesa/src/swrast/s_zoom.c @@ -1,4 +1,4 @@ -/* $Id: s_zoom.c,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_zoom.c,v 1.3 2002/02/21 11:43:10 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/s_zoom.h b/xc/extras/Mesa/src/swrast/s_zoom.h index c7e191c91..ebbb190a0 100644 --- a/xc/extras/Mesa/src/swrast/s_zoom.h +++ b/xc/extras/Mesa/src/swrast/s_zoom.h @@ -1,4 +1,4 @@ -/* $Id: s_zoom.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: s_zoom.h,v 1.3 2002/02/21 11:43:10 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast/swrast.h b/xc/extras/Mesa/src/swrast/swrast.h index a160ec1a9..f051c733d 100644 --- a/xc/extras/Mesa/src/swrast/swrast.h +++ b/xc/extras/Mesa/src/swrast/swrast.h @@ -1,4 +1,4 @@ -/* $Id: swrast.h,v 1.2 2002/02/14 01:59:40 dawes Exp $ */ +/* $Id: swrast.h,v 1.3 2002/02/21 11:43:10 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast_setup/ss_context.c b/xc/extras/Mesa/src/swrast_setup/ss_context.c index 8e289ed39..793244e6c 100644 --- a/xc/extras/Mesa/src/swrast_setup/ss_context.c +++ b/xc/extras/Mesa/src/swrast_setup/ss_context.c @@ -1,4 +1,4 @@ -/* $Id: ss_context.c,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: ss_context.c,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast_setup/ss_context.h b/xc/extras/Mesa/src/swrast_setup/ss_context.h index 6b14c2ac2..c3258e938 100644 --- a/xc/extras/Mesa/src/swrast_setup/ss_context.h +++ b/xc/extras/Mesa/src/swrast_setup/ss_context.h @@ -1,4 +1,4 @@ -/* $Id: ss_context.h,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: ss_context.h,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast_setup/ss_triangle.c b/xc/extras/Mesa/src/swrast_setup/ss_triangle.c index 483eb2ebd..9f653cea7 100644 --- a/xc/extras/Mesa/src/swrast_setup/ss_triangle.c +++ b/xc/extras/Mesa/src/swrast_setup/ss_triangle.c @@ -1,4 +1,4 @@ -/* $Id: ss_triangle.c,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: ss_triangle.c,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast_setup/ss_triangle.h b/xc/extras/Mesa/src/swrast_setup/ss_triangle.h index e01aa475a..874402755 100644 --- a/xc/extras/Mesa/src/swrast_setup/ss_triangle.h +++ b/xc/extras/Mesa/src/swrast_setup/ss_triangle.h @@ -1,4 +1,4 @@ -/* $Id: ss_triangle.h,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: ss_triangle.h,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast_setup/ss_tritmp.h b/xc/extras/Mesa/src/swrast_setup/ss_tritmp.h index 84f4de231..faabd3788 100644 --- a/xc/extras/Mesa/src/swrast_setup/ss_tritmp.h +++ b/xc/extras/Mesa/src/swrast_setup/ss_tritmp.h @@ -1,4 +1,4 @@ -/* $Id: ss_tritmp.h,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: ss_tritmp.h,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast_setup/ss_vb.c b/xc/extras/Mesa/src/swrast_setup/ss_vb.c index 3c27316c7..9205ba44d 100644 --- a/xc/extras/Mesa/src/swrast_setup/ss_vb.c +++ b/xc/extras/Mesa/src/swrast_setup/ss_vb.c @@ -1,4 +1,4 @@ -/* $Id: ss_vb.c,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: ss_vb.c,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast_setup/ss_vb.h b/xc/extras/Mesa/src/swrast_setup/ss_vb.h index d05b63e07..d11bd58ee 100644 --- a/xc/extras/Mesa/src/swrast_setup/ss_vb.h +++ b/xc/extras/Mesa/src/swrast_setup/ss_vb.h @@ -1,4 +1,4 @@ -/* $Id: ss_vb.h,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: ss_vb.h,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast_setup/ss_vbtmp.h b/xc/extras/Mesa/src/swrast_setup/ss_vbtmp.h index 9f594d26d..fd5023844 100644 --- a/xc/extras/Mesa/src/swrast_setup/ss_vbtmp.h +++ b/xc/extras/Mesa/src/swrast_setup/ss_vbtmp.h @@ -1,4 +1,4 @@ -/* $Id: ss_vbtmp.h,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: ss_vbtmp.h,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/swrast_setup/swrast_setup.h b/xc/extras/Mesa/src/swrast_setup/swrast_setup.h index fc04a86f8..0cbceb83b 100644 --- a/xc/extras/Mesa/src/swrast_setup/swrast_setup.h +++ b/xc/extras/Mesa/src/swrast_setup/swrast_setup.h @@ -1,4 +1,4 @@ -/* $Id: swrast_setup.h,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: swrast_setup.h,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texformat.c b/xc/extras/Mesa/src/texformat.c index 20c5e6ed1..dbd6f8aa4 100644 --- a/xc/extras/Mesa/src/texformat.c +++ b/xc/extras/Mesa/src/texformat.c @@ -1,4 +1,4 @@ -/* $Id: texformat.c,v 1.3 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: texformat.c,v 1.4 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texformat.h b/xc/extras/Mesa/src/texformat.h index e944f7324..e355ed7f3 100644 --- a/xc/extras/Mesa/src/texformat.h +++ b/xc/extras/Mesa/src/texformat.h @@ -1,4 +1,4 @@ -/* $Id: texformat.h,v 1.3 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: texformat.h,v 1.4 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texformat_tmp.h b/xc/extras/Mesa/src/texformat_tmp.h index d7ddc5f9b..0fc323edd 100644 --- a/xc/extras/Mesa/src/texformat_tmp.h +++ b/xc/extras/Mesa/src/texformat_tmp.h @@ -1,4 +1,4 @@ -/* $Id: texformat_tmp.h,v 1.2 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: texformat_tmp.h,v 1.3 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/teximage.c b/xc/extras/Mesa/src/teximage.c index a1ea9e830..e044e61a9 100644 --- a/xc/extras/Mesa/src/teximage.c +++ b/xc/extras/Mesa/src/teximage.c @@ -1,4 +1,4 @@ -/* $Id: teximage.c,v 1.25 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: teximage.c,v 1.26 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/teximage.h b/xc/extras/Mesa/src/teximage.h index 28978603e..6273ceef8 100644 --- a/xc/extras/Mesa/src/teximage.h +++ b/xc/extras/Mesa/src/teximage.h @@ -1,4 +1,4 @@ -/* $Id: teximage.h,v 1.15 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: teximage.h,v 1.16 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texobj.c b/xc/extras/Mesa/src/texobj.c index 0b1520b67..673af2836 100644 --- a/xc/extras/Mesa/src/texobj.c +++ b/xc/extras/Mesa/src/texobj.c @@ -1,4 +1,4 @@ -/* $Id: texobj.c,v 1.21 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: texobj.c,v 1.22 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texobj.h b/xc/extras/Mesa/src/texobj.h index 71c14105d..445742454 100644 --- a/xc/extras/Mesa/src/texobj.h +++ b/xc/extras/Mesa/src/texobj.h @@ -1,4 +1,4 @@ -/* $Id: texobj.h,v 1.8 2002/02/14 01:59:31 dawes Exp $ */ +/* $Id: texobj.h,v 1.9 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texstate.c b/xc/extras/Mesa/src/texstate.c index 992d61417..c5ec10791 100644 --- a/xc/extras/Mesa/src/texstate.c +++ b/xc/extras/Mesa/src/texstate.c @@ -1,4 +1,4 @@ -/* $Id: texstate.c,v 1.20 2002/02/14 01:59:32 dawes Exp $ */ +/* $Id: texstate.c,v 1.21 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -469,7 +469,7 @@ _mesa_TexEnviv( GLenum target, GLenum pname, const GLint *param ) p[3] = INT_TO_FLOAT( param[3] ); } else { - p[0] = (GLint) param[0]; + p[0] = (GLfloat) param[0]; p[1] = p[2] = p[3] = 0; /* init to zero, just to be safe */ } _mesa_TexEnvfv( target, pname, p ); diff --git a/xc/extras/Mesa/src/texstate.h b/xc/extras/Mesa/src/texstate.h index fa4413ded..15d17e94b 100644 --- a/xc/extras/Mesa/src/texstate.h +++ b/xc/extras/Mesa/src/texstate.h @@ -1,4 +1,4 @@ -/* $Id: texstate.h,v 1.7 2002/02/14 01:59:32 dawes Exp $ */ +/* $Id: texstate.h,v 1.8 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texstore.c b/xc/extras/Mesa/src/texstore.c index 829219213..96abc885a 100644 --- a/xc/extras/Mesa/src/texstore.c +++ b/xc/extras/Mesa/src/texstore.c @@ -1,4 +1,4 @@ -/* $Id: texstore.c,v 1.2 2002/02/14 01:59:32 dawes Exp $ */ +/* $Id: texstore.c,v 1.3 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texstore.h b/xc/extras/Mesa/src/texstore.h index ad807c641..bbbee479b 100644 --- a/xc/extras/Mesa/src/texstore.h +++ b/xc/extras/Mesa/src/texstore.h @@ -1,4 +1,4 @@ -/* $Id: texstore.h,v 1.2 2002/02/14 01:59:32 dawes Exp $ */ +/* $Id: texstore.h,v 1.3 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texutil.c b/xc/extras/Mesa/src/texutil.c index 2ba86aafc..c3b1f6823 100644 --- a/xc/extras/Mesa/src/texutil.c +++ b/xc/extras/Mesa/src/texutil.c @@ -1,4 +1,4 @@ -/* $Id: texutil.c,v 1.13 2002/02/14 01:59:32 dawes Exp $ */ +/* $Id: texutil.c,v 1.14 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texutil.h b/xc/extras/Mesa/src/texutil.h index cf44cebff..b9ceabaa1 100644 --- a/xc/extras/Mesa/src/texutil.h +++ b/xc/extras/Mesa/src/texutil.h @@ -1,4 +1,4 @@ -/* $Id: texutil.h,v 1.7 2002/02/14 01:59:32 dawes Exp $ */ +/* $Id: texutil.h,v 1.8 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texutil_tmp.h b/xc/extras/Mesa/src/texutil_tmp.h index d36f3e67e..24985dd38 100644 --- a/xc/extras/Mesa/src/texutil_tmp.h +++ b/xc/extras/Mesa/src/texutil_tmp.h @@ -1,4 +1,4 @@ -/* $Id: texutil_tmp.h,v 1.4 2002/02/14 01:59:32 dawes Exp $ */ +/* $Id: texutil_tmp.h,v 1.5 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_array_api.c b/xc/extras/Mesa/src/tnl/t_array_api.c index 40f80b062..36bc357ea 100644 --- a/xc/extras/Mesa/src/tnl/t_array_api.c +++ b/xc/extras/Mesa/src/tnl/t_array_api.c @@ -1,4 +1,4 @@ -/* $Id: t_array_api.c,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: t_array_api.c,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_array_api.h b/xc/extras/Mesa/src/tnl/t_array_api.h index 2b3e3aaa4..bb2bcddf2 100644 --- a/xc/extras/Mesa/src/tnl/t_array_api.h +++ b/xc/extras/Mesa/src/tnl/t_array_api.h @@ -1,4 +1,4 @@ -/* $Id: t_array_api.h,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: t_array_api.h,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_array_import.c b/xc/extras/Mesa/src/tnl/t_array_import.c index b74053ee3..e8a9ce569 100644 --- a/xc/extras/Mesa/src/tnl/t_array_import.c +++ b/xc/extras/Mesa/src/tnl/t_array_import.c @@ -1,4 +1,4 @@ -/* $Id: t_array_import.c,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: t_array_import.c,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_array_import.h b/xc/extras/Mesa/src/tnl/t_array_import.h index e05967c82..757c58b6e 100644 --- a/xc/extras/Mesa/src/tnl/t_array_import.h +++ b/xc/extras/Mesa/src/tnl/t_array_import.h @@ -1,4 +1,4 @@ -/* $Id: t_array_import.h,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: t_array_import.h,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_context.c b/xc/extras/Mesa/src/tnl/t_context.c index b3a86ac1d..4ee7a4f78 100644 --- a/xc/extras/Mesa/src/tnl/t_context.c +++ b/xc/extras/Mesa/src/tnl/t_context.c @@ -1,4 +1,4 @@ -/* $Id: t_context.c,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: t_context.c,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_context.h b/xc/extras/Mesa/src/tnl/t_context.h index 070d8f14e..350e83216 100644 --- a/xc/extras/Mesa/src/tnl/t_context.h +++ b/xc/extras/Mesa/src/tnl/t_context.h @@ -1,4 +1,4 @@ -/* $Id: t_context.h,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: t_context.h,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_eval_api.c b/xc/extras/Mesa/src/tnl/t_eval_api.c index 1b06e88ce..8048736a8 100644 --- a/xc/extras/Mesa/src/tnl/t_eval_api.c +++ b/xc/extras/Mesa/src/tnl/t_eval_api.c @@ -1,4 +1,4 @@ -/* $Id: t_eval_api.c,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: t_eval_api.c,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_eval_api.h b/xc/extras/Mesa/src/tnl/t_eval_api.h index 7335411ff..153f3489e 100644 --- a/xc/extras/Mesa/src/tnl/t_eval_api.h +++ b/xc/extras/Mesa/src/tnl/t_eval_api.h @@ -1,4 +1,4 @@ -/* $Id: t_eval_api.h,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: t_eval_api.h,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_imm_alloc.c b/xc/extras/Mesa/src/tnl/t_imm_alloc.c index 87003ec66..ac3efbd63 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_alloc.c +++ b/xc/extras/Mesa/src/tnl/t_imm_alloc.c @@ -1,4 +1,4 @@ -/* $Id: t_imm_alloc.c,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: t_imm_alloc.c,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_imm_alloc.h b/xc/extras/Mesa/src/tnl/t_imm_alloc.h index 2dc9f380c..d88d87841 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_alloc.h +++ b/xc/extras/Mesa/src/tnl/t_imm_alloc.h @@ -1,4 +1,4 @@ -/* $Id: t_imm_alloc.h,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: t_imm_alloc.h,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_imm_api.c b/xc/extras/Mesa/src/tnl/t_imm_api.c index c2292aada..ccc404e58 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_api.c +++ b/xc/extras/Mesa/src/tnl/t_imm_api.c @@ -1,4 +1,4 @@ -/* $Id: t_imm_api.c,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: t_imm_api.c,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_imm_api.h b/xc/extras/Mesa/src/tnl/t_imm_api.h index 2f1693df4..d03a729dc 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_api.h +++ b/xc/extras/Mesa/src/tnl/t_imm_api.h @@ -1,4 +1,4 @@ -/* $Id: t_imm_api.h,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: t_imm_api.h,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_imm_debug.c b/xc/extras/Mesa/src/tnl/t_imm_debug.c index 1fa5dac7f..ee6264b54 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_debug.c +++ b/xc/extras/Mesa/src/tnl/t_imm_debug.c @@ -1,4 +1,4 @@ -/* $Id: t_imm_debug.c,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: t_imm_debug.c,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_imm_debug.h b/xc/extras/Mesa/src/tnl/t_imm_debug.h index 4e48fb0be..e238fe350 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_debug.h +++ b/xc/extras/Mesa/src/tnl/t_imm_debug.h @@ -1,4 +1,4 @@ -/* $Id: t_imm_debug.h,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: t_imm_debug.h,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_imm_dlist.c b/xc/extras/Mesa/src/tnl/t_imm_dlist.c index 08e433d88..7a3501784 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_dlist.c +++ b/xc/extras/Mesa/src/tnl/t_imm_dlist.c @@ -1,4 +1,4 @@ -/* $Id: t_imm_dlist.c,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: t_imm_dlist.c,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_imm_dlist.h b/xc/extras/Mesa/src/tnl/t_imm_dlist.h index 98ea3377c..12006169a 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_dlist.h +++ b/xc/extras/Mesa/src/tnl/t_imm_dlist.h @@ -1,4 +1,4 @@ -/* $Id: t_imm_dlist.h,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: t_imm_dlist.h,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_imm_elt.c b/xc/extras/Mesa/src/tnl/t_imm_elt.c index c7c305a49..42edf18f4 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_elt.c +++ b/xc/extras/Mesa/src/tnl/t_imm_elt.c @@ -1,4 +1,4 @@ -/* $Id: t_imm_elt.c,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: t_imm_elt.c,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_imm_elt.h b/xc/extras/Mesa/src/tnl/t_imm_elt.h index 646f9790c..3abf7b0a6 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_elt.h +++ b/xc/extras/Mesa/src/tnl/t_imm_elt.h @@ -1,4 +1,4 @@ -/* $Id: t_imm_elt.h,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: t_imm_elt.h,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_imm_eval.c b/xc/extras/Mesa/src/tnl/t_imm_eval.c index 0d05a2da6..ad690b074 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_eval.c +++ b/xc/extras/Mesa/src/tnl/t_imm_eval.c @@ -1,4 +1,4 @@ -/* $Id: t_imm_eval.c,v 1.2 2002/02/14 01:59:41 dawes Exp $ */ +/* $Id: t_imm_eval.c,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_imm_eval.h b/xc/extras/Mesa/src/tnl/t_imm_eval.h index 2b071318e..f49ef8cf7 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_eval.h +++ b/xc/extras/Mesa/src/tnl/t_imm_eval.h @@ -1,4 +1,4 @@ -/* $Id: t_imm_eval.h,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_imm_eval.h,v 1.3 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_imm_exec.c b/xc/extras/Mesa/src/tnl/t_imm_exec.c index 62e940dcd..2945ad709 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_exec.c +++ b/xc/extras/Mesa/src/tnl/t_imm_exec.c @@ -1,3 +1,4 @@ +/* $Id: t_imm_exec.c,v 1.4 2002/02/21 11:43:11 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_imm_exec.h b/xc/extras/Mesa/src/tnl/t_imm_exec.h index d5c8ec873..ead7a8914 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_exec.h +++ b/xc/extras/Mesa/src/tnl/t_imm_exec.h @@ -1,4 +1,4 @@ -/* $Id: t_imm_exec.h,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_imm_exec.h,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_imm_fixup.c b/xc/extras/Mesa/src/tnl/t_imm_fixup.c index e317f2b84..17540d417 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_fixup.c +++ b/xc/extras/Mesa/src/tnl/t_imm_fixup.c @@ -1,4 +1,4 @@ -/* $Id: t_imm_fixup.c,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_imm_fixup.c,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_imm_fixup.h b/xc/extras/Mesa/src/tnl/t_imm_fixup.h index 593a48631..d34228fd5 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_fixup.h +++ b/xc/extras/Mesa/src/tnl/t_imm_fixup.h @@ -1,4 +1,4 @@ -/* $Id: t_imm_fixup.h,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_imm_fixup.h,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_pipeline.c b/xc/extras/Mesa/src/tnl/t_pipeline.c index 5af635d62..a50c78bca 100644 --- a/xc/extras/Mesa/src/tnl/t_pipeline.c +++ b/xc/extras/Mesa/src/tnl/t_pipeline.c @@ -1,4 +1,4 @@ -/* $Id: t_pipeline.c,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_pipeline.c,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_pipeline.h b/xc/extras/Mesa/src/tnl/t_pipeline.h index 6f9bdfe51..6c962bb49 100644 --- a/xc/extras/Mesa/src/tnl/t_pipeline.h +++ b/xc/extras/Mesa/src/tnl/t_pipeline.h @@ -1,4 +1,4 @@ -/* $Id: t_pipeline.h,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_pipeline.h,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_vb_cliptmp.h b/xc/extras/Mesa/src/tnl/t_vb_cliptmp.h index e87e7e4be..dcafa3934 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_cliptmp.h +++ b/xc/extras/Mesa/src/tnl/t_vb_cliptmp.h @@ -1,4 +1,4 @@ -/* $Id: t_vb_cliptmp.h,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_vb_cliptmp.h,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_vb_fog.c b/xc/extras/Mesa/src/tnl/t_vb_fog.c index 1b0814736..e72f7cd16 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_fog.c +++ b/xc/extras/Mesa/src/tnl/t_vb_fog.c @@ -1,4 +1,4 @@ -/* $Id: t_vb_fog.c,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_vb_fog.c,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_vb_light.c b/xc/extras/Mesa/src/tnl/t_vb_light.c index e56d991a0..cfd8e084f 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_light.c +++ b/xc/extras/Mesa/src/tnl/t_vb_light.c @@ -1,4 +1,4 @@ -/* $Id: t_vb_light.c,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_vb_light.c,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_vb_lighttmp.h b/xc/extras/Mesa/src/tnl/t_vb_lighttmp.h index a169ca211..a8ae92cb1 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_lighttmp.h +++ b/xc/extras/Mesa/src/tnl/t_vb_lighttmp.h @@ -1,4 +1,4 @@ -/* $Id: t_vb_lighttmp.h,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_vb_lighttmp.h,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_vb_normals.c b/xc/extras/Mesa/src/tnl/t_vb_normals.c index 7bb3bcfd0..2c86f1922 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_normals.c +++ b/xc/extras/Mesa/src/tnl/t_vb_normals.c @@ -1,4 +1,4 @@ -/* $Id: t_vb_normals.c,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_vb_normals.c,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_vb_points.c b/xc/extras/Mesa/src/tnl/t_vb_points.c index bc72b15c1..2a6068f00 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_points.c +++ b/xc/extras/Mesa/src/tnl/t_vb_points.c @@ -1,4 +1,4 @@ -/* $Id: t_vb_points.c,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_vb_points.c,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_vb_render.c b/xc/extras/Mesa/src/tnl/t_vb_render.c index 66fdd54eb..e0553473d 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_render.c +++ b/xc/extras/Mesa/src/tnl/t_vb_render.c @@ -1,4 +1,4 @@ -/* $Id: t_vb_render.c,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_vb_render.c,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_vb_rendertmp.h b/xc/extras/Mesa/src/tnl/t_vb_rendertmp.h index 91b358b2c..e5dd1f03b 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_rendertmp.h +++ b/xc/extras/Mesa/src/tnl/t_vb_rendertmp.h @@ -1,4 +1,4 @@ -/* $Id: t_vb_rendertmp.h,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_vb_rendertmp.h,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_vb_texgen.c b/xc/extras/Mesa/src/tnl/t_vb_texgen.c index f2c36e3bf..5b88d83f0 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_texgen.c +++ b/xc/extras/Mesa/src/tnl/t_vb_texgen.c @@ -1,4 +1,4 @@ -/* $Id: t_vb_texgen.c,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_vb_texgen.c,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_vb_texmat.c b/xc/extras/Mesa/src/tnl/t_vb_texmat.c index 5a22abd2a..71cff8527 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_texmat.c +++ b/xc/extras/Mesa/src/tnl/t_vb_texmat.c @@ -1,4 +1,4 @@ -/* $Id: t_vb_texmat.c,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_vb_texmat.c,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/t_vb_vertex.c b/xc/extras/Mesa/src/tnl/t_vb_vertex.c index ef6b821cf..6cad378a5 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_vertex.c +++ b/xc/extras/Mesa/src/tnl/t_vb_vertex.c @@ -1,4 +1,4 @@ -/* $Id: t_vb_vertex.c,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_vb_vertex.c,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl/tnl.h b/xc/extras/Mesa/src/tnl/tnl.h index f3fcd9a42..9ff01672d 100644 --- a/xc/extras/Mesa/src/tnl/tnl.h +++ b/xc/extras/Mesa/src/tnl/tnl.h @@ -1,4 +1,4 @@ -/* $Id: tnl.h,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: tnl.h,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl_dd/t_dd.c b/xc/extras/Mesa/src/tnl_dd/t_dd.c index de45aa297..b06378676 100644 --- a/xc/extras/Mesa/src/tnl_dd/t_dd.c +++ b/xc/extras/Mesa/src/tnl_dd/t_dd.c @@ -1,4 +1,4 @@ -/* $Id: t_dd.c,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_dd.c,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl_dd/t_dd_dmatmp.h b/xc/extras/Mesa/src/tnl_dd/t_dd_dmatmp.h index 67c8ef3a4..93a41974f 100644 --- a/xc/extras/Mesa/src/tnl_dd/t_dd_dmatmp.h +++ b/xc/extras/Mesa/src/tnl_dd/t_dd_dmatmp.h @@ -1,4 +1,4 @@ -/* $Id: t_dd_dmatmp.h,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_dd_dmatmp.h,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl_dd/t_dd_rendertmp.h b/xc/extras/Mesa/src/tnl_dd/t_dd_rendertmp.h index 536f7f72d..50b275834 100644 --- a/xc/extras/Mesa/src/tnl_dd/t_dd_rendertmp.h +++ b/xc/extras/Mesa/src/tnl_dd/t_dd_rendertmp.h @@ -1,4 +1,4 @@ -/* $Id: t_dd_rendertmp.h,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_dd_rendertmp.h,v 1.3 2002/02/21 11:43:12 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl_dd/t_dd_tritmp.h b/xc/extras/Mesa/src/tnl_dd/t_dd_tritmp.h index 27f2b18d3..57387cd7e 100644 --- a/xc/extras/Mesa/src/tnl_dd/t_dd_tritmp.h +++ b/xc/extras/Mesa/src/tnl_dd/t_dd_tritmp.h @@ -1,4 +1,4 @@ -/* $Id: t_dd_tritmp.h,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_dd_tritmp.h,v 1.3 2002/02/21 11:43:13 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl_dd/t_dd_unfilled.h b/xc/extras/Mesa/src/tnl_dd/t_dd_unfilled.h index cc982ec96..3b7044841 100644 --- a/xc/extras/Mesa/src/tnl_dd/t_dd_unfilled.h +++ b/xc/extras/Mesa/src/tnl_dd/t_dd_unfilled.h @@ -1,4 +1,4 @@ -/* $Id: t_dd_unfilled.h,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_dd_unfilled.h,v 1.3 2002/02/21 11:43:13 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl_dd/t_dd_vb.c b/xc/extras/Mesa/src/tnl_dd/t_dd_vb.c index 12dadae09..1b23001c4 100644 --- a/xc/extras/Mesa/src/tnl_dd/t_dd_vb.c +++ b/xc/extras/Mesa/src/tnl_dd/t_dd_vb.c @@ -1,4 +1,4 @@ -/* $Id: t_dd_vb.c,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_dd_vb.c,v 1.3 2002/02/21 11:43:13 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl_dd/t_dd_vbtmp.h b/xc/extras/Mesa/src/tnl_dd/t_dd_vbtmp.h index 84badd7d0..d5c5a8fd3 100644 --- a/xc/extras/Mesa/src/tnl_dd/t_dd_vbtmp.h +++ b/xc/extras/Mesa/src/tnl_dd/t_dd_vbtmp.h @@ -1,4 +1,4 @@ -/* $Id: t_dd_vbtmp.h,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_dd_vbtmp.h,v 1.3 2002/02/21 11:43:13 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tnl_dd/t_dd_vertex.h b/xc/extras/Mesa/src/tnl_dd/t_dd_vertex.h index d526ba574..e32427bb2 100644 --- a/xc/extras/Mesa/src/tnl_dd/t_dd_vertex.h +++ b/xc/extras/Mesa/src/tnl_dd/t_dd_vertex.h @@ -1,4 +1,4 @@ -/* $Id: t_dd_vertex.h,v 1.2 2002/02/14 01:59:42 dawes Exp $ */ +/* $Id: t_dd_vertex.h,v 1.3 2002/02/21 11:43:13 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/varray.c b/xc/extras/Mesa/src/varray.c index 617058204..c2ad9aabb 100644 --- a/xc/extras/Mesa/src/varray.c +++ b/xc/extras/Mesa/src/varray.c @@ -1,4 +1,4 @@ -/* $Id: varray.c,v 1.17 2002/02/14 01:59:32 dawes Exp $ */ +/* $Id: varray.c,v 1.18 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/varray.h b/xc/extras/Mesa/src/varray.h index 9791d6b98..502478fcc 100644 --- a/xc/extras/Mesa/src/varray.h +++ b/xc/extras/Mesa/src/varray.h @@ -1,4 +1,4 @@ -/* $Id: varray.h,v 1.9 2002/02/14 01:59:32 dawes Exp $ */ +/* $Id: varray.h,v 1.10 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vtxfmt.c b/xc/extras/Mesa/src/vtxfmt.c index 5bcc7db47..a661836b5 100644 --- a/xc/extras/Mesa/src/vtxfmt.c +++ b/xc/extras/Mesa/src/vtxfmt.c @@ -1,4 +1,4 @@ -/* $Id: vtxfmt.c,v 1.2 2002/02/14 01:59:32 dawes Exp $ */ +/* $Id: vtxfmt.c,v 1.3 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vtxfmt.h b/xc/extras/Mesa/src/vtxfmt.h index ed2d3da16..061c09c6e 100644 --- a/xc/extras/Mesa/src/vtxfmt.h +++ b/xc/extras/Mesa/src/vtxfmt.h @@ -1,4 +1,4 @@ -/* $Id: vtxfmt.h,v 1.2 2002/02/14 01:59:32 dawes Exp $ */ +/* $Id: vtxfmt.h,v 1.3 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vtxfmt_tmp.h b/xc/extras/Mesa/src/vtxfmt_tmp.h index e708081ee..e122d5364 100644 --- a/xc/extras/Mesa/src/vtxfmt_tmp.h +++ b/xc/extras/Mesa/src/vtxfmt_tmp.h @@ -1,4 +1,4 @@ -/* $Id: vtxfmt_tmp.h,v 1.2 2002/02/14 01:59:32 dawes Exp $ */ +/* $Id: vtxfmt_tmp.h,v 1.3 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library |