diff options
| author | brianp <brianp> | 2002-03-16 16:52:53 +0000 |
|---|---|---|
| committer | brianp <brianp> | 2002-03-16 16:52:53 +0000 |
| commit | b6dcae8712b75a32e8274b39f9bd755e5ad7ae71 (patch) | |
| tree | 008cce68938a7c2f4d2d536cb3ac67876ef273c6 | |
| parent | 54b49ea21a5dea97ec96c8cfbbaf9053bc661b35 (diff) | |
Full sync with latest Mesa 4.0.2 sources. Remove CVS Id tokens.
306 files changed, 1138 insertions, 1208 deletions
diff --git a/xc/extras/Mesa/docs/RELNOTES-4.0.2 b/xc/extras/Mesa/docs/RELNOTES-4.0.2 new file mode 100644 index 000000000..2e6291594 --- /dev/null +++ b/xc/extras/Mesa/docs/RELNOTES-4.0.2 @@ -0,0 +1,50 @@ + + Mesa 4.0.2 release notes + + March ??, 2002 + + PLEASE READ!!!! + + + +Introduction +------------ + +Mesa uses an even/odd version number scheme like the Linux kernel. +Odd numbered versions (such as 3.3) designate new developmental releases. +Even numbered versions (such as 3.4) designate stable releases. + +Mesa 4.0.2 only contains bug fixes and a new DOS driver since version 4.0.1. + +See the docs/VERSIONS file for the list of bug fixes. + + +Device Drivers +-------------- + +Mesa advertises itself as either OpenGL 1.2 or OpenGL 1.3 depending on the +device driver. If the driver enables all the ARB extensions which are part +of OpenGL 1.3 then glGetString(GL_VERSION) will return "1.3". Otherwise, +it'll return "1.2". + +A number of Mesa's software drivers haven't been actively maintained for +some time. We rely on volunteers to maintain many of the drivers. +Here's the current status of all included drivers: + +Driver Status +---------------------- --------------------- +XMesa (Xlib) implements OpenGL 1.3 +OSMesa (off-screen) implements OpenGL 1.3 +FX (3dfx Voodoo1/2) implements OpenGL 1.3 +SVGA implements OpenGL 1.3 +Wind River UGL implements OpenGL 1.3 +Windows/Win32 implements OpenGL 1.3 +DOS/DJGPP implements OpenGL 1.3 (new in Mesa 4.0.2) +GGI needs updating +BeOS needs updating +Allegro needs updating +D3D needs updating + + +---------------------------------------------------------------------- +$Id: RELNOTES-4.0.2,v 1.1 2002/03/16 16:52:53 brianp Exp $ diff --git a/xc/extras/Mesa/include/GL/gl.h b/xc/extras/Mesa/include/GL/gl.h index 396287ec1..38b0180a9 100644 --- a/xc/extras/Mesa/include/GL/gl.h +++ b/xc/extras/Mesa/include/GL/gl.h @@ -1,4 +1,3 @@ -/* $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 32b31b81d..272c7566f 100644 --- a/xc/extras/Mesa/include/GL/osmesa.h +++ b/xc/extras/Mesa/include/GL/osmesa.h @@ -1,4 +1,3 @@ -/* $Id: osmesa.h,v 1.7 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/include/GL/xmesa.h b/xc/extras/Mesa/include/GL/xmesa.h index 2fd151e76..494475263 100644 --- a/xc/extras/Mesa/include/GL/xmesa.h +++ b/xc/extras/Mesa/include/GL/xmesa.h @@ -1,10 +1,9 @@ -/* $Id: xmesa.h,v 1.10 2002/02/21 11:42:58 alanh Exp $ */ /* * Mesa 3-D graphics library - * Version: 4.0 + * 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"), @@ -365,6 +364,15 @@ extern GLboolean XMesaSetFXmode( GLint mode ); +/* + * Reallocate the back/depth/stencil/accum/etc/ buffers associated with + * buffer <b> if its size has changed. + * + * New in Mesa 4.0.2 + */ +extern void XMesaResizeBuffers( XMesaBuffer b ); + + #ifdef __cplusplus } #endif diff --git a/xc/extras/Mesa/src/OSmesa/osmesa.c b/xc/extras/Mesa/src/OSmesa/osmesa.c index afca3fbf0..d519baa50 100644 --- a/xc/extras/Mesa/src/OSmesa/osmesa.c +++ b/xc/extras/Mesa/src/OSmesa/osmesa.c @@ -1,10 +1,9 @@ -/* $Id: osmesa.c,v 1.11 2002/02/21 11:43:05 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"), @@ -427,21 +426,19 @@ static void compute_row_addresses( OSMesaContext ctx ) * with the lower-left image pixel stored in the first array position * (ie. bottom-to-top). * - * Since the only type initially supported is GL_UNSIGNED_BYTE, if the - * context is in RGBA mode, each pixel will be stored as a 4-byte RGBA - * value. If the context is in color indexed mode, each pixel will be - * stored as a 1-byte value. - * * If the context's viewport hasn't been initialized yet, it will now be * initialized to (0,0,width,height). * * Input: ctx - the rendering context * buffer - the image buffer memory - * type - data type for pixel components, only GL_UNSIGNED_BYTE - * and GL_UNSIGNED_SHORT_5_6_5 supported now. + * type - data type for pixel components + * Normally, only GL_UNSIGNED_BYTE and GL_UNSIGNED_SHORT_5_6_5 + * are supported. But if Mesa's been compiled with CHAN_BITS==16 + * then type must be GL_UNSIGNED_SHORT. And if Mesa's been build + * with CHAN_BITS==32 then type must be GL_FLOAT. * width, height - size of image buffer in pixels, at least 1 * Return: GL_TRUE if success, GL_FALSE if error because of invalid ctx, - * invalid buffer address, type!=GL_UNSIGNED_BYTE, width<1, height<1, + * invalid buffer address, invalid type, width<1, height<1, * width>internal limit or height>internal limit. */ GLAPI GLboolean GLAPIENTRY @@ -878,11 +875,15 @@ static void clear( GLcontext *ctx, GLbitfield mask, GLboolean all, -static void buffer_size( GLcontext *ctx, GLuint *width, GLuint *height ) +static void buffer_size( GLframebuffer *buffer, GLuint *width, GLuint *height ) { - OSMesaContext osmesa = OSMESA_CONTEXT(ctx); - *width = osmesa->width; - *height = osmesa->height; + GET_CURRENT_CONTEXT(ctx); + (void) buffer; + if (ctx) { + OSMesaContext osmesa = OSMESA_CONTEXT(ctx); + *width = osmesa->width; + *height = osmesa->height; + } } @@ -1997,7 +1998,13 @@ static const GLubyte *get_string( GLcontext *ctx, GLenum name ) (void) ctx; switch (name) { case GL_RENDERER: +#if CHAN_BITS == 32 + return (const GLubyte *) "Mesa OffScreen32"; +#elif CHAN_BITS == 16 + return (const GLubyte *) "Mesa OffScreen16"; +#else return (const GLubyte *) "Mesa OffScreen"; +#endif default: return NULL; } @@ -2020,8 +2027,8 @@ static void osmesa_update_state( GLcontext *ctx, GLuint new_state ) ctx->Driver.GetString = get_string; ctx->Driver.UpdateState = osmesa_update_state; ctx->Driver.SetDrawBuffer = set_draw_buffer; - ctx->Driver.ResizeBuffersMESA = _swrast_alloc_buffers; ctx->Driver.GetBufferSize = buffer_size; + ctx->Driver.ResizeBuffers = _swrast_alloc_buffers; ctx->Driver.Accum = _swrast_Accum; ctx->Driver.Bitmap = _swrast_Bitmap; diff --git a/xc/extras/Mesa/src/SPARC/clip.S b/xc/extras/Mesa/src/SPARC/clip.S index 2d1e832f0..8b12f0956 100644 --- a/xc/extras/Mesa/src/SPARC/clip.S +++ b/xc/extras/Mesa/src/SPARC/clip.S @@ -1,4 +1,3 @@ -/* $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/norm.S b/xc/extras/Mesa/src/SPARC/norm.S index f3f28943b..85328d9ae 100644 --- a/xc/extras/Mesa/src/SPARC/norm.S +++ b/xc/extras/Mesa/src/SPARC/norm.S @@ -1,4 +1,3 @@ -/* $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 07095a683..4e0688cfa 100644 --- a/xc/extras/Mesa/src/SPARC/sparc.c +++ b/xc/extras/Mesa/src/SPARC/sparc.c @@ -1,4 +1,3 @@ -/* $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 b8b5235fa..a98e4d0e4 100644 --- a/xc/extras/Mesa/src/SPARC/sparc.h +++ b/xc/extras/Mesa/src/SPARC/sparc.h @@ -1,4 +1,3 @@ -/* $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 740eee6ae..2d3f067fb 100644 --- a/xc/extras/Mesa/src/SPARC/sparc_matrix.h +++ b/xc/extras/Mesa/src/SPARC/sparc_matrix.h @@ -1,4 +1,3 @@ -/* $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 8a408a206..524bcbd7b 100644 --- a/xc/extras/Mesa/src/SPARC/xform.S +++ b/xc/extras/Mesa/src/SPARC/xform.S @@ -1,4 +1,3 @@ -/* $Id: xform.S,v 1.3 2002/02/21 11:43:05 alanh Exp $ */ /* TODO * diff --git a/xc/extras/Mesa/src/X/xm_api.c b/xc/extras/Mesa/src/X/xm_api.c index 388329c1d..0dfad6a8a 100644 --- a/xc/extras/Mesa/src/X/xm_api.c +++ b/xc/extras/Mesa/src/X/xm_api.c @@ -2628,3 +2628,13 @@ unsigned long XMesaDitherColor( XMesaContext xmesa, GLint x, GLint y, } +/* + * This is typically called when the window size changes and we need + * to reallocate the buffer's back/depth/stencil/accum buffers. + */ +void XMesaResizeBuffers( XMesaBuffer b ) +{ + xmesa_resize_buffers( &(b->mesa_buffer) ); + +} + diff --git a/xc/extras/Mesa/src/X/xm_dd.c b/xc/extras/Mesa/src/X/xm_dd.c index dd3052a25..7f26bf757 100644 --- a/xc/extras/Mesa/src/X/xm_dd.c +++ b/xc/extras/Mesa/src/X/xm_dd.c @@ -47,17 +47,18 @@ /* - * Return the size (width,height of the current color buffer. - * This function should be called by the glViewport function because - * glViewport is often called when the window gets resized. We need to - * update some X/Mesa stuff when that happens. + * Return the size (width, height) of the X window for the given GLframebuffer. * Output: width - width of buffer in pixels. * height - height of buffer in pixels. */ static void -get_buffer_size( GLcontext *ctx, GLuint *width, GLuint *height ) +get_buffer_size( GLframebuffer *buffer, GLuint *width, GLuint *height ) { - const XMesaContext xmesa = (XMesaContext) ctx->DriverCtx; + /* We can do this cast because the first field in the XMesaBuffer + * struct is a GLframebuffer struct. If this weren't true, we'd + * need a pointer from the GLframebuffer to the XMesaBuffer. + */ + const XMesaBuffer xmBuffer = (XMesaBuffer) buffer; unsigned int winwidth, winheight; #ifndef XFree86Server Window root; @@ -65,58 +66,19 @@ get_buffer_size( GLcontext *ctx, GLuint *width, GLuint *height ) unsigned int bw, d; _glthread_LOCK_MUTEX(_xmesa_lock); - XGetGeometry( xmesa->display, xmesa->xm_buffer->frontbuffer, &root, + XGetGeometry( xmBuffer->xm_visual->display, xmBuffer->frontbuffer, &root, &winx, &winy, &winwidth, &winheight, &bw, &d ); _glthread_UNLOCK_MUTEX(_xmesa_lock); #else - - winwidth = xmesa->xm_buffer->frontbuffer->width; - winheight = xmesa->xm_buffer->frontbuffer->height; + /* XFree86 GLX renderer */ + winwidth = xmBuffer->frontbuffer->width; + winheight = xmBuffer->frontbuffer->height; #endif (void)kernel8; /* Muffle compiler */ *width = winwidth; *height = winheight; - - if ( winwidth!=xmesa->xm_buffer->width - || winheight!=xmesa->xm_buffer->height) { - xmesa->xm_buffer->width = winwidth; - xmesa->xm_buffer->height = winheight; - xmesa_alloc_back_buffer( xmesa->xm_buffer ); - } - - /* Needed by FLIP macro */ - xmesa->xm_buffer->bottom = (int) winheight - 1; - - if (xmesa->xm_buffer->backimage) { - /* Needed by PIXELADDR1 macro */ - xmesa->xm_buffer->ximage_width1 - = xmesa->xm_buffer->backimage->bytes_per_line; - xmesa->xm_buffer->ximage_origin1 - = (GLubyte *) xmesa->xm_buffer->backimage->data - + xmesa->xm_buffer->ximage_width1 * (winheight-1); - - /* Needed by PIXELADDR2 macro */ - xmesa->xm_buffer->ximage_width2 - = xmesa->xm_buffer->backimage->bytes_per_line / 2; - xmesa->xm_buffer->ximage_origin2 - = (GLushort *) xmesa->xm_buffer->backimage->data - + xmesa->xm_buffer->ximage_width2 * (winheight-1); - - /* Needed by PIXELADDR3 macro */ - xmesa->xm_buffer->ximage_width3 - = xmesa->xm_buffer->backimage->bytes_per_line; - xmesa->xm_buffer->ximage_origin3 - = (GLubyte *) xmesa->xm_buffer->backimage->data - + xmesa->xm_buffer->ximage_width3 * (winheight-1); - - /* Needed by PIXELADDR4 macro */ - xmesa->xm_buffer->ximage_width4 = xmesa->xm_buffer->backimage->width; - xmesa->xm_buffer->ximage_origin4 - = (GLuint *) xmesa->xm_buffer->backimage->data - + xmesa->xm_buffer->ximage_width4 * (winheight-1); - } } @@ -779,10 +741,51 @@ clear_buffers( GLcontext *ctx, GLbitfield mask, } -static void -resize_buffers( GLcontext *ctx ) +/* + * When we detect that the user has resized the window this function will + * get called. Here we'll reallocate the back buffer, depth buffer, + * stencil buffer etc. to match the new window size. + */ +void +xmesa_resize_buffers( GLframebuffer *buffer ) { - _swrast_alloc_buffers( ctx ); + int height = (int) buffer->Height; + /* We can do this cast because the first field in the XMesaBuffer + * struct is a GLframebuffer struct. If this weren't true, we'd + * need a pointer from the GLframebuffer to the XMesaBuffer. + */ + XMesaBuffer xmBuffer = (XMesaBuffer) buffer; + + xmBuffer->width = buffer->Width; + xmBuffer->height = buffer->Height; + xmesa_alloc_back_buffer( xmBuffer ); + + /* Needed by FLIP macro */ + xmBuffer->bottom = height - 1; + + if (xmBuffer->backimage) { + /* Needed by PIXELADDR1 macro */ + xmBuffer->ximage_width1 = xmBuffer->backimage->bytes_per_line; + xmBuffer->ximage_origin1 = (GLubyte *) xmBuffer->backimage->data + + xmBuffer->ximage_width1 * (height-1); + + /* Needed by PIXELADDR2 macro */ + xmBuffer->ximage_width2 = xmBuffer->backimage->bytes_per_line / 2; + xmBuffer->ximage_origin2 = (GLushort *) xmBuffer->backimage->data + + xmBuffer->ximage_width2 * (height-1); + + /* Needed by PIXELADDR3 macro */ + xmBuffer->ximage_width3 = xmBuffer->backimage->bytes_per_line; + xmBuffer->ximage_origin3 = (GLubyte *) xmBuffer->backimage->data + + xmBuffer->ximage_width3 * (height-1); + + /* Needed by PIXELADDR4 macro */ + xmBuffer->ximage_width4 = xmBuffer->backimage->width; + xmBuffer->ximage_origin4 = (GLuint *) xmBuffer->backimage->data + + xmBuffer->ximage_width4 * (height-1); + } + + _swrast_alloc_buffers( buffer ); } #if 0 @@ -950,7 +953,7 @@ void xmesa_init_pointers( GLcontext *ctx ) ctx->Driver.Accum = _swrast_Accum; ctx->Driver.Bitmap = _swrast_Bitmap; ctx->Driver.Clear = clear_buffers; - ctx->Driver.ResizeBuffersMESA = resize_buffers; + ctx->Driver.ResizeBuffers = xmesa_resize_buffers; ctx->Driver.CopyPixels = _swrast_CopyPixels; ctx->Driver.DrawPixels = _swrast_DrawPixels; ctx->Driver.ReadPixels = _swrast_ReadPixels; diff --git a/xc/extras/Mesa/src/X/xmesaP.h b/xc/extras/Mesa/src/X/xmesaP.h index 66acd0298..06d1453c7 100644 --- a/xc/extras/Mesa/src/X/xmesaP.h +++ b/xc/extras/Mesa/src/X/xmesaP.h @@ -531,4 +531,6 @@ extern void XMesaReset( void ); extern void xmesa_set_read_buffer( GLcontext *ctx, GLframebuffer *buffer, GLenum mode ); +extern void xmesa_resize_buffers( GLframebuffer *buffer ); + #endif diff --git a/xc/extras/Mesa/src/X86/3dnow.c b/xc/extras/Mesa/src/X86/3dnow.c index 73950f5af..00054e91d 100644 --- a/xc/extras/Mesa/src/X86/3dnow.c +++ b/xc/extras/Mesa/src/X86/3dnow.c @@ -1,4 +1,3 @@ -/* $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 7a17cf9e5..d9ea5154c 100644 --- a/xc/extras/Mesa/src/X86/3dnow.h +++ b/xc/extras/Mesa/src/X86/3dnow.h @@ -1,4 +1,3 @@ -/* $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 be6bfd44a..f09a59243 100644 --- a/xc/extras/Mesa/src/X86/3dnow_normal.S +++ b/xc/extras/Mesa/src/X86/3dnow_normal.S @@ -1,4 +1,3 @@ -/* $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 24526dc3c..1713dd076 100644 --- a/xc/extras/Mesa/src/X86/3dnow_xform1.S +++ b/xc/extras/Mesa/src/X86/3dnow_xform1.S @@ -1,4 +1,3 @@ -/* $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 99347d91d..4627935dc 100644 --- a/xc/extras/Mesa/src/X86/3dnow_xform2.S +++ b/xc/extras/Mesa/src/X86/3dnow_xform2.S @@ -1,4 +1,3 @@ -/* $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 9360b8c64..ac6153c36 100644 --- a/xc/extras/Mesa/src/X86/3dnow_xform3.S +++ b/xc/extras/Mesa/src/X86/3dnow_xform3.S @@ -1,4 +1,3 @@ -/* $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 a23529341..32d481f8e 100644 --- a/xc/extras/Mesa/src/X86/3dnow_xform4.S +++ b/xc/extras/Mesa/src/X86/3dnow_xform4.S @@ -1,4 +1,3 @@ -/* $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 ee56080e7..02f606896 100644 --- a/xc/extras/Mesa/src/X86/assyntax.h +++ b/xc/extras/Mesa/src/X86/assyntax.h @@ -1,4 +1,3 @@ -/* $Id: assyntax.h,v 1.10 2002/02/21 11:43:07 alanh Exp $ */ #ifndef __ASSYNTAX_H__ #define __ASSYNTAX_H__ @@ -69,6 +68,11 @@ #if !(defined(NASM_ASSEMBLER) || defined(MASM_ASSEMBLER)) +/* Default to ATT_ASSEMBLER when SVR4 or SYSV are defined */ +#if (defined(SVR4) || defined(SYSV)) && !defined(GNU_ASSEMBLER) +#define ATT_ASSEMBLER +#endif + #if !defined(ATT_ASSEMBLER) && !defined(GNU_ASSEMBLER) && !defined(ACK_ASSEMBLER) #define GNU_ASSEMBLER #endif @@ -200,6 +204,11 @@ #define _STX6 %st(6) #define _STX7 %st(7) #define ST(x) CONCAT(_STX,x) +#ifdef GNU_ASSEMBLER +#define ST0 %st(0) +#else +#define ST0 %st +#endif /* MMX Registers */ #define MM0 %mm0 #define MM1 %mm1 @@ -858,6 +867,7 @@ #if defined(NASM_ASSEMBLER) #define ST(n) st ## n +#define ST0 st0 #define TBYTE_PTR tword #define QWORD_PTR qword diff --git a/xc/extras/Mesa/src/X86/clip_args.h b/xc/extras/Mesa/src/X86/clip_args.h index 80041ea54..25eceed65 100644 --- a/xc/extras/Mesa/src/X86/clip_args.h +++ b/xc/extras/Mesa/src/X86/clip_args.h @@ -1,4 +1,3 @@ -/* $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 00e516f8d..84376aaf7 100644 --- a/xc/extras/Mesa/src/X86/common_x86.c +++ b/xc/extras/Mesa/src/X86/common_x86.c @@ -1,4 +1,3 @@ -/* $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 13fe40f41..c2e6d971b 100644 --- a/xc/extras/Mesa/src/X86/common_x86_asm.S +++ b/xc/extras/Mesa/src/X86/common_x86_asm.S @@ -1,4 +1,3 @@ -/* $Id: common_x86_asm.S,v 1.9 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -34,6 +33,12 @@ * Cleaned up and simplified by Gareth Hughes <gareth@valinux.com> */ +/* + * NOTE: Avoid using spaces in between '(' ')' and arguments, especially + * with macros like CONST, LLBL that expand to CONCAT(...). Putting spaces + * in there will break the build on some platforms. + */ + #include "matypes.h" #include "common_x86_features.h" @@ -87,7 +92,7 @@ GLNAME( _mesa_identify_x86_cpu_features ): /* Verify the ID Flag bit has been written. */ CMP_L ( ECX, EAX ) - JZ ( LLBL ( cpuid_done ) ) + JZ ( LLBL (cpuid_done) ) /* Get the CPU vendor info. */ @@ -98,11 +103,11 @@ GLNAME( _mesa_identify_x86_cpu_features ): * "GenuineIntel" string in EBX, ECX and EDX. */ CMP_L ( CONST(GENU), EBX ) - JNE ( LLBL( cpuid_amd ) ) + JNE ( LLBL(cpuid_amd) ) CMP_L ( CONST(INEI), EDX ) - JNE ( LLBL( cpuid_amd ) ) + JNE ( LLBL(cpuid_amd) ) CMP_L ( CONST(NTEL), ECX ) - JNE ( LLBL( cpuid_amd ) ) + JNE ( LLBL(cpuid_amd) ) /* We have an Intel processor, so we can get the feature * information with an CPUID input value of 1. @@ -110,19 +115,19 @@ GLNAME( _mesa_identify_x86_cpu_features ): MOV_L ( CONST(0x1), EAX ) CPUID MOV_L ( EDX, EAX ) - JMP ( LLBL( cpuid_done ) ) + JMP ( LLBL(cpuid_done) ) -LLBL( cpuid_amd ): +LLBL(cpuid_amd): /* Test for AMD processors. We must look for the * "AuthenticAMD" string in EBX, ECX and EDX. */ CMP_L ( CONST(AUTH), EBX ) - JNE ( LLBL( cpuid_other ) ) + JNE ( LLBL(cpuid_other) ) CMP_L ( CONST(ENTI), EDX ) - JNE ( LLBL( cpuid_other ) ) + JNE ( LLBL(cpuid_other) ) CMP_L ( CONST(CAMD), ECX ) - JNE ( LLBL( cpuid_other ) ) + JNE ( LLBL(cpuid_other) ) /* We have an AMD processor, so we can get the feature * information after we verify that the extended functions are @@ -131,19 +136,19 @@ LLBL( cpuid_amd ): MOV_L ( CONST(0x80000000), EAX ) CPUID TEST_L ( EAX, EAX ) - JZ ( LLBL ( cpuid_failed ) ) + JZ ( LLBL (cpuid_failed) ) MOV_L ( CONST(0x80000001), EAX ) CPUID MOV_L ( EDX, EAX ) - JMP ( LLBL ( cpuid_done ) ) + JMP ( LLBL (cpuid_done) ) -LLBL( cpuid_other ): +LLBL(cpuid_other): /* Test for other processors here when required. */ -LLBL( cpuid_failed ): +LLBL(cpuid_failed): /* If we can't determine the feature information, we must * return zero to indicate that no platform-specific @@ -151,7 +156,7 @@ LLBL( cpuid_failed ): */ MOV_L ( CONST(0), EAX ) -LLBL ( cpuid_done ): +LLBL (cpuid_done): POP_L ( EBX ) RET diff --git a/xc/extras/Mesa/src/X86/common_x86_asm.h b/xc/extras/Mesa/src/X86/common_x86_asm.h index 1fb050b67..38096eced 100644 --- a/xc/extras/Mesa/src/X86/common_x86_asm.h +++ b/xc/extras/Mesa/src/X86/common_x86_asm.h @@ -1,4 +1,3 @@ -/* $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 ee402e763..f82c92674 100644 --- a/xc/extras/Mesa/src/X86/common_x86_features.h +++ b/xc/extras/Mesa/src/X86/common_x86_features.h @@ -1,4 +1,3 @@ -/* $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 fdf148e13..d1569a9dc 100644 --- a/xc/extras/Mesa/src/X86/common_x86_macros.h +++ b/xc/extras/Mesa/src/X86/common_x86_macros.h @@ -1,4 +1,3 @@ -/* $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 0552ae4d0..5c6b3fefd 100644 --- a/xc/extras/Mesa/src/X86/gen_matypes.c +++ b/xc/extras/Mesa/src/X86/gen_matypes.c @@ -1,4 +1,3 @@ -/* $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 5b81fd22a..0c2682bca 100644 --- a/xc/extras/Mesa/src/X86/mmx.h +++ b/xc/extras/Mesa/src/X86/mmx.h @@ -1,4 +1,3 @@ -/* $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 aaea3a512..59cbda7b0 100644 --- a/xc/extras/Mesa/src/X86/norm_args.h +++ b/xc/extras/Mesa/src/X86/norm_args.h @@ -1,4 +1,3 @@ -/* $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 89c46958a..79771a98c 100644 --- a/xc/extras/Mesa/src/X86/sse.c +++ b/xc/extras/Mesa/src/X86/sse.c @@ -1,4 +1,3 @@ -/* $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 a62fced2c..c594446e8 100644 --- a/xc/extras/Mesa/src/X86/sse.h +++ b/xc/extras/Mesa/src/X86/sse.h @@ -1,4 +1,3 @@ -/* $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 2453839af..afc12f3b5 100644 --- a/xc/extras/Mesa/src/X86/sse_normal.S +++ b/xc/extras/Mesa/src/X86/sse_normal.S @@ -1,4 +1,3 @@ -/* $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 3c45a1c8b..41dd39d50 100644 --- a/xc/extras/Mesa/src/X86/sse_xform1.S +++ b/xc/extras/Mesa/src/X86/sse_xform1.S @@ -1,4 +1,3 @@ -/* $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 be383b8e8..025af4c50 100644 --- a/xc/extras/Mesa/src/X86/sse_xform2.S +++ b/xc/extras/Mesa/src/X86/sse_xform2.S @@ -1,4 +1,3 @@ -/* $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 c56712a10..8518b9c5f 100644 --- a/xc/extras/Mesa/src/X86/sse_xform3.S +++ b/xc/extras/Mesa/src/X86/sse_xform3.S @@ -1,4 +1,3 @@ -/* $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 b821706a5..5335939a1 100644 --- a/xc/extras/Mesa/src/X86/sse_xform4.S +++ b/xc/extras/Mesa/src/X86/sse_xform4.S @@ -1,4 +1,3 @@ -/* $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 231751d2a..c2b222ea8 100644 --- a/xc/extras/Mesa/src/X86/x86.c +++ b/xc/extras/Mesa/src/X86/x86.c @@ -1,4 +1,3 @@ -/* $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 480a6d53b..75de94e6b 100644 --- a/xc/extras/Mesa/src/X86/x86.h +++ b/xc/extras/Mesa/src/X86/x86.h @@ -1,4 +1,3 @@ -/* $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 e065f077e..d022f9b96 100644 --- a/xc/extras/Mesa/src/X86/x86_cliptest.S +++ b/xc/extras/Mesa/src/X86/x86_cliptest.S @@ -1,4 +1,3 @@ -/* $Id: x86_cliptest.S,v 1.4 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -24,23 +23,38 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/* + * NOTE: Avoid using spaces in between '(' ')' and arguments, especially + * with macros like CONST, LLBL that expand to CONCAT(...). Putting spaces + * in there will break the build on some platforms. + */ + #include "matypes.h" #include "clip_args.h" -#define SRC(i) REGOFF(i * 4, ESI) -#define DST(i) REGOFF(i * 4, EDI) -#define MAT(i) REGOFF(i * 4, EDX) +#define SRC0 REGOFF(0, ESI) +#define SRC1 REGOFF(4, ESI) +#define SRC2 REGOFF(8, ESI) +#define SRC3 REGOFF(12, ESI) +#define DST0 REGOFF(0, EDI) +#define DST1 REGOFF(4, EDI) +#define DST2 REGOFF(8, EDI) +#define DST3 REGOFF(12, EDI) +#define MAT0 REGOFF(0, EDX) +#define MAT1 REGOFF(4, EDX) +#define MAT2 REGOFF(8, EDX) +#define MAT3 REGOFF(12, EDX) /* * Table for clip test. * - * bit6 = SRC(3) < 0 - * bit5 = SRC(2) < 0 + * bit6 = SRC3 < 0 + * bit5 = SRC2 < 0 * bit4 = abs(S(2)) > abs(S(3)) - * bit3 = SRC(1) < 0 + * bit3 = SRC1 < 0 * bit2 = abs(S(1)) > abs(S(3)) - * bit1 = SRC(0) < 0 + * bit1 = SRC0 < 0 * bit0 = abs(S(0)) > abs(S(3)) */ @@ -100,18 +114,18 @@ GLNAME( _mesa_x86_cliptest_points4 ): #ifdef ELFPIC /* store pointer to clip_table on stack */ - CALL( LLBL( ctp4_get_eip ) ) + CALL( LLBL(ctp4_get_eip) ) ADD_L( CONST(_GLOBAL_OFFSET_TABLE_), EBX ) MOV_L( REGOFF(clip_table@GOT, EBX), EBX ) PUSH_L( EBX ) - JMP( LLBL( ctp4_clip_table_ready ) ) + JMP( LLBL(ctp4_clip_table_ready) ) -LLBL( ctp4_get_eip ): +LLBL(ctp4_get_eip): /* store eip in ebx */ MOV_L( REGIND(ESP), EBX ) RET -LLBL( ctp4_clip_table_ready ): +LLBL(ctp4_clip_table_ready): #endif MOV_L( ARG_SOURCE, ESI ) @@ -141,16 +155,16 @@ LLBL( ctp4_clip_table_ready ): MOV_B( REGIND(EBX), AL ) MOV_B( REGIND(EBP), AH ) - JZ( LLBL( ctp4_finish ) ) + JZ( LLBL(ctp4_finish) ) ALIGNTEXT16 -LLBL( ctp4_top ): +LLBL(ctp4_top): FLD1 /* F3 */ - FDIV_S( SRC(3) ) /* GH: don't care about div-by-zero */ + FDIV_S( SRC3 ) /* GH: don't care about div-by-zero */ - MOV_L( SRC(3), EBP ) - MOV_L( SRC(2), EBX ) + MOV_L( SRC3, EBP ) + MOV_L( SRC2, EBX ) XOR_L( ECX, ECX ) ADD_L( EBP, EBP ) /* ebp = abs(S(3))*2 ; carry = sign of S(3) */ @@ -162,7 +176,7 @@ LLBL( ctp4_top ): CMP_L( EBX, EBP ) /* carry = abs(S(2))*2 > abs(S(3))*2 */ ADC_L( ECX, ECX ) - MOV_L( SRC(1), EBX ) + MOV_L( SRC1, EBX ) ADD_L( EBX, EBX ) /* ebx = abs(S(1))*2 ; carry = sign of S(1) */ @@ -170,7 +184,7 @@ LLBL( ctp4_top ): CMP_L( EBX, EBP ) /* carry = abs(S(1))*2 > abs(S(3))*2 */ ADC_L( ECX, ECX ) - MOV_L( SRC(0), EBX ) + MOV_L( SRC0, EBX ) ADD_L( EBX, EBX ) /* ebx = abs(S(0))*2 ; carry = sign of S(0) */ @@ -193,37 +207,37 @@ LLBL( ctp4_top ): TEST_B( CL, CL ) MOV_B( CL, REGIND(EDX) ) - JZ( LLBL( ctp4_proj ) ) + JZ( LLBL(ctp4_proj) ) -LLBL( ctp4_noproj ): +LLBL(ctp4_noproj): FSTP( ST(0) ) /* */ - MOV_L( CONST(0), DST(0) ) - MOV_L( CONST(0), DST(1) ) - MOV_L( CONST(0), DST(2) ) - MOV_L( CONST(0x3f800000), DST(3) ) + MOV_L( CONST(0), DST0 ) + MOV_L( CONST(0), DST1 ) + MOV_L( CONST(0), DST2 ) + MOV_L( CONST(0x3f800000), DST3 ) - JMP( LLBL( ctp4_next ) ) + JMP( LLBL(ctp4_next) ) -LLBL( ctp4_proj ): +LLBL(ctp4_proj): - FLD_S( SRC(0) ) /* F0 F3 */ - FMUL2( ST(1), ST(0) ) + FLD_S( SRC0 ) /* F0 F3 */ + FMUL2( ST(1), ST0 ) - FLD_S( SRC(1) ) /* F1 F0 F3 */ - FMUL2( ST(2), ST(0) ) + FLD_S( SRC1 ) /* F1 F0 F3 */ + FMUL2( ST(2), ST0 ) - FLD_S( SRC(2) ) /* F2 F1 F0 F3 */ - FMUL2( ST(3), ST(0) ) + FLD_S( SRC2 ) /* F2 F1 F0 F3 */ + FMUL2( ST(3), ST0 ) FXCH( ST(2) ) /* F0 F1 F2 F3 */ - FSTP_S( DST(0) ) /* F1 F2 F3 */ - FSTP_S( DST(1) ) /* F2 F3 */ - FSTP_S( DST(2) ) /* F3 */ - FSTP_S( DST(3) ) /* */ + FSTP_S( DST0 ) /* F1 F2 F3 */ + FSTP_S( DST1 ) /* F2 F3 */ + FSTP_S( DST2 ) /* F3 */ + FSTP_S( DST3 ) /* */ -LLBL( ctp4_next ): +LLBL(ctp4_next): INC_L( EDX ) ADD_L( CONST(16), EDI ) @@ -231,7 +245,7 @@ LLBL( ctp4_next ): ADD_L( ARG_SOURCE, ESI ) CMP_L( EDX, ARG_CLIP ) - JNZ( LLBL( ctp4_top ) ) + JNZ( LLBL(ctp4_top) ) MOV_L( ARG_OR, ECX ) MOV_L( ARG_AND, EDX ) @@ -239,7 +253,7 @@ LLBL( ctp4_next ): MOV_B( AL, REGIND(ECX) ) MOV_B( AH, REGIND(EDX) ) -LLBL( ctp4_finish ): +LLBL(ctp4_finish): MOV_L( ARG_DEST, EAX ) #ifdef ELFPIC @@ -274,18 +288,18 @@ GLNAME( _mesa_x86_cliptest_points4_np ): #ifdef ELFPIC /* store pointer to clip_table on stack */ - CALL( LLBL( ctp4_np_get_eip ) ) + CALL( LLBL(ctp4_np_get_eip) ) ADD_L( CONST(_GLOBAL_OFFSET_TABLE_), EBX ) MOV_L( REGOFF(clip_table@GOT, EBX), EBX ) PUSH_L( EBX ) - JMP( LLBL( ctp4_np_clip_table_ready ) ) + JMP( LLBL(ctp4_np_clip_table_ready) ) -LLBL( ctp4_np_get_eip ): +LLBL(ctp4_np_get_eip): /* store eip in ebx */ MOV_L( REGIND(ESP), EBX ) RET -LLBL( ctp4_np_clip_table_ready ): +LLBL(ctp4_np_clip_table_ready): #endif MOV_L( ARG_SOURCE, ESI ) @@ -309,13 +323,13 @@ LLBL( ctp4_np_clip_table_ready ): MOV_B( REGIND(EBX), AL ) MOV_B( REGIND(EBP), AH ) - JZ( LLBL( ctp4_np_finish ) ) + JZ( LLBL(ctp4_np_finish) ) ALIGNTEXT16 -LLBL( ctp4_np_top ): +LLBL(ctp4_np_top): - MOV_L( SRC(3), EBP ) - MOV_L( SRC(2), EBX ) + MOV_L( SRC3, EBP ) + MOV_L( SRC2, EBX ) XOR_L( ECX, ECX ) ADD_L( EBP, EBP ) /* ebp = abs(S(3))*2 ; carry = sign of S(3) */ @@ -327,7 +341,7 @@ LLBL( ctp4_np_top ): CMP_L( EBX, EBP ) /* carry = abs(S(2))*2 > abs(S(3))*2 */ ADC_L( ECX, ECX ) - MOV_L( SRC(1), EBX ) + MOV_L( SRC1, EBX ) ADD_L( EBX, EBX ) /* ebx = abs(S(1))*2 ; carry = sign of S(1) */ @@ -335,7 +349,7 @@ LLBL( ctp4_np_top ): CMP_L( EBX, EBP ) /* carry = abs(S(1))*2 > abs(S(3))*2 */ ADC_L( ECX, ECX ) - MOV_L( SRC(0), EBX ) + MOV_L( SRC0, EBX ) ADD_L( EBX, EBX ) /* ebx = abs(S(0))*2 ; carry = sign of S(0) */ @@ -364,7 +378,7 @@ LLBL( ctp4_np_top ): ADD_L( ARG_DEST, ESI ) CMP_L( EDX, EDI ) - JNZ( LLBL( ctp4_np_top ) ) + JNZ( LLBL(ctp4_np_top) ) MOV_L( ARG_OR, ECX ) MOV_L( ARG_AND, EDX ) @@ -372,7 +386,7 @@ LLBL( ctp4_np_top ): MOV_B( AL, REGIND(ECX) ) MOV_B( AH, REGIND(EDX) ) -LLBL( ctp4_np_finish ): +LLBL(ctp4_np_finish): MOV_L( ARG_SOURCE, EAX ) #ifdef ELFPIC diff --git a/xc/extras/Mesa/src/X86/x86_vertex.S b/xc/extras/Mesa/src/X86/x86_vertex.S index 1ec1aafe7..699e829c2 100644 --- a/xc/extras/Mesa/src/X86/x86_vertex.S +++ b/xc/extras/Mesa/src/X86/x86_vertex.S @@ -14,9 +14,18 @@ #define FP_ONE 1065353216 #define FP_ZERO 0 -#define S(i) REGOFF(i * 4, ESI) -#define D(i) REGOFF(i * 4, EDI) -#define M(i) REGOFF(i * 4, EDX) +#define S0 REGOFF(0, ESI) +#define S1 REGOFF(4, ESI) +#define S2 REGOFF(8, ESI) +#define S3 REGOFF(12, ESI) +#define D0 REGOFF(0, EDI) +#define D1 REGOFF(4, EDI) +#define D2 REGOFF(8, EDI) +#define D3 REGOFF(12, EDI) +#define M0 REGOFF(0, EDX) +#define M1 REGOFF(4, EDX) +#define M2 REGOFF(8, EDX) +#define M3 REGOFF(12, EDX) @@ -65,11 +74,11 @@ LLBL(v16x86_loop): FLD_S ( REGOFF( 0x4, EDX ) ) FMUL_S ( REGOFF( 0x1c, ESI ) ) FXCH ( ST(3) ) - FADDP ( ST(0),ST(7) ) + FADDP ( ST0,ST(7) ) FXCH ( ST(1) ) - FADDP ( ST(0),ST(5) ) - FADDP ( ST(0),ST(3) ) - FADDP ( ST(0),ST(1) ) + FADDP ( ST0,ST(5) ) + FADDP ( ST0,ST(3) ) + FADDP ( ST0,ST(1) ) FLD_S ( REGOFF( 0x8, EDX ) ) FMUL_S ( REGOFF( 0x20, ESI ) ) FLD_S ( REGOFF( 0x8, EDX ) ) @@ -79,11 +88,11 @@ LLBL(v16x86_loop): FLD_S ( REGOFF( 0x8, EDX ) ) FMUL_S ( REGOFF( 0x2c, ESI ) ) FXCH ( ST(3) ) - FADDP ( ST(0),ST(7) ) + FADDP ( ST0,ST(7) ) FXCH ( ST(1) ) - FADDP ( ST(0),ST(5) ) - FADDP ( ST(0),ST(3) ) - FADDP ( ST(0),ST(1) ) + FADDP ( ST0,ST(5) ) + FADDP ( ST0,ST(3) ) + FADDP ( ST0,ST(1) ) FXCH ( ST(3) ) FADD_S ( REGOFF( 0x30, ESI ) ) FXCH ( ST(2) ) @@ -111,13 +120,13 @@ LLBL(v16x86_loop): /* * Table for clip test. * - * bit6 = S(3) < 0 - * bit5 = S(2) < 0 - * bit4 = abs(S(2)) > abs(S(3)) - * bit3 = S(1) < 0 - * bit2 = abs(S(1)) > abs(S(3)) - * bit1 = S(0) < 0 - * bit0 = abs(S(0)) > abs(S(3)) + * bit6 = S3 < 0 + * bit5 = S2 < 0 + * bit4 = abs(S2) > abs(S3) + * bit3 = S1 < 0 + * bit2 = abs(S1) > abs(S3) + * bit1 = S0 < 0 + * bit0 = abs(S0) > abs(S3) */ @@ -223,36 +232,36 @@ LLBL(v16_ctp4_clip_table_ready): LLBL(v16_ctp4_top): #if 0 FLD1 /* F0 */ - FDIV_S( S(3) ) + FDIV_S( S3 ) #endif - MOV_L( S(3), EBP ) - MOV_L( S(2), EBX ) + MOV_L( S3, EBP ) + MOV_L( S2, EBX ) XOR_L( ECX, ECX ) - ADD_L( EBP, EBP ) /* ebp = abs(S(3))*2 ; carry = sign of S(3) */ + ADD_L( EBP, EBP ) /* ebp = abs(S3)*2 ; carry = sign of S3 */ ADC_L( ECX, ECX ) - ADD_L( EBX, EBX ) /* ebx = abs(S(2))*2 ; carry = sign of S(2) */ + ADD_L( EBX, EBX ) /* ebx = abs(S2)*2 ; carry = sign of S2 */ ADC_L( ECX, ECX ) - CMP_L( EBX, EBP ) /* carry = abs(S(2))*2 > abs(S(3))*2 */ + CMP_L( EBX, EBP ) /* carry = abs(S2)*2 > abs(S3)*2 */ ADC_L( ECX, ECX ) - MOV_L( S(1), EBX ) + MOV_L( S1, EBX ) - ADD_L( EBX, EBX ) /* ebx = abs(S(1))*2 ; carry = sign of S(1) */ + ADD_L( EBX, EBX ) /* ebx = abs(S1)*2 ; carry = sign of S1 */ ADC_L( ECX, ECX ) - CMP_L( EBX, EBP ) /* carry = abs(S(1))*2 > abs(S(3))*2 */ + CMP_L( EBX, EBP ) /* carry = abs(S1)*2 > abs(S3)*2 */ ADC_L( ECX, ECX ) - MOV_L( S(0), EBX ) + MOV_L( S0, EBX ) - ADD_L( EBX, EBX ) /* ebx = abs(S(0))*2 ; carry = sign of S(0) */ + ADD_L( EBX, EBX ) /* ebx = abs(S0)*2 ; carry = sign of S0 */ ADC_L( ECX, ECX ) - CMP_L( EBX, EBP ) /* carry = abs(S(0))*2 > abs(S(3))*2 */ + CMP_L( EBX, EBP ) /* carry = abs(S0)*2 > abs(S3)*2 */ ADC_L( ECX, ECX ) @@ -271,7 +280,7 @@ LLBL(v16_ctp4_top): INC_L( EDI ) /* next clipmask */ #if 0 - FSTP_S( S(8) ) /* */ /* GR_VERTEX_OOW_OFFSET */ + FSTP_S( S8 ) /* */ /* GR_VERTEX_OOW_OFFSET */ #endif ADD_L( CONST(64), ESI ) /* next fxVertex */ diff --git a/xc/extras/Mesa/src/X86/x86_xform2.S b/xc/extras/Mesa/src/X86/x86_xform2.S index bc808d590..108e27e1b 100644 --- a/xc/extras/Mesa/src/X86/x86_xform2.S +++ b/xc/extras/Mesa/src/X86/x86_xform2.S @@ -1,4 +1,3 @@ -/* $Id: x86_xform2.S,v 1.3 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -24,6 +23,12 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/* + * NOTE: Avoid using spaces in between '(' ')' and arguments, especially + * with macros like CONST, LLBL that expand to CONCAT(...). Putting spaces + * in there will break the build on some platforms. + */ + #include "matypes.h" #include "xform_args.h" @@ -32,9 +37,30 @@ #define FP_ONE 1065353216 #define FP_ZERO 0 -#define SRC(i) REGOFF(i * 4, ESI) -#define DST(i) REGOFF(i * 4, EDI) -#define MAT(i) REGOFF(i * 4, EDX) +#define SRC0 REGOFF(0, ESI) +#define SRC1 REGOFF(4, ESI) +#define SRC2 REGOFF(8, ESI) +#define SRC3 REGOFF(12, ESI) +#define DST0 REGOFF(0, EDI) +#define DST1 REGOFF(4, EDI) +#define DST2 REGOFF(8, EDI) +#define DST3 REGOFF(12, EDI) +#define MAT0 REGOFF(0, EDX) +#define MAT1 REGOFF(4, EDX) +#define MAT2 REGOFF(8, EDX) +#define MAT3 REGOFF(12, EDX) +#define MAT4 REGOFF(16, EDX) +#define MAT5 REGOFF(20, EDX) +#define MAT6 REGOFF(24, EDX) +#define MAT7 REGOFF(28, EDX) +#define MAT8 REGOFF(32, EDX) +#define MAT9 REGOFF(36, EDX) +#define MAT10 REGOFF(40, EDX) +#define MAT11 REGOFF(44, EDX) +#define MAT12 REGOFF(48, EDX) +#define MAT13 REGOFF(52, EDX) +#define MAT14 REGOFF(56, EDX) +#define MAT15 REGOFF(60, EDX) ALIGNTEXT16 @@ -52,7 +78,7 @@ GLNAME( _mesa_x86_transform_points2_general ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p2_gr_done ) ) + JZ( LLBL(x86_p2_gr_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) @@ -67,57 +93,57 @@ GLNAME( _mesa_x86_transform_points2_general ): ADD_L( EDI, ECX ) ALIGNTEXT16 -LLBL( x86_p2_gr_loop ): - - FLD_S( SRC(0) ) /* F4 */ - FMUL_S( MAT(0) ) - FLD_S( SRC(0) ) /* F5 F4 */ - FMUL_S( MAT(1) ) - FLD_S( SRC(0) ) /* F6 F5 F4 */ - FMUL_S( MAT(2) ) - FLD_S( SRC(0) ) /* F7 F6 F5 F4 */ - FMUL_S( MAT(3) ) - - FLD_S( SRC(1) ) /* F0 F7 F6 F5 F4 */ - FMUL_S( MAT(4) ) - FLD_S( SRC(1) ) /* F1 F0 F7 F6 F5 F4 */ - FMUL_S( MAT(5) ) - FLD_S( SRC(1) ) /* F2 F1 F0 F7 F6 F5 F4 */ - FMUL_S( MAT(6) ) - FLD_S( SRC(1) ) /* F3 F2 F1 F0 F7 F6 F5 F4 */ - FMUL_S( MAT(7) ) +LLBL(x86_p2_gr_loop): + + FLD_S( SRC0 ) /* F4 */ + FMUL_S( MAT0 ) + FLD_S( SRC0 ) /* F5 F4 */ + FMUL_S( MAT1 ) + FLD_S( SRC0 ) /* F6 F5 F4 */ + FMUL_S( MAT2 ) + FLD_S( SRC0 ) /* F7 F6 F5 F4 */ + FMUL_S( MAT3 ) + + FLD_S( SRC1 ) /* F0 F7 F6 F5 F4 */ + FMUL_S( MAT4 ) + FLD_S( SRC1 ) /* F1 F0 F7 F6 F5 F4 */ + FMUL_S( MAT5 ) + FLD_S( SRC1 ) /* F2 F1 F0 F7 F6 F5 F4 */ + FMUL_S( MAT6 ) + FLD_S( SRC1 ) /* F3 F2 F1 F0 F7 F6 F5 F4 */ + FMUL_S( MAT7 ) FXCH( ST(3) ) /* F0 F2 F1 F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(7) ) /* F2 F1 F3 F7 F6 F5 F4 */ + FADDP( ST0, ST(7) ) /* F2 F1 F3 F7 F6 F5 F4 */ FXCH( ST(1) ) /* F1 F2 F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(5) ) /* F2 F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(3) ) /* F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(1) ) /* F7 F6 F5 F4 */ + FADDP( ST0, ST(5) ) /* F2 F3 F7 F6 F5 F4 */ + FADDP( ST0, ST(3) ) /* F3 F7 F6 F5 F4 */ + FADDP( ST0, ST(1) ) /* F7 F6 F5 F4 */ FXCH( ST(3) ) /* F4 F6 F5 F7 */ - FADD_S( MAT(12) ) + FADD_S( MAT12 ) FXCH( ST(2) ) /* F5 F6 F4 F7 */ - FADD_S( MAT(13) ) + FADD_S( MAT13 ) FXCH( ST(1) ) /* F6 F5 F4 F7 */ - FADD_S( MAT(14) ) + FADD_S( MAT14 ) FXCH( ST(3) ) /* F7 F5 F4 F6 */ - FADD_S( MAT(15) ) + FADD_S( MAT15 ) FXCH( ST(2) ) /* F4 F5 F7 F6 */ - FSTP_S( DST(0) ) /* F5 F7 F6 */ - FSTP_S( DST(1) ) /* F7 F6 */ + FSTP_S( DST0 ) /* F5 F7 F6 */ + FSTP_S( DST1 ) /* F7 F6 */ FXCH( ST(1) ) /* F6 F7 */ - FSTP_S( DST(2) ) /* F7 */ - FSTP_S( DST(3) ) /* */ + FSTP_S( DST2 ) /* F7 */ + FSTP_S( DST3 ) /* */ -LLBL( x86_p2_gr_skip ): +LLBL(x86_p2_gr_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p2_gr_loop ) ) + JNE( LLBL(x86_p2_gr_loop) ) -LLBL( x86_p2_gr_done ): +LLBL(x86_p2_gr_done): POP_L( EDI ) POP_L( ESI ) @@ -143,7 +169,7 @@ GLNAME( _mesa_x86_transform_points2_perspective ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p2_pr_done ) ) + JZ( LLBL(x86_p2_pr_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) @@ -157,31 +183,31 @@ GLNAME( _mesa_x86_transform_points2_perspective ): MOV_L( REGOFF(V4F_START, EDI), EDI ) ADD_L( EDI, ECX ) - MOV_L( MAT(14), EBX ) + MOV_L( MAT14, EBX ) ALIGNTEXT16 -LLBL( x86_p2_pr_loop ): +LLBL(x86_p2_pr_loop): - FLD_S( SRC(0) ) /* F4 */ - FMUL_S( MAT(0) ) + FLD_S( SRC0 ) /* F4 */ + FMUL_S( MAT0 ) - FLD_S( SRC(1) ) /* F1 F4 */ - FMUL_S( MAT(5) ) + FLD_S( SRC1 ) /* F1 F4 */ + FMUL_S( MAT5 ) FXCH( ST(1) ) /* F4 F1 */ - FSTP_S( DST(0) ) /* F1 */ - FSTP_S( DST(1) ) /* */ - MOV_L( EBX, DST(2) ) - MOV_L( CONST(FP_ZERO), DST(3) ) + FSTP_S( DST0 ) /* F1 */ + FSTP_S( DST1 ) /* */ + MOV_L( EBX, DST2 ) + MOV_L( CONST(FP_ZERO), DST3 ) -LLBL( x86_p2_pr_skip ): +LLBL(x86_p2_pr_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p2_pr_loop ) ) + JNE( LLBL(x86_p2_pr_loop) ) -LLBL( x86_p2_pr_done ): +LLBL(x86_p2_pr_done): POP_L( EBX ) POP_L( EDI ) @@ -207,7 +233,7 @@ GLNAME( _mesa_x86_transform_points2_3d ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p2_3dr_done ) ) + JZ( LLBL(x86_p2_3dr_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) @@ -222,48 +248,48 @@ GLNAME( _mesa_x86_transform_points2_3d ): ADD_L( EDI, ECX ) ALIGNTEXT16 -LLBL( x86_p2_3dr_loop ): - - FLD_S( SRC(0) ) /* F4 */ - FMUL_S( MAT(0) ) - FLD_S( SRC(0) ) /* F5 F4 */ - FMUL_S( MAT(1) ) - FLD_S( SRC(0) ) /* F6 F5 F4 */ - FMUL_S( MAT(2) ) - - FLD_S( SRC(1) ) /* F0 F6 F5 F4 */ - FMUL_S( MAT(4) ) - FLD_S( SRC(1) ) /* F1 F0 F6 F5 F4 */ - FMUL_S( MAT(5) ) - FLD_S( SRC(1) ) /* F2 F1 F0 F6 F5 F4 */ - FMUL_S( MAT(6) ) +LLBL(x86_p2_3dr_loop): + + FLD_S( SRC0 ) /* F4 */ + FMUL_S( MAT0 ) + FLD_S( SRC0 ) /* F5 F4 */ + FMUL_S( MAT1 ) + FLD_S( SRC0 ) /* F6 F5 F4 */ + FMUL_S( MAT2 ) + + FLD_S( SRC1 ) /* F0 F6 F5 F4 */ + FMUL_S( MAT4 ) + FLD_S( SRC1 ) /* F1 F0 F6 F5 F4 */ + FMUL_S( MAT5 ) + FLD_S( SRC1 ) /* F2 F1 F0 F6 F5 F4 */ + FMUL_S( MAT6 ) FXCH( ST(2) ) /* F0 F1 F2 F6 F5 F4 */ - FADDP( ST(0), ST(5) ) /* F1 F2 F6 F5 F4 */ - FADDP( ST(0), ST(3) ) /* F2 F6 F5 F4 */ - FADDP( ST(0), ST(1) ) /* F6 F5 F4 */ + FADDP( ST0, ST(5) ) /* F1 F2 F6 F5 F4 */ + FADDP( ST0, ST(3) ) /* F2 F6 F5 F4 */ + FADDP( ST0, ST(1) ) /* F6 F5 F4 */ FXCH( ST(2) ) /* F4 F5 F6 */ - FADD_S( MAT(12) ) + FADD_S( MAT12 ) FXCH( ST(1) ) /* F5 F4 F6 */ - FADD_S( MAT(13) ) + FADD_S( MAT13 ) FXCH( ST(2) ) /* F6 F4 F5 */ - FADD_S( MAT(14) ) + FADD_S( MAT14 ) FXCH( ST(1) ) /* F4 F6 F5 */ - FSTP_S( DST(0) ) /* F6 F5 */ + FSTP_S( DST0 ) /* F6 F5 */ FXCH( ST(1) ) /* F5 F6 */ - FSTP_S( DST(1) ) /* F6 */ - FSTP_S( DST(2) ) /* */ + FSTP_S( DST1 ) /* F6 */ + FSTP_S( DST2 ) /* */ -LLBL( x86_p2_3dr_skip ): +LLBL(x86_p2_3dr_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p2_3dr_loop ) ) + JNE( LLBL(x86_p2_3dr_loop) ) -LLBL( x86_p2_3dr_done ): +LLBL(x86_p2_3dr_done): POP_L( EDI ) POP_L( ESI ) @@ -289,7 +315,7 @@ GLNAME( _mesa_x86_transform_points2_3d_no_rot ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p2_3dnrr_done ) ) + JZ( LLBL(x86_p2_3dnrr_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) @@ -303,35 +329,35 @@ GLNAME( _mesa_x86_transform_points2_3d_no_rot ): MOV_L( REGOFF(V4F_START, EDI), EDI ) ADD_L( EDI, ECX ) - MOV_L( MAT(14), EBX ) + MOV_L( MAT14, EBX ) ALIGNTEXT16 -LLBL( x86_p2_3dnrr_loop ): +LLBL(x86_p2_3dnrr_loop): - FLD_S( SRC(0) ) /* F4 */ - FMUL_S( MAT(0) ) + FLD_S( SRC0 ) /* F4 */ + FMUL_S( MAT0 ) - FLD_S( SRC(1) ) /* F1 F4 */ - FMUL_S( MAT(5) ) + FLD_S( SRC1 ) /* F1 F4 */ + FMUL_S( MAT5 ) FXCH( ST(1) ) /* F4 F1 */ - FADD_S( MAT(12) ) - FLD_S( MAT(13) ) /* F5 F4 F1 */ + FADD_S( MAT12 ) + FLD_S( MAT13 ) /* F5 F4 F1 */ FXCH( ST(2) ) /* F1 F4 F5 */ - FADDP( ST(0), ST(2) ) /* F4 F5 */ + FADDP( ST0, ST(2) ) /* F4 F5 */ - FSTP_S( DST(0) ) /* F5 */ - FSTP_S( DST(1) ) /* */ - MOV_L( EBX, DST(2) ) + FSTP_S( DST0 ) /* F5 */ + FSTP_S( DST1 ) /* */ + MOV_L( EBX, DST2 ) -LLBL( x86_p2_3dnrr_skip ): +LLBL(x86_p2_3dnrr_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p2_3dnrr_loop ) ) + JNE( LLBL(x86_p2_3dnrr_loop) ) -LLBL( x86_p2_3dnrr_done ): +LLBL(x86_p2_3dnrr_done): POP_L( EBX ) POP_L( EDI ) @@ -357,7 +383,7 @@ GLNAME( _mesa_x86_transform_points2_2d ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p2_2dr_done ) ) + JZ( LLBL(x86_p2_2dr_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, EDI) ) @@ -372,39 +398,39 @@ GLNAME( _mesa_x86_transform_points2_2d ): ADD_L( EDI, ECX ) ALIGNTEXT16 -LLBL( x86_p2_2dr_loop ): +LLBL(x86_p2_2dr_loop): - FLD_S( SRC(0) ) /* F4 */ - FMUL_S( MAT(0) ) - FLD_S( SRC(0) ) /* F5 F4 */ - FMUL_S( MAT(1) ) + FLD_S( SRC0 ) /* F4 */ + FMUL_S( MAT0 ) + FLD_S( SRC0 ) /* F5 F4 */ + FMUL_S( MAT1 ) - FLD_S( SRC(1) ) /* F0 F5 F4 */ - FMUL_S( MAT(4) ) - FLD_S( SRC(1) ) /* F1 F0 F5 F4 */ - FMUL_S( MAT(5) ) + FLD_S( SRC1 ) /* F0 F5 F4 */ + FMUL_S( MAT4 ) + FLD_S( SRC1 ) /* F1 F0 F5 F4 */ + FMUL_S( MAT5 ) FXCH( ST(1) ) /* F0 F1 F5 F4 */ - FADDP( ST(0), ST(3) ) /* F1 F5 F4 */ - FADDP( ST(0), ST(1) ) /* F5 F4 */ + FADDP( ST0, ST(3) ) /* F1 F5 F4 */ + FADDP( ST0, ST(1) ) /* F5 F4 */ FXCH( ST(1) ) /* F4 F5 */ - FADD_S( MAT(12) ) + FADD_S( MAT12 ) FXCH( ST(1) ) /* F5 F4 */ - FADD_S( MAT(13) ) + FADD_S( MAT13 ) FXCH( ST(1) ) /* F4 F5 */ - FSTP_S( DST(0) ) /* F5 */ - FSTP_S( DST(1) ) /* */ + FSTP_S( DST0 ) /* F5 */ + FSTP_S( DST1 ) /* */ -LLBL( x86_p2_2dr_skip ): +LLBL(x86_p2_2dr_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p2_2dr_loop ) ) + JNE( LLBL(x86_p2_2dr_loop) ) -LLBL( x86_p2_2dr_done ): +LLBL(x86_p2_2dr_done): POP_L( EDI ) POP_L( ESI ) @@ -429,7 +455,7 @@ GLNAME( _mesa_x86_transform_points2_2d_no_rot ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p2_2dnrr_done ) ) + JZ( LLBL(x86_p2_2dnrr_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, EDI) ) @@ -444,31 +470,31 @@ GLNAME( _mesa_x86_transform_points2_2d_no_rot ): ADD_L( EDI, ECX ) ALIGNTEXT16 -LLBL( x86_p2_2dnrr_loop ): +LLBL(x86_p2_2dnrr_loop): - FLD_S( SRC(0) ) /* F4 */ - FMUL_S( MAT(0) ) + FLD_S( SRC0 ) /* F4 */ + FMUL_S( MAT0 ) - FLD_S( SRC(1) ) /* F1 F4 */ - FMUL_S( MAT(5) ) + FLD_S( SRC1 ) /* F1 F4 */ + FMUL_S( MAT5 ) FXCH( ST(1) ) /* F4 F1 */ - FADD_S( MAT(12) ) - FLD_S( MAT(13) ) /* F5 F4 F1 */ + FADD_S( MAT12 ) + FLD_S( MAT13 ) /* F5 F4 F1 */ FXCH( ST(2) ) /* F1 F4 F5 */ - FADDP( ST(0), ST(2) ) /* F4 F5 */ + FADDP( ST0, ST(2) ) /* F4 F5 */ - FSTP_S( DST(0) ) /* F5 */ - FSTP_S( DST(1) ) /* */ + FSTP_S( DST0 ) /* F5 */ + FSTP_S( DST1 ) /* */ -LLBL( x86_p2_2dnrr_skip ): +LLBL(x86_p2_2dnrr_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p2_2dnrr_loop ) ) + JNE( LLBL(x86_p2_2dnrr_loop) ) -LLBL( x86_p2_2dnrr_done ): +LLBL(x86_p2_2dnrr_done): POP_L( EDI ) POP_L( ESI ) @@ -494,7 +520,7 @@ GLNAME( _mesa_x86_transform_points2_identity ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p2_ir_done ) ) + JZ( LLBL(x86_p2_ir_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, EDI) ) @@ -509,25 +535,25 @@ GLNAME( _mesa_x86_transform_points2_identity ): ADD_L( EDI, ECX ) CMP_L( ESI, EDI ) - JE( LLBL( x86_p2_ir_done ) ) + JE( LLBL(x86_p2_ir_done) ) ALIGNTEXT16 -LLBL( x86_p2_ir_loop ): +LLBL(x86_p2_ir_loop): - MOV_L( SRC(0), EBX ) - MOV_L( SRC(1), EDX ) + MOV_L( SRC0, EBX ) + MOV_L( SRC1, EDX ) - MOV_L( EBX, DST(0) ) - MOV_L( EDX, DST(1) ) + MOV_L( EBX, DST0 ) + MOV_L( EDX, DST1 ) -LLBL( x86_p2_ir_skip ): +LLBL(x86_p2_ir_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p2_ir_loop ) ) + JNE( LLBL(x86_p2_ir_loop) ) -LLBL( x86_p2_ir_done ): +LLBL(x86_p2_ir_done): POP_L( EBX ) POP_L( EDI ) diff --git a/xc/extras/Mesa/src/X86/x86_xform3.S b/xc/extras/Mesa/src/X86/x86_xform3.S index ad33271aa..9a239137f 100644 --- a/xc/extras/Mesa/src/X86/x86_xform3.S +++ b/xc/extras/Mesa/src/X86/x86_xform3.S @@ -1,4 +1,3 @@ -/* $Id: x86_xform3.S,v 1.3 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -24,6 +23,12 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/* + * NOTE: Avoid using spaces in between '(' ')' and arguments, especially + * with macros like CONST, LLBL that expand to CONCAT(...). Putting spaces + * in there will break the build on some platforms. + */ + #include "matypes.h" #include "xform_args.h" @@ -32,9 +37,30 @@ #define FP_ONE 1065353216 #define FP_ZERO 0 -#define SRC(i) REGOFF(i * 4, ESI) -#define DST(i) REGOFF(i * 4, EDI) -#define MAT(i) REGOFF(i * 4, EDX) +#define SRC0 REGOFF(0, ESI) +#define SRC1 REGOFF(4, ESI) +#define SRC2 REGOFF(8, ESI) +#define SRC3 REGOFF(12, ESI) +#define DST0 REGOFF(0, EDI) +#define DST1 REGOFF(4, EDI) +#define DST2 REGOFF(8, EDI) +#define DST3 REGOFF(12, EDI) +#define MAT0 REGOFF(0, EDX) +#define MAT1 REGOFF(4, EDX) +#define MAT2 REGOFF(8, EDX) +#define MAT3 REGOFF(12, EDX) +#define MAT4 REGOFF(16, EDX) +#define MAT5 REGOFF(20, EDX) +#define MAT6 REGOFF(24, EDX) +#define MAT7 REGOFF(28, EDX) +#define MAT8 REGOFF(32, EDX) +#define MAT9 REGOFF(36, EDX) +#define MAT10 REGOFF(40, EDX) +#define MAT11 REGOFF(44, EDX) +#define MAT12 REGOFF(48, EDX) +#define MAT13 REGOFF(52, EDX) +#define MAT14 REGOFF(56, EDX) +#define MAT15 REGOFF(60, EDX) ALIGNTEXT16 @@ -52,7 +78,7 @@ GLNAME( _mesa_x86_transform_points3_general ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p3_gr_done ) ) + JZ( LLBL(x86_p3_gr_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) @@ -67,73 +93,73 @@ GLNAME( _mesa_x86_transform_points3_general ): ADD_L( EDI, ECX ) ALIGNTEXT16 -LLBL( x86_p3_gr_loop ): - - FLD_S( SRC(0) ) /* F4 */ - FMUL_S( MAT(0) ) - FLD_S( SRC(0) ) /* F5 F4 */ - FMUL_S( MAT(1) ) - FLD_S( SRC(0) ) /* F6 F5 F4 */ - FMUL_S( MAT(2) ) - FLD_S( SRC(0) ) /* F7 F6 F5 F4 */ - FMUL_S( MAT(3) ) - - FLD_S( SRC(1) ) /* F0 F7 F6 F5 F4 */ - FMUL_S( MAT(4) ) - FLD_S( SRC(1) ) /* F1 F0 F7 F6 F5 F4 */ - FMUL_S( MAT(5) ) - FLD_S( SRC(1) ) /* F2 F1 F0 F7 F6 F5 F4 */ - FMUL_S( MAT(6) ) - FLD_S( SRC(1) ) /* F3 F2 F1 F0 F7 F6 F5 F4 */ - FMUL_S( MAT(7) ) +LLBL(x86_p3_gr_loop): + + FLD_S( SRC0 ) /* F4 */ + FMUL_S( MAT0 ) + FLD_S( SRC0 ) /* F5 F4 */ + FMUL_S( MAT1 ) + FLD_S( SRC0 ) /* F6 F5 F4 */ + FMUL_S( MAT2 ) + FLD_S( SRC0 ) /* F7 F6 F5 F4 */ + FMUL_S( MAT3 ) + + FLD_S( SRC1 ) /* F0 F7 F6 F5 F4 */ + FMUL_S( MAT4 ) + FLD_S( SRC1 ) /* F1 F0 F7 F6 F5 F4 */ + FMUL_S( MAT5 ) + FLD_S( SRC1 ) /* F2 F1 F0 F7 F6 F5 F4 */ + FMUL_S( MAT6 ) + FLD_S( SRC1 ) /* F3 F2 F1 F0 F7 F6 F5 F4 */ + FMUL_S( MAT7 ) FXCH( ST(3) ) /* F0 F2 F1 F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(7) ) /* F2 F1 F3 F7 F6 F5 F4 */ + FADDP( ST0, ST(7) ) /* F2 F1 F3 F7 F6 F5 F4 */ FXCH( ST(1) ) /* F1 F2 F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(5) ) /* F2 F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(3) ) /* F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(1) ) /* F7 F6 F5 F4 */ - - FLD_S( SRC(2) ) /* F0 F7 F6 F5 F4 */ - FMUL_S( MAT(8) ) - FLD_S( SRC(2) ) /* F1 F0 F7 F6 F5 F4 */ - FMUL_S( MAT(9) ) - FLD_S( SRC(2) ) /* F2 F1 F0 F7 F6 F5 F4 */ - FMUL_S( MAT(10) ) - FLD_S( SRC(2) ) /* F3 F2 F1 F0 F7 F6 F5 F4 */ - FMUL_S( MAT(11) ) + FADDP( ST0, ST(5) ) /* F2 F3 F7 F6 F5 F4 */ + FADDP( ST0, ST(3) ) /* F3 F7 F6 F5 F4 */ + FADDP( ST0, ST(1) ) /* F7 F6 F5 F4 */ + + FLD_S( SRC2 ) /* F0 F7 F6 F5 F4 */ + FMUL_S( MAT8 ) + FLD_S( SRC2 ) /* F1 F0 F7 F6 F5 F4 */ + FMUL_S( MAT9 ) + FLD_S( SRC2 ) /* F2 F1 F0 F7 F6 F5 F4 */ + FMUL_S( MAT10 ) + FLD_S( SRC2 ) /* F3 F2 F1 F0 F7 F6 F5 F4 */ + FMUL_S( MAT11 ) FXCH( ST(3) ) /* F0 F2 F1 F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(7) ) /* F2 F1 F3 F7 F6 F5 F4 */ + FADDP( ST0, ST(7) ) /* F2 F1 F3 F7 F6 F5 F4 */ FXCH( ST(1) ) /* F1 F2 F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(5) ) /* F2 F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(3) ) /* F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(1) ) /* F7 F6 F5 F4 */ + FADDP( ST0, ST(5) ) /* F2 F3 F7 F6 F5 F4 */ + FADDP( ST0, ST(3) ) /* F3 F7 F6 F5 F4 */ + FADDP( ST0, ST(1) ) /* F7 F6 F5 F4 */ FXCH( ST(3) ) /* F4 F6 F5 F7 */ - FADD_S( MAT(12) ) + FADD_S( MAT12 ) FXCH( ST(2) ) /* F5 F6 F4 F7 */ - FADD_S( MAT(13) ) + FADD_S( MAT13 ) FXCH( ST(1) ) /* F6 F5 F4 F7 */ - FADD_S( MAT(14) ) + FADD_S( MAT14 ) FXCH( ST(3) ) /* F7 F5 F4 F6 */ - FADD_S( MAT(15) ) + FADD_S( MAT15 ) FXCH( ST(2) ) /* F4 F5 F7 F6 */ - FSTP_S( DST(0) ) /* F5 F7 F6 */ - FSTP_S( DST(1) ) /* F7 F6 */ + FSTP_S( DST0 ) /* F5 F7 F6 */ + FSTP_S( DST1 ) /* F7 F6 */ FXCH( ST(1) ) /* F6 F7 */ - FSTP_S( DST(2) ) /* F7 */ - FSTP_S( DST(3) ) /* */ + FSTP_S( DST2 ) /* F7 */ + FSTP_S( DST3 ) /* */ -LLBL( x86_p3_gr_skip ): +LLBL(x86_p3_gr_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p3_gr_loop ) ) + JNE( LLBL(x86_p3_gr_loop) ) -LLBL( x86_p3_gr_done ): +LLBL(x86_p3_gr_done): POP_L( EDI ) POP_L( ESI ) @@ -159,7 +185,7 @@ GLNAME( _mesa_x86_transform_points3_perspective ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p3_pr_done ) ) + JZ( LLBL(x86_p3_pr_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) @@ -174,45 +200,45 @@ GLNAME( _mesa_x86_transform_points3_perspective ): ADD_L( EDI, ECX ) ALIGNTEXT16 -LLBL( x86_p3_pr_loop ): +LLBL(x86_p3_pr_loop): - FLD_S( SRC(0) ) /* F4 */ - FMUL_S( MAT(0) ) + FLD_S( SRC0 ) /* F4 */ + FMUL_S( MAT0 ) - FLD_S( SRC(1) ) /* F5 F4 */ - FMUL_S( MAT(5) ) + FLD_S( SRC1 ) /* F5 F4 */ + FMUL_S( MAT5 ) - FLD_S( SRC(2) ) /* F0 F5 F4 */ - FMUL_S( MAT(8) ) - FLD_S( SRC(2) ) /* F1 F0 F5 F4 */ - FMUL_S( MAT(9) ) - FLD_S( SRC(2) ) /* F2 F1 F0 F5 F4 */ - FMUL_S( MAT(10) ) + FLD_S( SRC2 ) /* F0 F5 F4 */ + FMUL_S( MAT8 ) + FLD_S( SRC2 ) /* F1 F0 F5 F4 */ + FMUL_S( MAT9 ) + FLD_S( SRC2 ) /* F2 F1 F0 F5 F4 */ + FMUL_S( MAT10 ) FXCH( ST(2) ) /* F0 F1 F2 F5 F4 */ - FADDP( ST(0), ST(4) ) /* F1 F2 F5 F4 */ - FADDP( ST(0), ST(2) ) /* F2 F5 F4 */ - FLD_S( MAT(14) ) /* F6 F2 F5 F4 */ + FADDP( ST0, ST(4) ) /* F1 F2 F5 F4 */ + FADDP( ST0, ST(2) ) /* F2 F5 F4 */ + FLD_S( MAT14 ) /* F6 F2 F5 F4 */ FXCH( ST(1) ) /* F2 F6 F5 F4 */ - FADDP( ST(0), ST(1) ) /* F6 F5 F4 */ + FADDP( ST0, ST(1) ) /* F6 F5 F4 */ - MOV_L( SRC(2), EBX ) + MOV_L( SRC2, EBX ) XOR_L( CONST(-2147483648), EBX )/* change sign */ FXCH( ST(2) ) /* F4 F5 F6 */ - FSTP_S( DST(0) ) /* F5 F6 */ - FSTP_S( DST(1) ) /* F6 */ - FSTP_S( DST(2) ) /* */ - MOV_L( EBX, DST(3) ) + FSTP_S( DST0 ) /* F5 F6 */ + FSTP_S( DST1 ) /* F6 */ + FSTP_S( DST2 ) /* */ + MOV_L( EBX, DST3 ) -LLBL( x86_p3_pr_skip ): +LLBL(x86_p3_pr_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p3_pr_loop ) ) + JNE( LLBL(x86_p3_pr_loop) ) -LLBL( x86_p3_pr_done ): +LLBL(x86_p3_pr_done): POP_L( EBX ) POP_L( EDI ) @@ -238,7 +264,7 @@ GLNAME( _mesa_x86_transform_points3_3d ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p3_3dr_done ) ) + JZ( LLBL(x86_p3_3dr_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) @@ -253,60 +279,60 @@ GLNAME( _mesa_x86_transform_points3_3d ): ADD_L( EDI, ECX ) ALIGNTEXT16 -LLBL( x86_p3_3dr_loop ): - - FLD_S( SRC(0) ) /* F4 */ - FMUL_S( MAT(0) ) - FLD_S( SRC(0) ) /* F5 F4 */ - FMUL_S( MAT(1) ) - FLD_S( SRC(0) ) /* F6 F5 F4 */ - FMUL_S( MAT(2) ) - - FLD_S( SRC(1) ) /* F0 F6 F5 F4 */ - FMUL_S( MAT(4) ) - FLD_S( SRC(1) ) /* F1 F0 F6 F5 F4 */ - FMUL_S( MAT(5) ) - FLD_S( SRC(1) ) /* F2 F1 F0 F6 F5 F4 */ - FMUL_S( MAT(6) ) +LLBL(x86_p3_3dr_loop): + + FLD_S( SRC0 ) /* F4 */ + FMUL_S( MAT0 ) + FLD_S( SRC0 ) /* F5 F4 */ + FMUL_S( MAT1 ) + FLD_S( SRC0 ) /* F6 F5 F4 */ + FMUL_S( MAT2 ) + + FLD_S( SRC1 ) /* F0 F6 F5 F4 */ + FMUL_S( MAT4 ) + FLD_S( SRC1 ) /* F1 F0 F6 F5 F4 */ + FMUL_S( MAT5 ) + FLD_S( SRC1 ) /* F2 F1 F0 F6 F5 F4 */ + FMUL_S( MAT6 ) FXCH( ST(2) ) /* F0 F1 F2 F6 F5 F4 */ - FADDP( ST(0), ST(5) ) /* F1 F2 F6 F5 F4 */ - FADDP( ST(0), ST(3) ) /* F2 F6 F5 F4 */ - FADDP( ST(0), ST(1) ) /* F6 F5 F4 */ + FADDP( ST0, ST(5) ) /* F1 F2 F6 F5 F4 */ + FADDP( ST0, ST(3) ) /* F2 F6 F5 F4 */ + FADDP( ST0, ST(1) ) /* F6 F5 F4 */ - FLD_S( SRC(2) ) /* F0 F6 F5 F4 */ - FMUL_S( MAT(8) ) - FLD_S( SRC(2) ) /* F1 F0 F6 F5 F4 */ - FMUL_S( MAT(9) ) - FLD_S( SRC(2) ) /* F2 F1 F0 F6 F5 F4 */ - FMUL_S( MAT(10) ) + FLD_S( SRC2 ) /* F0 F6 F5 F4 */ + FMUL_S( MAT8 ) + FLD_S( SRC2 ) /* F1 F0 F6 F5 F4 */ + FMUL_S( MAT9 ) + FLD_S( SRC2 ) /* F2 F1 F0 F6 F5 F4 */ + FMUL_S( MAT10 ) FXCH( ST(2) ) /* F0 F1 F2 F6 F5 F4 */ - FADDP( ST(0), ST(5) ) /* F1 F2 F6 F5 F4 */ - FADDP( ST(0), ST(3) ) /* F2 F6 F5 F4 */ - FADDP( ST(0), ST(1) ) /* F6 F5 F4 */ + FADDP( ST0, ST(5) ) /* F1 F2 F6 F5 F4 */ + FADDP( ST0, ST(3) ) /* F2 F6 F5 F4 */ + FADDP( ST0, ST(1) ) /* F6 F5 F4 */ FXCH( ST(2) ) /* F4 F5 F6 */ - FADD_S( MAT(12) ) + FADD_S( MAT12 ) FXCH( ST(1) ) /* F5 F4 F6 */ - FADD_S( MAT(13) ) + FADD_S( MAT13 ) FXCH( ST(2) ) /* F6 F4 F5 */ - FADD_S( MAT(14) ) + FADD_S( MAT14 ) FXCH( ST(1) ) /* F4 F6 F5 */ - FSTP_S( DST(0) ) /* F6 F5 */ + FSTP_S( DST0 ) /* F6 F5 */ FXCH( ST(1) ) /* F5 F6 */ - FSTP_S( DST(1) ) /* F6 */ - FSTP_S( DST(2) ) /* */ + FSTP_S( DST1 ) /* F6 */ + FSTP_S( DST2 ) /* */ -LLBL( x86_p3_3dr_skip ): +LLBL(x86_p3_3dr_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p3_3dr_loop ) ) + JNE( LLBL(x86_p3_3dr_loop) ) -LLBL( x86_p3_3dr_done ): +LLBL(x86_p3_3dr_done): POP_L( EDI ) POP_L( ESI ) @@ -332,7 +358,7 @@ GLNAME( _mesa_x86_transform_points3_3d_no_rot ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p3_3dnrr_done ) ) + JZ( LLBL(x86_p3_3dnrr_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) @@ -347,38 +373,38 @@ GLNAME( _mesa_x86_transform_points3_3d_no_rot ): ADD_L( EDI, ECX ) ALIGNTEXT16 -LLBL( x86_p3_3dnrr_loop ): +LLBL(x86_p3_3dnrr_loop): - FLD_S( SRC(0) ) /* F4 */ - FMUL_S( MAT(0) ) + FLD_S( SRC0 ) /* F4 */ + FMUL_S( MAT0 ) - FLD_S( SRC(1) ) /* F1 F4 */ - FMUL_S( MAT(5) ) + FLD_S( SRC1 ) /* F1 F4 */ + FMUL_S( MAT5 ) - FLD_S( SRC(2) ) /* F2 F1 F4 */ - FMUL_S( MAT(10) ) + FLD_S( SRC2 ) /* F2 F1 F4 */ + FMUL_S( MAT10 ) FXCH( ST(2) ) /* F4 F1 F2 */ - FADD_S( MAT(12) ) - FLD_S( MAT(13) ) /* F5 F4 F1 F2 */ + FADD_S( MAT12 ) + FLD_S( MAT13 ) /* F5 F4 F1 F2 */ FXCH( ST(2) ) /* F1 F4 F5 F2 */ - FADDP( ST(0), ST(2) ) /* F4 F5 F2 */ - FLD_S( MAT(14) ) /* F6 F4 F5 F2 */ + FADDP( ST0, ST(2) ) /* F4 F5 F2 */ + FLD_S( MAT14 ) /* F6 F4 F5 F2 */ FXCH( ST(3) ) /* F2 F4 F5 F6 */ - FADDP( ST(0), ST(3) ) /* F4 F5 F6 */ + FADDP( ST0, ST(3) ) /* F4 F5 F6 */ - FSTP_S( DST(0) ) /* F5 F6 */ - FSTP_S( DST(1) ) /* F6 */ - FSTP_S( DST(2) ) /* */ + FSTP_S( DST0 ) /* F5 F6 */ + FSTP_S( DST1 ) /* F6 */ + FSTP_S( DST2 ) /* */ -LLBL( x86_p3_3dnrr_skip ): +LLBL(x86_p3_3dnrr_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p3_3dnrr_loop ) ) + JNE( LLBL(x86_p3_3dnrr_loop) ) -LLBL( x86_p3_3dnrr_done ): +LLBL(x86_p3_3dnrr_done): POP_L( EDI ) POP_L( ESI ) @@ -404,7 +430,7 @@ GLNAME( _mesa_x86_transform_points3_2d ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p3_2dr_done ) ) + JZ( LLBL(x86_p3_2dr_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) @@ -419,42 +445,42 @@ GLNAME( _mesa_x86_transform_points3_2d ): ADD_L( EDI, ECX ) ALIGNTEXT16 -LLBL( x86_p3_2dr_loop ): +LLBL(x86_p3_2dr_loop): - FLD_S( SRC(0) ) /* F4 */ - FMUL_S( MAT(0) ) - FLD_S( SRC(0) ) /* F5 F4 */ - FMUL_S( MAT(1) ) + FLD_S( SRC0 ) /* F4 */ + FMUL_S( MAT0 ) + FLD_S( SRC0 ) /* F5 F4 */ + FMUL_S( MAT1 ) - FLD_S( SRC(1) ) /* F0 F5 F4 */ - FMUL_S( MAT(4) ) - FLD_S( SRC(1) ) /* F1 F0 F5 F4 */ - FMUL_S( MAT(5) ) + FLD_S( SRC1 ) /* F0 F5 F4 */ + FMUL_S( MAT4 ) + FLD_S( SRC1 ) /* F1 F0 F5 F4 */ + FMUL_S( MAT5 ) FXCH( ST(1) ) /* F0 F1 F5 F4 */ - FADDP( ST(0), ST(3) ) /* F1 F5 F4 */ - FADDP( ST(0), ST(1) ) /* F5 F4 */ + FADDP( ST0, ST(3) ) /* F1 F5 F4 */ + FADDP( ST0, ST(1) ) /* F5 F4 */ FXCH( ST(1) ) /* F4 F5 */ - FADD_S( MAT(12) ) + FADD_S( MAT12 ) FXCH( ST(1) ) /* F5 F4 */ - FADD_S( MAT(13) ) + FADD_S( MAT13 ) - MOV_L( SRC(2), EBX ) + MOV_L( SRC2, EBX ) FXCH( ST(1) ) /* F4 F5 */ - FSTP_S( DST(0) ) /* F5 */ - FSTP_S( DST(1) ) /* */ - MOV_L( EBX, DST(2) ) + FSTP_S( DST0 ) /* F5 */ + FSTP_S( DST1 ) /* */ + MOV_L( EBX, DST2 ) -LLBL( x86_p3_2dr_skip ): +LLBL(x86_p3_2dr_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p3_2dr_loop ) ) + JNE( LLBL(x86_p3_2dr_loop) ) -LLBL( x86_p3_2dr_done ): +LLBL(x86_p3_2dr_done): POP_L( EBX ) POP_L( EDI ) @@ -481,7 +507,7 @@ GLNAME( _mesa_x86_transform_points3_2d_no_rot ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p3_2dnrr_done ) ) + JZ( LLBL(x86_p3_2dnrr_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) @@ -496,35 +522,35 @@ GLNAME( _mesa_x86_transform_points3_2d_no_rot ): ADD_L( EDI, ECX ) ALIGNTEXT16 -LLBL( x86_p3_2dnrr_loop ): +LLBL(x86_p3_2dnrr_loop): - FLD_S( SRC(0) ) /* F4 */ - FMUL_S( MAT(0) ) + FLD_S( SRC0 ) /* F4 */ + FMUL_S( MAT0 ) - FLD_S( SRC(1) ) /* F1 F4 */ - FMUL_S( MAT(5) ) + FLD_S( SRC1 ) /* F1 F4 */ + FMUL_S( MAT5 ) FXCH( ST(1) ) /* F4 F1 */ - FADD_S( MAT(12) ) - FLD_S( MAT(13) ) /* F5 F4 F1 */ + FADD_S( MAT12 ) + FLD_S( MAT13 ) /* F5 F4 F1 */ FXCH( ST(2) ) /* F1 F4 F5 */ - FADDP( ST(0), ST(2) ) /* F4 F5 */ + FADDP( ST0, ST(2) ) /* F4 F5 */ - MOV_L( SRC(2), EBX ) + MOV_L( SRC2, EBX ) - FSTP_S( DST(0) ) /* F5 */ - FSTP_S( DST(1) ) /* */ - MOV_L( EBX, DST(2) ) + FSTP_S( DST0 ) /* F5 */ + FSTP_S( DST1 ) /* */ + MOV_L( EBX, DST2 ) -LLBL( x86_p3_2dnrr_skip ): +LLBL(x86_p3_2dnrr_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p3_2dnrr_loop ) ) + JNE( LLBL(x86_p3_2dnrr_loop) ) -LLBL( x86_p3_2dnrr_done ): +LLBL(x86_p3_2dnrr_done): POP_L( EBX ) POP_L( EDI ) @@ -552,7 +578,7 @@ GLNAME(_mesa_x86_transform_points3_identity ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p3_ir_done ) ) + JZ( LLBL(x86_p3_ir_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) @@ -567,37 +593,37 @@ GLNAME(_mesa_x86_transform_points3_identity ): ADD_L( EDI, ECX ) CMP_L( ESI, EDI ) - JE( LLBL( x86_p3_ir_done ) ) + JE( LLBL(x86_p3_ir_done) ) ALIGNTEXT16 -LLBL( x86_p3_ir_loop ): +LLBL(x86_p3_ir_loop): #if 1 - MOV_L( SRC(0), EBX ) - MOV_L( SRC(1), EBP ) - MOV_L( SRC(2), EDX ) + MOV_L( SRC0, EBX ) + MOV_L( SRC1, EBP ) + MOV_L( SRC2, EDX ) - MOV_L( EBX, DST(0) ) - MOV_L( EBP, DST(1) ) - MOV_L( EDX, DST(2) ) + MOV_L( EBX, DST0 ) + MOV_L( EBP, DST1 ) + MOV_L( EDX, DST2 ) #else - FLD_S( SRC(0) ) - FLD_S( SRC(1) ) - FLD_S( SRC(2) ) + FLD_S( SRC0 ) + FLD_S( SRC1 ) + FLD_S( SRC2 ) - FSTP_S( DST(2) ) - FSTP_S( DST(1) ) - FSTP_S( DST(0) ) + FSTP_S( DST2 ) + FSTP_S( DST1 ) + FSTP_S( DST0 ) #endif -LLBL( x86_p3_ir_skip ): +LLBL(x86_p3_ir_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p3_ir_loop ) ) + JNE( LLBL(x86_p3_ir_loop) ) -LLBL( x86_p3_ir_done ): +LLBL(x86_p3_ir_done): POP_L( EBP ) POP_L( EBX ) diff --git a/xc/extras/Mesa/src/X86/x86_xform4.S b/xc/extras/Mesa/src/X86/x86_xform4.S index 7da9b4df4..76cbaa347 100644 --- a/xc/extras/Mesa/src/X86/x86_xform4.S +++ b/xc/extras/Mesa/src/X86/x86_xform4.S @@ -1,4 +1,3 @@ -/* $Id: x86_xform4.S,v 1.3 2002/02/21 11:43:07 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -24,6 +23,12 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/* + * NOTE: Avoid using spaces in between '(' ')' and arguments, especially + * with macros like CONST, LLBL that expand to CONCAT(...). Putting spaces + * in there will break the build on some platforms. + */ + #include "matypes.h" #include "xform_args.h" @@ -32,9 +37,30 @@ #define FP_ONE 1065353216 #define FP_ZERO 0 -#define SRC(i) REGOFF(i * 4, ESI) -#define DST(i) REGOFF(i * 4, EDI) -#define MAT(i) REGOFF(i * 4, EDX) +#define SRC0 REGOFF(0, ESI) +#define SRC1 REGOFF(4, ESI) +#define SRC2 REGOFF(8, ESI) +#define SRC3 REGOFF(12, ESI) +#define DST0 REGOFF(0, EDI) +#define DST1 REGOFF(4, EDI) +#define DST2 REGOFF(8, EDI) +#define DST3 REGOFF(12, EDI) +#define MAT0 REGOFF(0, EDX) +#define MAT1 REGOFF(4, EDX) +#define MAT2 REGOFF(8, EDX) +#define MAT3 REGOFF(12, EDX) +#define MAT4 REGOFF(16, EDX) +#define MAT5 REGOFF(20, EDX) +#define MAT6 REGOFF(24, EDX) +#define MAT7 REGOFF(28, EDX) +#define MAT8 REGOFF(32, EDX) +#define MAT9 REGOFF(36, EDX) +#define MAT10 REGOFF(40, EDX) +#define MAT11 REGOFF(44, EDX) +#define MAT12 REGOFF(48, EDX) +#define MAT13 REGOFF(52, EDX) +#define MAT14 REGOFF(56, EDX) +#define MAT15 REGOFF(60, EDX) ALIGNTEXT16 @@ -52,7 +78,7 @@ GLNAME( _mesa_x86_transform_points4_general ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p4_gr_done ) ) + JZ( LLBL(x86_p4_gr_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) @@ -67,80 +93,80 @@ GLNAME( _mesa_x86_transform_points4_general ): ADD_L( EDI, ECX ) ALIGNTEXT16 -LLBL( x86_p4_gr_loop ): - - FLD_S( SRC(0) ) /* F4 */ - FMUL_S( MAT(0) ) - FLD_S( SRC(0) ) /* F5 F4 */ - FMUL_S( MAT(1) ) - FLD_S( SRC(0) ) /* F6 F5 F4 */ - FMUL_S( MAT(2) ) - FLD_S( SRC(0) ) /* F7 F6 F5 F4 */ - FMUL_S( MAT(3) ) - - FLD_S( SRC(1) ) /* F0 F7 F6 F5 F4 */ - FMUL_S( MAT(4) ) - FLD_S( SRC(1) ) /* F1 F0 F7 F6 F5 F4 */ - FMUL_S( MAT(5) ) - FLD_S( SRC(1) ) /* F2 F1 F0 F7 F6 F5 F4 */ - FMUL_S( MAT(6) ) - FLD_S( SRC(1) ) /* F3 F2 F1 F0 F7 F6 F5 F4 */ - FMUL_S( MAT(7) ) +LLBL(x86_p4_gr_loop): + + FLD_S( SRC0 ) /* F4 */ + FMUL_S( MAT0 ) + FLD_S( SRC0 ) /* F5 F4 */ + FMUL_S( MAT1 ) + FLD_S( SRC0 ) /* F6 F5 F4 */ + FMUL_S( MAT2 ) + FLD_S( SRC0 ) /* F7 F6 F5 F4 */ + FMUL_S( MAT3 ) + + FLD_S( SRC1 ) /* F0 F7 F6 F5 F4 */ + FMUL_S( MAT4 ) + FLD_S( SRC1 ) /* F1 F0 F7 F6 F5 F4 */ + FMUL_S( MAT5 ) + FLD_S( SRC1 ) /* F2 F1 F0 F7 F6 F5 F4 */ + FMUL_S( MAT6 ) + FLD_S( SRC1 ) /* F3 F2 F1 F0 F7 F6 F5 F4 */ + FMUL_S( MAT7 ) FXCH( ST(3) ) /* F0 F2 F1 F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(7) ) /* F2 F1 F3 F7 F6 F5 F4 */ + FADDP( ST0, ST(7) ) /* F2 F1 F3 F7 F6 F5 F4 */ FXCH( ST(1) ) /* F1 F2 F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(5) ) /* F2 F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(3) ) /* F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(1) ) /* F7 F6 F5 F4 */ - - FLD_S( SRC(2) ) /* F0 F7 F6 F5 F4 */ - FMUL_S( MAT(8) ) - FLD_S( SRC(2) ) /* F1 F0 F7 F6 F5 F4 */ - FMUL_S( MAT(9) ) - FLD_S( SRC(2) ) /* F2 F1 F0 F7 F6 F5 F4 */ - FMUL_S( MAT(10) ) - FLD_S( SRC(2) ) /* F3 F2 F1 F0 F7 F6 F5 F4 */ - FMUL_S( MAT(11) ) + FADDP( ST0, ST(5) ) /* F2 F3 F7 F6 F5 F4 */ + FADDP( ST0, ST(3) ) /* F3 F7 F6 F5 F4 */ + FADDP( ST0, ST(1) ) /* F7 F6 F5 F4 */ + + FLD_S( SRC2 ) /* F0 F7 F6 F5 F4 */ + FMUL_S( MAT8 ) + FLD_S( SRC2 ) /* F1 F0 F7 F6 F5 F4 */ + FMUL_S( MAT9 ) + FLD_S( SRC2 ) /* F2 F1 F0 F7 F6 F5 F4 */ + FMUL_S( MAT10 ) + FLD_S( SRC2 ) /* F3 F2 F1 F0 F7 F6 F5 F4 */ + FMUL_S( MAT11 ) FXCH( ST(3) ) /* F0 F2 F1 F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(7) ) /* F2 F1 F3 F7 F6 F5 F4 */ + FADDP( ST0, ST(7) ) /* F2 F1 F3 F7 F6 F5 F4 */ FXCH( ST(1) ) /* F1 F2 F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(5) ) /* F2 F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(3) ) /* F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(1) ) /* F7 F6 F5 F4 */ - - FLD_S( SRC(3) ) /* F0 F7 F6 F5 F4 */ - FMUL_S( MAT(12) ) - FLD_S( SRC(3) ) /* F1 F0 F7 F6 F5 F4 */ - FMUL_S( MAT(13) ) - FLD_S( SRC(3) ) /* F2 F1 F0 F7 F6 F5 F4 */ - FMUL_S( MAT(14) ) - FLD_S( SRC(3) ) /* F3 F2 F1 F0 F7 F6 F5 F4 */ - FMUL_S( MAT(15) ) + FADDP( ST0, ST(5) ) /* F2 F3 F7 F6 F5 F4 */ + FADDP( ST0, ST(3) ) /* F3 F7 F6 F5 F4 */ + FADDP( ST0, ST(1) ) /* F7 F6 F5 F4 */ + + FLD_S( SRC3 ) /* F0 F7 F6 F5 F4 */ + FMUL_S( MAT12 ) + FLD_S( SRC3 ) /* F1 F0 F7 F6 F5 F4 */ + FMUL_S( MAT13 ) + FLD_S( SRC3 ) /* F2 F1 F0 F7 F6 F5 F4 */ + FMUL_S( MAT14 ) + FLD_S( SRC3 ) /* F3 F2 F1 F0 F7 F6 F5 F4 */ + FMUL_S( MAT15 ) FXCH( ST(3) ) /* F0 F2 F1 F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(7) ) /* F2 F1 F3 F7 F6 F5 F4 */ + FADDP( ST0, ST(7) ) /* F2 F1 F3 F7 F6 F5 F4 */ FXCH( ST(1) ) /* F1 F2 F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(5) ) /* F2 F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(3) ) /* F3 F7 F6 F5 F4 */ - FADDP( ST(0), ST(1) ) /* F7 F6 F5 F4 */ + FADDP( ST0, ST(5) ) /* F2 F3 F7 F6 F5 F4 */ + FADDP( ST0, ST(3) ) /* F3 F7 F6 F5 F4 */ + FADDP( ST0, ST(1) ) /* F7 F6 F5 F4 */ FXCH( ST(3) ) /* F4 F6 F5 F7 */ - FSTP_S( DST(0) ) /* F6 F5 F7 */ + FSTP_S( DST0 ) /* F6 F5 F7 */ FXCH( ST(1) ) /* F5 F6 F7 */ - FSTP_S( DST(1) ) /* F6 F7 */ - FSTP_S( DST(2) ) /* F7 */ - FSTP_S( DST(3) ) /* */ + FSTP_S( DST1 ) /* F6 F7 */ + FSTP_S( DST2 ) /* F7 */ + FSTP_S( DST3 ) /* */ -LLBL( x86_p4_gr_skip ): +LLBL(x86_p4_gr_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p4_gr_loop ) ) + JNE( LLBL(x86_p4_gr_loop) ) -LLBL( x86_p4_gr_done ): +LLBL(x86_p4_gr_done): POP_L( EDI ) POP_L( ESI ) @@ -166,7 +192,7 @@ GLNAME( _mesa_x86_transform_points4_perspective ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p4_pr_done ) ) + JZ( LLBL(x86_p4_pr_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) @@ -181,47 +207,47 @@ GLNAME( _mesa_x86_transform_points4_perspective ): ADD_L( EDI, ECX ) ALIGNTEXT16 -LLBL( x86_p4_pr_loop ): +LLBL(x86_p4_pr_loop): - FLD_S( SRC(0) ) /* F4 */ - FMUL_S( MAT(0) ) + FLD_S( SRC0 ) /* F4 */ + FMUL_S( MAT0 ) - FLD_S( SRC(1) ) /* F5 F4 */ - FMUL_S( MAT(5) ) + FLD_S( SRC1 ) /* F5 F4 */ + FMUL_S( MAT5 ) - FLD_S( SRC(2) ) /* F0 F5 F4 */ - FMUL_S( MAT(8) ) - FLD_S( SRC(2) ) /* F1 F0 F5 F4 */ - FMUL_S( MAT(9) ) - FLD_S( SRC(2) ) /* F6 F1 F0 F5 F4 */ - FMUL_S( MAT(10) ) + FLD_S( SRC2 ) /* F0 F5 F4 */ + FMUL_S( MAT8 ) + FLD_S( SRC2 ) /* F1 F0 F5 F4 */ + FMUL_S( MAT9 ) + FLD_S( SRC2 ) /* F6 F1 F0 F5 F4 */ + FMUL_S( MAT10 ) FXCH( ST(2) ) /* F0 F1 F6 F5 F4 */ - FADDP( ST(0), ST(4) ) /* F1 F6 F5 F4 */ - FADDP( ST(0), ST(2) ) /* F6 F5 F4 */ + FADDP( ST0, ST(4) ) /* F1 F6 F5 F4 */ + FADDP( ST0, ST(2) ) /* F6 F5 F4 */ - FLD_S( SRC(3) ) /* F2 F6 F5 F4 */ - FMUL_S( MAT(14) ) + FLD_S( SRC3 ) /* F2 F6 F5 F4 */ + FMUL_S( MAT14 ) - FADDP( ST(0), ST(1) ) /* F6 F5 F4 */ + FADDP( ST0, ST(1) ) /* F6 F5 F4 */ - MOV_L( SRC(2), EBX ) + MOV_L( SRC2, EBX ) XOR_L( CONST(-2147483648), EBX )/* change sign */ FXCH( ST(2) ) /* F4 F5 F6 */ - FSTP_S( DST(0) ) /* F5 F6 */ - FSTP_S( DST(1) ) /* F6 */ - FSTP_S( DST(2) ) /* */ - MOV_L( EBX, DST(3) ) + FSTP_S( DST0 ) /* F5 F6 */ + FSTP_S( DST1 ) /* F6 */ + FSTP_S( DST2 ) /* */ + MOV_L( EBX, DST3 ) -LLBL( x86_p4_pr_skip ): +LLBL(x86_p4_pr_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p4_pr_loop ) ) + JNE( LLBL(x86_p4_pr_loop) ) -LLBL( x86_p4_pr_done ): +LLBL(x86_p4_pr_done): POP_L( EBX ) POP_L( EDI ) @@ -248,7 +274,7 @@ GLNAME( _mesa_x86_transform_points4_3d ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p4_3dr_done ) ) + JZ( LLBL(x86_p4_3dr_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) @@ -263,67 +289,67 @@ GLNAME( _mesa_x86_transform_points4_3d ): ADD_L( EDI, ECX ) ALIGNTEXT16 -LLBL( x86_p4_3dr_loop ): - - FLD_S( SRC(0) ) /* F4 */ - FMUL_S( MAT(0) ) - FLD_S( SRC(0) ) /* F5 F4 */ - FMUL_S( MAT(1) ) - FLD_S( SRC(0) ) /* F6 F5 F4 */ - FMUL_S( MAT(2) ) - - FLD_S( SRC(1) ) /* F0 F6 F5 F4 */ - FMUL_S( MAT(4) ) - FLD_S( SRC(1) ) /* F1 F0 F6 F5 F4 */ - FMUL_S( MAT(5) ) - FLD_S( SRC(1) ) /* F2 F1 F0 F6 F5 F4 */ - FMUL_S( MAT(6) ) +LLBL(x86_p4_3dr_loop): + + FLD_S( SRC0 ) /* F4 */ + FMUL_S( MAT0 ) + FLD_S( SRC0 ) /* F5 F4 */ + FMUL_S( MAT1 ) + FLD_S( SRC0 ) /* F6 F5 F4 */ + FMUL_S( MAT2 ) + + FLD_S( SRC1 ) /* F0 F6 F5 F4 */ + FMUL_S( MAT4 ) + FLD_S( SRC1 ) /* F1 F0 F6 F5 F4 */ + FMUL_S( MAT5 ) + FLD_S( SRC1 ) /* F2 F1 F0 F6 F5 F4 */ + FMUL_S( MAT6 ) FXCH( ST(2) ) /* F0 F1 F2 F6 F5 F4 */ - FADDP( ST(0), ST(5) ) /* F1 F2 F6 F5 F4 */ - FADDP( ST(0), ST(3) ) /* F2 F6 F5 F4 */ - FADDP( ST(0), ST(1) ) /* F6 F5 F4 */ + FADDP( ST0, ST(5) ) /* F1 F2 F6 F5 F4 */ + FADDP( ST0, ST(3) ) /* F2 F6 F5 F4 */ + FADDP( ST0, ST(1) ) /* F6 F5 F4 */ - FLD_S( SRC(2) ) /* F0 F6 F5 F4 */ - FMUL_S( MAT(8) ) - FLD_S( SRC(2) ) /* F1 F0 F6 F5 F4 */ - FMUL_S( MAT(9) ) - FLD_S( SRC(2) ) /* F2 F1 F0 F6 F5 F4 */ - FMUL_S( MAT(10) ) + FLD_S( SRC2 ) /* F0 F6 F5 F4 */ + FMUL_S( MAT8 ) + FLD_S( SRC2 ) /* F1 F0 F6 F5 F4 */ + FMUL_S( MAT9 ) + FLD_S( SRC2 ) /* F2 F1 F0 F6 F5 F4 */ + FMUL_S( MAT10 ) FXCH( ST(2) ) /* F0 F1 F2 F6 F5 F4 */ - FADDP( ST(0), ST(5) ) /* F1 F2 F6 F5 F4 */ - FADDP( ST(0), ST(3) ) /* F2 F6 F5 F4 */ - FADDP( ST(0), ST(1) ) /* F6 F5 F4 */ + FADDP( ST0, ST(5) ) /* F1 F2 F6 F5 F4 */ + FADDP( ST0, ST(3) ) /* F2 F6 F5 F4 */ + FADDP( ST0, ST(1) ) /* F6 F5 F4 */ - FLD_S( SRC(3) ) /* F0 F6 F5 F4 */ - FMUL_S( MAT(12) ) - FLD_S( SRC(3) ) /* F1 F0 F6 F5 F4 */ - FMUL_S( MAT(13) ) - FLD_S( SRC(3) ) /* F2 F1 F0 F6 F5 F4 */ - FMUL_S( MAT(14) ) + FLD_S( SRC3 ) /* F0 F6 F5 F4 */ + FMUL_S( MAT12 ) + FLD_S( SRC3 ) /* F1 F0 F6 F5 F4 */ + FMUL_S( MAT13 ) + FLD_S( SRC3 ) /* F2 F1 F0 F6 F5 F4 */ + FMUL_S( MAT14 ) FXCH( ST(2) ) /* F0 F1 F2 F6 F5 F4 */ - FADDP( ST(0), ST(5) ) /* F1 F2 F6 F5 F4 */ - FADDP( ST(0), ST(3) ) /* F2 F6 F5 F4 */ - FADDP( ST(0), ST(1) ) /* F6 F5 F4 */ + FADDP( ST0, ST(5) ) /* F1 F2 F6 F5 F4 */ + FADDP( ST0, ST(3) ) /* F2 F6 F5 F4 */ + FADDP( ST0, ST(1) ) /* F6 F5 F4 */ - MOV_L( SRC(3), EBX ) + MOV_L( SRC3, EBX ) FXCH( ST(2) ) /* F4 F5 F6 */ - FSTP_S( DST(0) ) /* F5 F6 */ - FSTP_S( DST(1) ) /* F6 */ - FSTP_S( DST(2) ) /* */ - MOV_L( EBX, DST(3) ) + FSTP_S( DST0 ) /* F5 F6 */ + FSTP_S( DST1 ) /* F6 */ + FSTP_S( DST2 ) /* */ + MOV_L( EBX, DST3 ) -LLBL( x86_p4_3dr_skip ): +LLBL(x86_p4_3dr_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p4_3dr_loop ) ) + JNE( LLBL(x86_p4_3dr_loop) ) -LLBL( x86_p4_3dr_done ): +LLBL(x86_p4_3dr_done): POP_L( EBX ) POP_L( EDI ) @@ -350,7 +376,7 @@ GLNAME(_mesa_x86_transform_points4_3d_no_rot): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p4_3dnrr_done ) ) + JZ( LLBL(x86_p4_3dnrr_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) @@ -365,45 +391,45 @@ GLNAME(_mesa_x86_transform_points4_3d_no_rot): ADD_L( EDI, ECX ) ALIGNTEXT16 -LLBL( x86_p4_3dnrr_loop ): +LLBL(x86_p4_3dnrr_loop): - FLD_S( SRC(0) ) /* F4 */ - FMUL_S( MAT(0) ) + FLD_S( SRC0 ) /* F4 */ + FMUL_S( MAT0 ) - FLD_S( SRC(1) ) /* F5 F4 */ - FMUL_S( MAT(5) ) + FLD_S( SRC1 ) /* F5 F4 */ + FMUL_S( MAT5 ) - FLD_S( SRC(2) ) /* F6 F5 F4 */ - FMUL_S( MAT(10) ) + FLD_S( SRC2 ) /* F6 F5 F4 */ + FMUL_S( MAT10 ) - FLD_S( SRC(3) ) /* F0 F6 F5 F4 */ - FMUL_S( MAT(12) ) - FLD_S( SRC(3) ) /* F1 F0 F6 F5 F4 */ - FMUL_S( MAT(13) ) - FLD_S( SRC(3) ) /* F2 F1 F0 F6 F5 F4 */ - FMUL_S( MAT(14) ) + FLD_S( SRC3 ) /* F0 F6 F5 F4 */ + FMUL_S( MAT12 ) + FLD_S( SRC3 ) /* F1 F0 F6 F5 F4 */ + FMUL_S( MAT13 ) + FLD_S( SRC3 ) /* F2 F1 F0 F6 F5 F4 */ + FMUL_S( MAT14 ) FXCH( ST(2) ) /* F0 F1 F2 F6 F5 F4 */ - FADDP( ST(0), ST(5) ) /* F1 F2 F6 F5 F4 */ - FADDP( ST(0), ST(3) ) /* F2 F6 F5 F4 */ - FADDP( ST(0), ST(1) ) /* F6 F5 F4 */ + FADDP( ST0, ST(5) ) /* F1 F2 F6 F5 F4 */ + FADDP( ST0, ST(3) ) /* F2 F6 F5 F4 */ + FADDP( ST0, ST(1) ) /* F6 F5 F4 */ - MOV_L( SRC(3), EBX ) + MOV_L( SRC3, EBX ) FXCH( ST(2) ) /* F4 F5 F6 */ - FSTP_S( DST(0) ) /* F5 F6 */ - FSTP_S( DST(1) ) /* F6 */ - FSTP_S( DST(2) ) /* */ - MOV_L( EBX, DST(3) ) + FSTP_S( DST0 ) /* F5 F6 */ + FSTP_S( DST1 ) /* F6 */ + FSTP_S( DST2 ) /* */ + MOV_L( EBX, DST3 ) -LLBL( x86_p4_3dnrr_skip ): +LLBL(x86_p4_3dnrr_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p4_3dnrr_loop ) ) + JNE( LLBL(x86_p4_3dnrr_loop) ) -LLBL( x86_p4_3dnrr_done ): +LLBL(x86_p4_3dnrr_done): POP_L( EBX ) POP_L( EDI ) @@ -431,7 +457,7 @@ GLNAME( _mesa_x86_transform_points4_2d ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p4_2dr_done ) ) + JZ( LLBL(x86_p4_2dr_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) @@ -446,48 +472,48 @@ GLNAME( _mesa_x86_transform_points4_2d ): ADD_L( EDI, ECX ) ALIGNTEXT16 -LLBL( x86_p4_2dr_loop ): +LLBL(x86_p4_2dr_loop): - FLD_S( SRC(0) ) /* F4 */ - FMUL_S( MAT(0) ) - FLD_S( SRC(0) ) /* F5 F4 */ - FMUL_S( MAT(1) ) + FLD_S( SRC0 ) /* F4 */ + FMUL_S( MAT0 ) + FLD_S( SRC0 ) /* F5 F4 */ + FMUL_S( MAT1 ) - FLD_S( SRC(1) ) /* F0 F5 F4 */ - FMUL_S( MAT(4) ) - FLD_S( SRC(1) ) /* F1 F0 F5 F4 */ - FMUL_S( MAT(5) ) + FLD_S( SRC1 ) /* F0 F5 F4 */ + FMUL_S( MAT4 ) + FLD_S( SRC1 ) /* F1 F0 F5 F4 */ + FMUL_S( MAT5 ) FXCH( ST(1) ) /* F0 F1 F5 F4 */ - FADDP( ST(0), ST(3) ) /* F1 F5 F4 */ - FADDP( ST(0), ST(1) ) /* F5 F4 */ + FADDP( ST0, ST(3) ) /* F1 F5 F4 */ + FADDP( ST0, ST(1) ) /* F5 F4 */ - FLD_S( SRC(3) ) /* F0 F5 F4 */ - FMUL_S( MAT(12) ) - FLD_S( SRC(3) ) /* F1 F0 F5 F4 */ - FMUL_S( MAT(13) ) + FLD_S( SRC3 ) /* F0 F5 F4 */ + FMUL_S( MAT12 ) + FLD_S( SRC3 ) /* F1 F0 F5 F4 */ + FMUL_S( MAT13 ) FXCH( ST(1) ) /* F0 F1 F5 F4 */ - FADDP( ST(0), ST(3) ) /* F1 F5 F4 */ - FADDP( ST(0), ST(1) ) /* F5 F4 */ + FADDP( ST0, ST(3) ) /* F1 F5 F4 */ + FADDP( ST0, ST(1) ) /* F5 F4 */ - MOV_L( SRC(2), EBX ) - MOV_L( SRC(3), EBP ) + MOV_L( SRC2, EBX ) + MOV_L( SRC3, EBP ) FXCH( ST(1) ) /* F4 F5 */ - FSTP_S( DST(0) ) /* F5 */ - FSTP_S( DST(1) ) /* */ - MOV_L( EBX, DST(2) ) - MOV_L( EBP, DST(3) ) + FSTP_S( DST0 ) /* F5 */ + FSTP_S( DST1 ) /* */ + MOV_L( EBX, DST2 ) + MOV_L( EBP, DST3 ) -LLBL( x86_p4_2dr_skip ): +LLBL(x86_p4_2dr_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p4_2dr_loop ) ) + JNE( LLBL(x86_p4_2dr_loop) ) -LLBL( x86_p4_2dr_done ): +LLBL(x86_p4_2dr_done): POP_L( EBP ) POP_L( EBX ) @@ -516,7 +542,7 @@ GLNAME( _mesa_x86_transform_points4_2d_no_rot ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p4_2dnrr_done ) ) + JZ( LLBL(x86_p4_2dnrr_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) @@ -531,40 +557,40 @@ GLNAME( _mesa_x86_transform_points4_2d_no_rot ): ADD_L( EDI, ECX ) ALIGNTEXT16 -LLBL( x86_p4_2dnrr_loop ): +LLBL(x86_p4_2dnrr_loop): - FLD_S( SRC(0) ) /* F4 */ - FMUL_S( MAT(0) ) + FLD_S( SRC0 ) /* F4 */ + FMUL_S( MAT0 ) - FLD_S( SRC(1) ) /* F5 F4 */ - FMUL_S( MAT(5) ) + FLD_S( SRC1 ) /* F5 F4 */ + FMUL_S( MAT5 ) - FLD_S( SRC(3) ) /* F0 F5 F4 */ - FMUL_S( MAT(12) ) - FLD_S( SRC(3) ) /* F1 F0 F5 F4 */ - FMUL_S( MAT(13) ) + FLD_S( SRC3 ) /* F0 F5 F4 */ + FMUL_S( MAT12 ) + FLD_S( SRC3 ) /* F1 F0 F5 F4 */ + FMUL_S( MAT13 ) FXCH( ST(1) ) /* F0 F1 F5 F4 */ - FADDP( ST(0), ST(3) ) /* F1 F5 F4 */ - FADDP( ST(0), ST(1) ) /* F5 F4 */ + FADDP( ST0, ST(3) ) /* F1 F5 F4 */ + FADDP( ST0, ST(1) ) /* F5 F4 */ - MOV_L( SRC(2), EBX ) - MOV_L( SRC(3), EBP ) + MOV_L( SRC2, EBX ) + MOV_L( SRC3, EBP ) FXCH( ST(1) ) /* F4 F5 */ - FSTP_S( DST(0) ) /* F5 */ - FSTP_S( DST(1) ) /* */ - MOV_L( EBX, DST(2) ) - MOV_L( EBP, DST(3) ) + FSTP_S( DST0 ) /* F5 */ + FSTP_S( DST1 ) /* */ + MOV_L( EBX, DST2 ) + MOV_L( EBP, DST3 ) -LLBL( x86_p4_2dnrr_skip ): +LLBL(x86_p4_2dnrr_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p4_2dnrr_loop ) ) + JNE( LLBL(x86_p4_2dnrr_loop) ) -LLBL( x86_p4_2dnrr_done ): +LLBL(x86_p4_2dnrr_done): POP_L( EBP ) POP_L( EBX ) @@ -592,7 +618,7 @@ GLNAME( _mesa_x86_transform_points4_identity ): MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) TEST_L( ECX, ECX ) - JZ( LLBL( x86_p4_ir_done ) ) + JZ( LLBL(x86_p4_ir_done) ) MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) @@ -607,31 +633,31 @@ GLNAME( _mesa_x86_transform_points4_identity ): ADD_L( EDI, ECX ) CMP_L( ESI, EDI ) - JE( LLBL( x86_p4_ir_done ) ) + JE( LLBL(x86_p4_ir_done) ) ALIGNTEXT16 -LLBL( x86_p4_ir_loop ): +LLBL(x86_p4_ir_loop): - MOV_L( SRC(0), EBX ) - MOV_L( SRC(1), EDX ) + MOV_L( SRC0, EBX ) + MOV_L( SRC1, EDX ) - MOV_L( EBX, DST(0) ) - MOV_L( EDX, DST(1) ) + MOV_L( EBX, DST0 ) + MOV_L( EDX, DST1 ) - MOV_L( SRC(2), EBX ) - MOV_L( SRC(3), EDX ) + MOV_L( SRC2, EBX ) + MOV_L( SRC3, EDX ) - MOV_L( EBX, DST(2) ) - MOV_L( EDX, DST(3) ) + MOV_L( EBX, DST2 ) + MOV_L( EDX, DST3 ) -LLBL( x86_p4_ir_skip ): +LLBL(x86_p4_ir_skip): ADD_L( CONST(16), EDI ) ADD_L( EAX, ESI ) CMP_L( ECX, EDI ) - JNE( LLBL( x86_p4_ir_loop ) ) + JNE( LLBL(x86_p4_ir_loop) ) -LLBL( x86_p4_ir_done ): +LLBL(x86_p4_ir_done): POP_L( EBX ) POP_L( EDI ) diff --git a/xc/extras/Mesa/src/X86/xform_args.h b/xc/extras/Mesa/src/X86/xform_args.h index 9618749a7..2713d548d 100644 --- a/xc/extras/Mesa/src/X86/xform_args.h +++ b/xc/extras/Mesa/src/X86/xform_args.h @@ -1,4 +1,3 @@ -/* $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 2de4a3d51..ca255892f 100644 --- a/xc/extras/Mesa/src/accum.c +++ b/xc/extras/Mesa/src/accum.c @@ -1,4 +1,3 @@ -/* $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 f972b1579..8682525dc 100644 --- a/xc/extras/Mesa/src/accum.h +++ b/xc/extras/Mesa/src/accum.h @@ -1,4 +1,3 @@ -/* $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 4a0118155..852aaa630 100644 --- a/xc/extras/Mesa/src/all.h +++ b/xc/extras/Mesa/src/all.h @@ -1,4 +1,3 @@ -/* $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 cacf2abe8..6704b7bf1 100644 --- a/xc/extras/Mesa/src/api_arrayelt.c +++ b/xc/extras/Mesa/src/api_arrayelt.c @@ -1,4 +1,3 @@ -/* $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 fb73ca04d..706a72308 100644 --- a/xc/extras/Mesa/src/api_arrayelt.h +++ b/xc/extras/Mesa/src/api_arrayelt.h @@ -1,4 +1,3 @@ -/* $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 b17056347..854677e64 100644 --- a/xc/extras/Mesa/src/api_eval.c +++ b/xc/extras/Mesa/src/api_eval.c @@ -1,4 +1,3 @@ -/* $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 1a1b41ef4..d6cb38c9f 100644 --- a/xc/extras/Mesa/src/api_eval.h +++ b/xc/extras/Mesa/src/api_eval.h @@ -1,4 +1,3 @@ -/* $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 3fe93d85c..90558fc45 100644 --- a/xc/extras/Mesa/src/api_loopback.c +++ b/xc/extras/Mesa/src/api_loopback.c @@ -1,4 +1,3 @@ -/* $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 47fb9d1b1..a4858e44f 100644 --- a/xc/extras/Mesa/src/api_loopback.h +++ b/xc/extras/Mesa/src/api_loopback.h @@ -1,4 +1,3 @@ -/* $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 a6b58b5d6..6eefdec1c 100644 --- a/xc/extras/Mesa/src/api_noop.c +++ b/xc/extras/Mesa/src/api_noop.c @@ -1,4 +1,3 @@ -/* $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 7efe16aa5..7eafaedaf 100644 --- a/xc/extras/Mesa/src/api_noop.h +++ b/xc/extras/Mesa/src/api_noop.h @@ -1,4 +1,3 @@ -/* $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 1f3df89b8..f00708858 100644 --- a/xc/extras/Mesa/src/api_validate.c +++ b/xc/extras/Mesa/src/api_validate.c @@ -1,4 +1,3 @@ -/* $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 08e22a985..10f0c34e6 100644 --- a/xc/extras/Mesa/src/api_validate.h +++ b/xc/extras/Mesa/src/api_validate.h @@ -1,4 +1,3 @@ -/* $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 5c7f0477d..5286a2c67 100644 --- a/xc/extras/Mesa/src/array_cache/ac_context.c +++ b/xc/extras/Mesa/src/array_cache/ac_context.c @@ -1,4 +1,3 @@ -/* $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 26f192791..7c1132f7b 100644 --- a/xc/extras/Mesa/src/array_cache/ac_context.h +++ b/xc/extras/Mesa/src/array_cache/ac_context.h @@ -1,4 +1,3 @@ -/* $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 44fa869cd..183527eaf 100644 --- a/xc/extras/Mesa/src/array_cache/ac_import.c +++ b/xc/extras/Mesa/src/array_cache/ac_import.c @@ -1,4 +1,3 @@ -/* $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 931a11b77..7579ec3fe 100644 --- a/xc/extras/Mesa/src/array_cache/acache.h +++ b/xc/extras/Mesa/src/array_cache/acache.h @@ -1,4 +1,3 @@ -/* $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 a1ac6aa3c..834ce19c5 100644 --- a/xc/extras/Mesa/src/attrib.c +++ b/xc/extras/Mesa/src/attrib.c @@ -1,4 +1,3 @@ -/* $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 94f1f5ce7..decc71a78 100644 --- a/xc/extras/Mesa/src/attrib.h +++ b/xc/extras/Mesa/src/attrib.h @@ -1,4 +1,3 @@ -/* $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 35ff97f09..d5bb107f6 100644 --- a/xc/extras/Mesa/src/blend.c +++ b/xc/extras/Mesa/src/blend.c @@ -1,4 +1,3 @@ -/* $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 3433a60f8..d0a24afd0 100644 --- a/xc/extras/Mesa/src/blend.h +++ b/xc/extras/Mesa/src/blend.h @@ -1,4 +1,3 @@ -/* $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 374a4ef11..812096bcd 100644 --- a/xc/extras/Mesa/src/buffers.c +++ b/xc/extras/Mesa/src/buffers.c @@ -1,10 +1,9 @@ -/* $Id: buffers.c,v 1.11 2002/02/21 11:42:58 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"), @@ -341,33 +340,59 @@ _mesa_ReadBuffer( GLenum mode ) /* * GL_MESA_resize_buffers extension + * When this function is called, we'll ask the window system how large + * the current window is. If it's not what we expect, we'll have to + * resize/reallocate the software accum/stencil/depth/alpha buffers. */ void _mesa_ResizeBuffersMESA( void ) { GLcontext *ctx = _mesa_get_current_context(); - GLuint buf_width, buf_height; - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx ); - if (MESA_VERBOSE & VERBOSE_API) fprintf(stderr, "glResizeBuffersMESA\n"); - /* ask device driver for size of output buffer */ - (*ctx->Driver.GetBufferSize)( ctx, &buf_width, &buf_height ); + if (ctx) { + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx ); - /* see if size of device driver's color buffer (window) has changed */ - if (ctx->DrawBuffer->Width == (GLint) buf_width && - ctx->DrawBuffer->Height == (GLint) buf_height) - return; + if (ctx->DrawBuffer) { + GLuint buf_width, buf_height; + GLframebuffer *buffer = ctx->DrawBuffer; + + /* ask device driver for size of output buffer */ + (*ctx->Driver.GetBufferSize)( buffer, &buf_width, &buf_height ); - ctx->NewState |= _NEW_BUFFERS; /* to update scissor / window bounds */ + /* see if size of device driver's color buffer (window) has changed */ + if (buffer->Width == (GLint) buf_width && + buffer->Height == (GLint) buf_height) + return; /* size is as expected */ + + buffer->Width = buf_width; + buffer->Height = buf_height; + + ctx->Driver.ResizeBuffers( buffer ); + } - /* save buffer size */ - ctx->DrawBuffer->Width = buf_width; - ctx->DrawBuffer->Height = buf_height; + if (ctx->ReadBuffer && ctx->ReadBuffer != ctx->DrawBuffer) { + GLuint buf_width, buf_height; + GLframebuffer *buffer = ctx->DrawBuffer; - ctx->Driver.ResizeBuffersMESA( ctx ); + /* ask device driver for size of output buffer */ + (*ctx->Driver.GetBufferSize)( buffer, &buf_width, &buf_height ); + + /* see if size of device driver's color buffer (window) has changed */ + if (buffer->Width == (GLint) buf_width && + buffer->Height == (GLint) buf_height) + return; /* size is as expected */ + + buffer->Width = buf_width; + buffer->Height = buf_height; + + ctx->Driver.ResizeBuffers( buffer ); + } + + ctx->NewState |= _NEW_BUFFERS; /* to update scissor / window bounds */ + } } diff --git a/xc/extras/Mesa/src/buffers.h b/xc/extras/Mesa/src/buffers.h index d413cbe64..dfa213130 100644 --- a/xc/extras/Mesa/src/buffers.h +++ b/xc/extras/Mesa/src/buffers.h @@ -1,4 +1,3 @@ -/* $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 dcf2f9e0f..bde8c2072 100644 --- a/xc/extras/Mesa/src/clip.c +++ b/xc/extras/Mesa/src/clip.c @@ -1,4 +1,3 @@ -/* $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 e70ca1383..fffcf13e9 100644 --- a/xc/extras/Mesa/src/clip.h +++ b/xc/extras/Mesa/src/clip.h @@ -1,4 +1,3 @@ -/* $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 d561b4ee8..18f12d98e 100644 --- a/xc/extras/Mesa/src/colormac.h +++ b/xc/extras/Mesa/src/colormac.h @@ -1,4 +1,3 @@ -/* $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 478e9ad90..cf13032b4 100644 --- a/xc/extras/Mesa/src/colortab.c +++ b/xc/extras/Mesa/src/colortab.c @@ -1,4 +1,3 @@ -/* $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 905cc8231..e3bc76e5c 100644 --- a/xc/extras/Mesa/src/colortab.h +++ b/xc/extras/Mesa/src/colortab.h @@ -1,4 +1,3 @@ -/* $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 f885e0970..8157964f4 100644 --- a/xc/extras/Mesa/src/config.c +++ b/xc/extras/Mesa/src/config.c @@ -1,4 +1,3 @@ -/* $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 a2cecf508..97a832c74 100644 --- a/xc/extras/Mesa/src/config.h +++ b/xc/extras/Mesa/src/config.h @@ -1,4 +1,3 @@ -/* $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 c3112315e..63a8cc3c2 100644 --- a/xc/extras/Mesa/src/context.c +++ b/xc/extras/Mesa/src/context.c @@ -1,10 +1,9 @@ -/* $Id: context.c,v 1.20 2002/02/21 11:42:58 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"), @@ -2046,6 +2045,9 @@ _mesa_error( GLcontext *ctx, GLenum error, const char *where ) fprintf(stderr, "Mesa user error: %s in %s\n", errstr, where); } + if (!ctx) + return; + if (ctx->ErrorValue == GL_NO_ERROR) { ctx->ErrorValue = error; } diff --git a/xc/extras/Mesa/src/context.h b/xc/extras/Mesa/src/context.h index dfe5eaf05..36f8e164f 100644 --- a/xc/extras/Mesa/src/context.h +++ b/xc/extras/Mesa/src/context.h @@ -1,4 +1,3 @@ -/* $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 4eb21ac8c..4426ee428 100644 --- a/xc/extras/Mesa/src/convolve.c +++ b/xc/extras/Mesa/src/convolve.c @@ -1,4 +1,3 @@ -/* $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 bde897f7a..f97c9f35b 100644 --- a/xc/extras/Mesa/src/convolve.h +++ b/xc/extras/Mesa/src/convolve.h @@ -1,4 +1,3 @@ -/* $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 083abade0..13553c8d2 100644 --- a/xc/extras/Mesa/src/dd.h +++ b/xc/extras/Mesa/src/dd.h @@ -1,4 +1,3 @@ -/* $Id: dd.h,v 1.16 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -31,6 +30,8 @@ /* THIS FILE ONLY INCLUDED BY mtypes.h !!!!! */ +#include "macros.h" + struct gl_pixelstore_attrib; /* Mask bits sent to the driver Clear() function */ @@ -97,9 +98,18 @@ struct dd_function_table { * GL_NONE - disable buffer write in device driver. */ - void (*GetBufferSize)( GLcontext *ctx, GLuint *width, GLuint *height ); + void (*GetBufferSize)( GLframebuffer *buffer, + GLuint *width, GLuint *height ); + /* + * Returns the width and height of the named buffer/window. + * Mesa uses this to determine when the driver's window size has changed. + */ + + void (*ResizeBuffers)( GLframebuffer *buffer ); /* - * Returns the width and height of the current color buffer. + * Resize the driver's depth/stencil/accum/back buffers to match the + * size given in the GLframebuffer struct. This is typically called + * when Mesa detects that a window size has changed. */ void (*Finish)( GLcontext *ctx ); @@ -164,9 +174,6 @@ struct dd_function_table { /* This is called by glBitmap. Works the same as DrawPixels, above. */ - void (*ResizeBuffersMESA)( GLcontext *ctx ); - - /*** *** Texture image functions: ***/ @@ -470,6 +477,8 @@ 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 5b7a65ac8..dd1a6dcc8 100644 --- a/xc/extras/Mesa/src/debug.c +++ b/xc/extras/Mesa/src/debug.c @@ -1,4 +1,3 @@ -/* $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 4c843bdd1..6b45c0336 100644 --- a/xc/extras/Mesa/src/debug.h +++ b/xc/extras/Mesa/src/debug.h @@ -1,4 +1,3 @@ -/* $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 131ad19b9..cd3b39521 100644 --- a/xc/extras/Mesa/src/depth.c +++ b/xc/extras/Mesa/src/depth.c @@ -1,4 +1,3 @@ -/* $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 44ab427d0..e798df138 100644 --- a/xc/extras/Mesa/src/depth.h +++ b/xc/extras/Mesa/src/depth.h @@ -1,4 +1,3 @@ -/* $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 a2df4143b..d4eebdb53 100644 --- a/xc/extras/Mesa/src/dispatch.c +++ b/xc/extras/Mesa/src/dispatch.c @@ -1,4 +1,3 @@ -/* $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 712c37ade..b88890981 100644 --- a/xc/extras/Mesa/src/dlist.c +++ b/xc/extras/Mesa/src/dlist.c @@ -1,4 +1,3 @@ -/* $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 81cff1aeb..58bbd7e42 100644 --- a/xc/extras/Mesa/src/dlist.h +++ b/xc/extras/Mesa/src/dlist.h @@ -1,4 +1,3 @@ -/* $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 9a07b1f87..45b0dfabd 100644 --- a/xc/extras/Mesa/src/drawpix.c +++ b/xc/extras/Mesa/src/drawpix.c @@ -1,4 +1,3 @@ -/* $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 b482529b4..478767af4 100644 --- a/xc/extras/Mesa/src/drawpix.h +++ b/xc/extras/Mesa/src/drawpix.h @@ -1,4 +1,3 @@ -/* $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 81c420198..0162ac552 100644 --- a/xc/extras/Mesa/src/enable.c +++ b/xc/extras/Mesa/src/enable.c @@ -1,4 +1,3 @@ -/* $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 2b33e7308..bf71f1773 100644 --- a/xc/extras/Mesa/src/enable.h +++ b/xc/extras/Mesa/src/enable.h @@ -1,4 +1,3 @@ -/* $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 ac2f14fe4..6801e8f5c 100644 --- a/xc/extras/Mesa/src/enums.c +++ b/xc/extras/Mesa/src/enums.c @@ -1,4 +1,3 @@ -/* $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 02ab12039..ff5923329 100644 --- a/xc/extras/Mesa/src/enums.h +++ b/xc/extras/Mesa/src/enums.h @@ -1,4 +1,3 @@ -/* $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 35f500bb6..a3fb0e9b5 100644 --- a/xc/extras/Mesa/src/eval.c +++ b/xc/extras/Mesa/src/eval.c @@ -1,4 +1,3 @@ -/* $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 a3d8962f7..2e4f5227e 100644 --- a/xc/extras/Mesa/src/eval.h +++ b/xc/extras/Mesa/src/eval.h @@ -1,4 +1,3 @@ -/* $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 1f6a3f932..adae6b3ef 100644 --- a/xc/extras/Mesa/src/extensions.c +++ b/xc/extras/Mesa/src/extensions.c @@ -1,4 +1,3 @@ -/* $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 f0e3994b6..79293852e 100644 --- a/xc/extras/Mesa/src/extensions.h +++ b/xc/extras/Mesa/src/extensions.h @@ -1,4 +1,3 @@ -/* $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 c8ef8da7c..8d88b7a81 100644 --- a/xc/extras/Mesa/src/feedback.c +++ b/xc/extras/Mesa/src/feedback.c @@ -1,4 +1,3 @@ -/* $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 63cabbd41..e91546248 100644 --- a/xc/extras/Mesa/src/feedback.h +++ b/xc/extras/Mesa/src/feedback.h @@ -1,4 +1,3 @@ -/* $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 5c852600d..caa84298f 100644 --- a/xc/extras/Mesa/src/fog.c +++ b/xc/extras/Mesa/src/fog.c @@ -1,4 +1,3 @@ -/* $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 9711528d9..cd7f59cc6 100644 --- a/xc/extras/Mesa/src/fog.h +++ b/xc/extras/Mesa/src/fog.h @@ -1,4 +1,3 @@ -/* $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 64fcad3f7..e8b56bffc 100644 --- a/xc/extras/Mesa/src/get.c +++ b/xc/extras/Mesa/src/get.c @@ -1,4 +1,3 @@ -/* $Id: get.c,v 1.20 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/get.h b/xc/extras/Mesa/src/get.h index a1449b44e..eaddb746f 100644 --- a/xc/extras/Mesa/src/get.h +++ b/xc/extras/Mesa/src/get.h @@ -1,4 +1,3 @@ -/* $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 d13d27ed1..550a57aa9 100644 --- a/xc/extras/Mesa/src/glapi.c +++ b/xc/extras/Mesa/src/glapi.c @@ -1,4 +1,3 @@ -/* $Id: glapi.c,v 1.12 2002/02/21 11:42:59 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -2079,11 +2078,12 @@ _glapi_get_proc_name(GLuint offset) /* * Make sure there are no NULL pointers in the given dispatch table. - * Intented for debugging purposes. + * Intended for debugging purposes. */ 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,7 +2091,6 @@ _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 3bfa00a31..73782f8c4 100644 --- a/xc/extras/Mesa/src/glapi.h +++ b/xc/extras/Mesa/src/glapi.h @@ -1,4 +1,3 @@ -/* $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 847af41b9..6ed64f7a1 100644 --- a/xc/extras/Mesa/src/glapitemp.h +++ b/xc/extras/Mesa/src/glapitemp.h @@ -1,4 +1,3 @@ -/* $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 09063486d..0d6326efe 100644 --- a/xc/extras/Mesa/src/glheader.h +++ b/xc/extras/Mesa/src/glheader.h @@ -1,4 +1,3 @@ -/* $Id: glheader.h,v 1.19 2002/02/21 11:43:00 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -261,6 +260,7 @@ typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESC typedef union { GLfloat f; GLint i; } fi_type; + #ifndef GL_MIRRORED_REPEAT_ARB #define GL_MIRRORED_REPEAT_ARB 0x8370 #endif @@ -268,5 +268,4 @@ typedef union { GLfloat f; GLint i; } fi_type; #define GL_ARB_texture_mirrored_repeat 1 #endif - #endif /* GLHEADER_H */ diff --git a/xc/extras/Mesa/src/glthread.c b/xc/extras/Mesa/src/glthread.c index d0e8f2328..b48aed899 100644 --- a/xc/extras/Mesa/src/glthread.c +++ b/xc/extras/Mesa/src/glthread.c @@ -1,4 +1,3 @@ -/* $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 0088dc385..3b72a42f4 100644 --- a/xc/extras/Mesa/src/glthread.h +++ b/xc/extras/Mesa/src/glthread.h @@ -1,4 +1,3 @@ -/* $Id: glthread.h,v 1.7 2002/02/21 11:43:00 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -186,8 +185,13 @@ 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 e06648f3e..54f49d426 100644 --- a/xc/extras/Mesa/src/hash.c +++ b/xc/extras/Mesa/src/hash.c @@ -1,4 +1,3 @@ -/* $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 53d1893f8..a6ed16ccc 100644 --- a/xc/extras/Mesa/src/hash.h +++ b/xc/extras/Mesa/src/hash.h @@ -1,4 +1,3 @@ -/* $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 bf58961bd..d35a5ae61 100644 --- a/xc/extras/Mesa/src/highpc.c +++ b/xc/extras/Mesa/src/highpc.c @@ -1,4 +1,3 @@ -/* $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 196d8fbf4..9a946d6dc 100644 --- a/xc/extras/Mesa/src/hint.c +++ b/xc/extras/Mesa/src/hint.c @@ -1,4 +1,3 @@ -/* $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 3378f2ad1..8432337b2 100644 --- a/xc/extras/Mesa/src/hint.h +++ b/xc/extras/Mesa/src/hint.h @@ -1,4 +1,3 @@ -/* $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 826e48a2d..22f35e26a 100644 --- a/xc/extras/Mesa/src/histogram.c +++ b/xc/extras/Mesa/src/histogram.c @@ -1,4 +1,3 @@ -/* $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 7977c78fa..a63152aed 100644 --- a/xc/extras/Mesa/src/histogram.h +++ b/xc/extras/Mesa/src/histogram.h @@ -1,4 +1,3 @@ -/* $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 140cb1403..73d8a6788 100644 --- a/xc/extras/Mesa/src/image.c +++ b/xc/extras/Mesa/src/image.c @@ -1,4 +1,3 @@ -/* $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 7ea8aa195..de1546a27 100644 --- a/xc/extras/Mesa/src/image.h +++ b/xc/extras/Mesa/src/image.h @@ -1,4 +1,3 @@ -/* $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 ebf25f40c..895a4768b 100644 --- a/xc/extras/Mesa/src/imports.c +++ b/xc/extras/Mesa/src/imports.c @@ -1,4 +1,3 @@ -/* $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 160e83c25..758c99cce 100644 --- a/xc/extras/Mesa/src/imports.h +++ b/xc/extras/Mesa/src/imports.h @@ -1,4 +1,3 @@ -/* $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 a9671c1b8..c649ce2d8 100644 --- a/xc/extras/Mesa/src/light.c +++ b/xc/extras/Mesa/src/light.c @@ -1,4 +1,3 @@ -/* $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 0a27187eb..bee9b4f40 100644 --- a/xc/extras/Mesa/src/light.h +++ b/xc/extras/Mesa/src/light.h @@ -1,4 +1,3 @@ -/* $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 62ead379d..a596a9362 100644 --- a/xc/extras/Mesa/src/lines.c +++ b/xc/extras/Mesa/src/lines.c @@ -1,4 +1,3 @@ -/* $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 a086b3185..ac4b33f4d 100644 --- a/xc/extras/Mesa/src/lines.h +++ b/xc/extras/Mesa/src/lines.h @@ -1,4 +1,3 @@ -/* $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 4b3e9f5b4..848e703e0 100644 --- a/xc/extras/Mesa/src/lowpc.c +++ b/xc/extras/Mesa/src/lowpc.c @@ -1,4 +1,3 @@ -/* $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 d9c6c19b7..9b02a1bfe 100644 --- a/xc/extras/Mesa/src/macros.h +++ b/xc/extras/Mesa/src/macros.h @@ -1,4 +1,3 @@ -/* $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 724c56b0f..5d6840ca3 100644 --- a/xc/extras/Mesa/src/math/m_clip_tmp.h +++ b/xc/extras/Mesa/src/math/m_clip_tmp.h @@ -1,4 +1,3 @@ -/* $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 ad9c3326e..a9e33511e 100644 --- a/xc/extras/Mesa/src/math/m_copy_tmp.h +++ b/xc/extras/Mesa/src/math/m_copy_tmp.h @@ -1,4 +1,3 @@ -/* $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 b453e110a..7cb556e7f 100644 --- a/xc/extras/Mesa/src/math/m_debug.h +++ b/xc/extras/Mesa/src/math/m_debug.h @@ -1,4 +1,3 @@ -/* $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 4f529d7bf..cc719ee5d 100644 --- a/xc/extras/Mesa/src/math/m_debug_clip.c +++ b/xc/extras/Mesa/src/math/m_debug_clip.c @@ -1,4 +1,3 @@ -/* $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 7f6590e19..4d9d40bbc 100644 --- a/xc/extras/Mesa/src/math/m_debug_norm.c +++ b/xc/extras/Mesa/src/math/m_debug_norm.c @@ -1,4 +1,3 @@ -/* $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 6cb8c2a54..4b74b420f 100644 --- a/xc/extras/Mesa/src/math/m_debug_util.h +++ b/xc/extras/Mesa/src/math/m_debug_util.h @@ -1,4 +1,3 @@ -/* $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 44459a5c4..7cb87c190 100644 --- a/xc/extras/Mesa/src/math/m_debug_vertex.c +++ b/xc/extras/Mesa/src/math/m_debug_vertex.c @@ -1,4 +1,3 @@ -/* $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 7e29c4146..eb81e019d 100644 --- a/xc/extras/Mesa/src/math/m_debug_xform.c +++ b/xc/extras/Mesa/src/math/m_debug_xform.c @@ -1,4 +1,3 @@ -/* $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 4a2aaacb4..03e65af6c 100644 --- a/xc/extras/Mesa/src/math/m_dotprod_tmp.h +++ b/xc/extras/Mesa/src/math/m_dotprod_tmp.h @@ -1,4 +1,3 @@ -/* $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 3a3531128..42ffd4133 100644 --- a/xc/extras/Mesa/src/math/m_eval.c +++ b/xc/extras/Mesa/src/math/m_eval.c @@ -1,4 +1,3 @@ -/* $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 0a19bb2ec..a23cbd402 100644 --- a/xc/extras/Mesa/src/math/m_eval.h +++ b/xc/extras/Mesa/src/math/m_eval.h @@ -1,4 +1,3 @@ -/* $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 aa0ef8969..c0806571e 100644 --- a/xc/extras/Mesa/src/math/m_matrix.c +++ b/xc/extras/Mesa/src/math/m_matrix.c @@ -1,4 +1,3 @@ -/* $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 cb0b29d68..7c22082d5 100644 --- a/xc/extras/Mesa/src/math/m_matrix.h +++ b/xc/extras/Mesa/src/math/m_matrix.h @@ -1,4 +1,3 @@ -/* $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 3f8d8b3fa..d5f7da409 100644 --- a/xc/extras/Mesa/src/math/m_norm_tmp.h +++ b/xc/extras/Mesa/src/math/m_norm_tmp.h @@ -1,4 +1,3 @@ -/* $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 11924459e..25e03c986 100644 --- a/xc/extras/Mesa/src/math/m_trans_tmp.h +++ b/xc/extras/Mesa/src/math/m_trans_tmp.h @@ -1,4 +1,3 @@ -/* $Id: m_trans_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_translate.c b/xc/extras/Mesa/src/math/m_translate.c index 8e5e5aa72..a4305f26c 100644 --- a/xc/extras/Mesa/src/math/m_translate.c +++ b/xc/extras/Mesa/src/math/m_translate.c @@ -1,4 +1,3 @@ -/* $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 0da26b6fd..c473f83d6 100644 --- a/xc/extras/Mesa/src/math/m_translate.h +++ b/xc/extras/Mesa/src/math/m_translate.h @@ -1,4 +1,3 @@ -/* $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 b50b39130..4c5e0ac26 100644 --- a/xc/extras/Mesa/src/math/m_vector.c +++ b/xc/extras/Mesa/src/math/m_vector.c @@ -1,4 +1,3 @@ -/* $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 b04bfbd3e..4b1b643ea 100644 --- a/xc/extras/Mesa/src/math/m_vector.h +++ b/xc/extras/Mesa/src/math/m_vector.h @@ -1,4 +1,3 @@ -/* $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 915fd1369..e6f44d6de 100644 --- a/xc/extras/Mesa/src/math/m_vertices.c +++ b/xc/extras/Mesa/src/math/m_vertices.c @@ -1,4 +1,3 @@ -/* $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 0dd349bdf..4a8c2dad9 100644 --- a/xc/extras/Mesa/src/math/m_vertices.h +++ b/xc/extras/Mesa/src/math/m_vertices.h @@ -1,4 +1,3 @@ -/* $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 6010c8798..ccfd341b9 100644 --- a/xc/extras/Mesa/src/math/m_xform.c +++ b/xc/extras/Mesa/src/math/m_xform.c @@ -1,4 +1,3 @@ -/* $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 043a1eb43..fbd4836e2 100644 --- a/xc/extras/Mesa/src/math/m_xform.h +++ b/xc/extras/Mesa/src/math/m_xform.h @@ -1,4 +1,3 @@ -/* $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 7ed4c2efa..7cf4780bd 100644 --- a/xc/extras/Mesa/src/math/m_xform_tmp.h +++ b/xc/extras/Mesa/src/math/m_xform_tmp.h @@ -1,4 +1,3 @@ -/* $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 9ded6f4f9..35f6671f2 100644 --- a/xc/extras/Mesa/src/math/mathmod.h +++ b/xc/extras/Mesa/src/math/mathmod.h @@ -1,4 +1,3 @@ -/* $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 9849721a9..d0dc689e1 100644 --- a/xc/extras/Mesa/src/matrix.c +++ b/xc/extras/Mesa/src/matrix.c @@ -1,4 +1,3 @@ -/* $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 6a8c46da9..13dc31eac 100644 --- a/xc/extras/Mesa/src/matrix.h +++ b/xc/extras/Mesa/src/matrix.h @@ -1,4 +1,3 @@ -/* $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 bb2438e96..511b5b05a 100644 --- a/xc/extras/Mesa/src/mem.c +++ b/xc/extras/Mesa/src/mem.c @@ -1,4 +1,3 @@ -/* $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 ea41f220d..d4e46d402 100644 --- a/xc/extras/Mesa/src/mem.h +++ b/xc/extras/Mesa/src/mem.h @@ -1,4 +1,3 @@ -/* $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 fb5a1c048..585d0d793 100644 --- a/xc/extras/Mesa/src/mmath.c +++ b/xc/extras/Mesa/src/mmath.c @@ -1,4 +1,3 @@ -/* $Id: mmath.c,v 1.11 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/mmath.h b/xc/extras/Mesa/src/mmath.h index 65cbb55e9..4f7d63c95 100644 --- a/xc/extras/Mesa/src/mmath.h +++ b/xc/extras/Mesa/src/mmath.h @@ -1,4 +1,3 @@ -/* $Id: mmath.h,v 1.24 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/mtypes.h b/xc/extras/Mesa/src/mtypes.h index fad6b146e..bddaf49c4 100644 --- a/xc/extras/Mesa/src/mtypes.h +++ b/xc/extras/Mesa/src/mtypes.h @@ -1,4 +1,3 @@ -/* $Id: mtypes.h,v 1.3 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -1126,7 +1125,7 @@ struct gl_shared_state { struct gl_frame_buffer { GLvisual Visual; /* The corresponding visual */ - GLint Width, Height; /* size of frame buffer in pixels */ + GLuint Width, Height; /* size of frame buffer in pixels */ GLboolean UseSoftwareDepthBuffer; GLboolean UseSoftwareAccumBuffer; diff --git a/xc/extras/Mesa/src/pixel.c b/xc/extras/Mesa/src/pixel.c index 68cd9a265..d2b555351 100644 --- a/xc/extras/Mesa/src/pixel.c +++ b/xc/extras/Mesa/src/pixel.c @@ -1,4 +1,3 @@ -/* $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 34b424cc8..48138e083 100644 --- a/xc/extras/Mesa/src/pixel.h +++ b/xc/extras/Mesa/src/pixel.h @@ -1,4 +1,3 @@ -/* $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 183159464..1f731730c 100644 --- a/xc/extras/Mesa/src/points.c +++ b/xc/extras/Mesa/src/points.c @@ -1,4 +1,3 @@ -/* $Id: points.c,v 1.14 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/points.h b/xc/extras/Mesa/src/points.h index bbddc964a..36e1071c2 100644 --- a/xc/extras/Mesa/src/points.h +++ b/xc/extras/Mesa/src/points.h @@ -1,4 +1,3 @@ -/* $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 e1994c779..d1be6fa66 100644 --- a/xc/extras/Mesa/src/polygon.c +++ b/xc/extras/Mesa/src/polygon.c @@ -1,4 +1,3 @@ -/* $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 059c01efc..81b67ff54 100644 --- a/xc/extras/Mesa/src/polygon.h +++ b/xc/extras/Mesa/src/polygon.h @@ -1,4 +1,3 @@ -/* $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 5bb035a0d..7813506e2 100644 --- a/xc/extras/Mesa/src/rastpos.c +++ b/xc/extras/Mesa/src/rastpos.c @@ -1,4 +1,3 @@ -/* $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 554a609b7..e3fc1ee20 100644 --- a/xc/extras/Mesa/src/rastpos.h +++ b/xc/extras/Mesa/src/rastpos.h @@ -1,4 +1,3 @@ -/* $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 98c2105f6..2d9d4c845 100644 --- a/xc/extras/Mesa/src/simple_list.h +++ b/xc/extras/Mesa/src/simple_list.h @@ -1,4 +1,3 @@ -/* $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 37e344ae2..d60e158f5 100644 --- a/xc/extras/Mesa/src/state.c +++ b/xc/extras/Mesa/src/state.c @@ -1,4 +1,3 @@ -/* $Id: state.c,v 1.15 2002/02/21 11:43:01 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -955,7 +954,7 @@ void _mesa_update_state( GLcontext *ctx ) ASSERT(ctx->Driver.ReadPixels); ASSERT(ctx->Driver.CopyPixels); ASSERT(ctx->Driver.Bitmap); - ASSERT(ctx->Driver.ResizeBuffersMESA); + ASSERT(ctx->Driver.ResizeBuffers); ASSERT(ctx->Driver.TexImage1D); ASSERT(ctx->Driver.TexImage2D); ASSERT(ctx->Driver.TexImage3D); diff --git a/xc/extras/Mesa/src/state.h b/xc/extras/Mesa/src/state.h index fa0d4d9ae..8d3ccc16d 100644 --- a/xc/extras/Mesa/src/state.h +++ b/xc/extras/Mesa/src/state.h @@ -1,4 +1,3 @@ -/* $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 78a0770d7..f633220d2 100644 --- a/xc/extras/Mesa/src/stencil.c +++ b/xc/extras/Mesa/src/stencil.c @@ -1,4 +1,3 @@ -/* $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 b6c6e3a47..7c96e8b9e 100644 --- a/xc/extras/Mesa/src/stencil.h +++ b/xc/extras/Mesa/src/stencil.h @@ -1,4 +1,3 @@ -/* $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 0617d68e4..f61934ab3 100644 --- a/xc/extras/Mesa/src/swrast/s_aaline.c +++ b/xc/extras/Mesa/src/swrast/s_aaline.c @@ -1,4 +1,3 @@ -/* $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 83936fd9c..41e7e5fd4 100644 --- a/xc/extras/Mesa/src/swrast/s_aaline.h +++ b/xc/extras/Mesa/src/swrast/s_aaline.h @@ -1,4 +1,3 @@ -/* $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 0e0a9e3b6..19a77915a 100644 --- a/xc/extras/Mesa/src/swrast/s_aalinetemp.h +++ b/xc/extras/Mesa/src/swrast/s_aalinetemp.h @@ -1,4 +1,3 @@ -/* $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 d87ec11db..a22c773b8 100644 --- a/xc/extras/Mesa/src/swrast/s_aatriangle.c +++ b/xc/extras/Mesa/src/swrast/s_aatriangle.c @@ -1,4 +1,3 @@ -/* $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 fca5a363c..747fee429 100644 --- a/xc/extras/Mesa/src/swrast/s_aatriangle.h +++ b/xc/extras/Mesa/src/swrast/s_aatriangle.h @@ -1,4 +1,3 @@ -/* $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 b659b97ee..adacb48b8 100644 --- a/xc/extras/Mesa/src/swrast/s_aatritemp.h +++ b/xc/extras/Mesa/src/swrast/s_aatritemp.h @@ -1,4 +1,3 @@ -/* $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 9121e9db6..558c52d9a 100644 --- a/xc/extras/Mesa/src/swrast/s_accum.c +++ b/xc/extras/Mesa/src/swrast/s_accum.c @@ -1,10 +1,9 @@ -/* $Id: s_accum.c,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"), @@ -66,39 +65,38 @@ #define USE_OPTIMIZED_ACCUM /* enable the optimization */ #endif - - void -_mesa_alloc_accum_buffer( GLcontext *ctx ) +_mesa_alloc_accum_buffer( GLframebuffer *buffer ) { - SWcontext *swrast = SWRAST_CONTEXT(ctx); + GET_CURRENT_CONTEXT(ctx); GLint n; - if (ctx->DrawBuffer->Accum) { - FREE( ctx->DrawBuffer->Accum ); - ctx->DrawBuffer->Accum = NULL; + if (buffer->Accum) { + FREE( buffer->Accum ); + buffer->Accum = NULL; } /* allocate accumulation buffer if not already present */ - n = ctx->DrawBuffer->Width * ctx->DrawBuffer->Height * 4 * sizeof(GLaccum); - ctx->DrawBuffer->Accum = (GLaccum *) MALLOC( n ); - if (!ctx->DrawBuffer->Accum) { + n = buffer->Width * buffer->Height * 4 * sizeof(GLaccum); + buffer->Accum = (GLaccum *) MALLOC( n ); + if (!buffer->Accum) { /* unable to setup accumulation buffer */ - _mesa_error( ctx, GL_OUT_OF_MEMORY, "glAccum" ); + _mesa_error( NULL, GL_OUT_OF_MEMORY, "glAccum" ); } + + if (ctx) { + SWcontext *swrast = SWRAST_CONTEXT(ctx); + /* XXX these fields should probably be in the GLframebuffer */ #ifdef USE_OPTIMIZED_ACCUM - swrast->_IntegerAccumMode = GL_TRUE; + swrast->_IntegerAccumMode = GL_TRUE; #else - swrast->_IntegerAccumMode = GL_FALSE; + swrast->_IntegerAccumMode = GL_FALSE; #endif - swrast->_IntegerAccumScaler = 0.0; + swrast->_IntegerAccumScaler = 0.0; + } } - - - - /* * This is called when we fall out of optimized/unscaled accum buffer mode. * That is, we convert each unscaled accum buffer value into a scaled value diff --git a/xc/extras/Mesa/src/swrast/s_accum.h b/xc/extras/Mesa/src/swrast/s_accum.h index 2a62b35d1..faa3ccd41 100644 --- a/xc/extras/Mesa/src/swrast/s_accum.h +++ b/xc/extras/Mesa/src/swrast/s_accum.h @@ -1,10 +1,9 @@ -/* $Id: s_accum.h,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"), @@ -34,12 +33,11 @@ extern void -_mesa_alloc_accum_buffer( GLcontext *ctx ); +_mesa_alloc_accum_buffer( GLframebuffer *buffer ); extern void _mesa_clear_accum_buffer( GLcontext *ctx ); - #endif diff --git a/xc/extras/Mesa/src/swrast/s_alpha.c b/xc/extras/Mesa/src/swrast/s_alpha.c index d9e75afd9..5be735630 100644 --- a/xc/extras/Mesa/src/swrast/s_alpha.c +++ b/xc/extras/Mesa/src/swrast/s_alpha.c @@ -1,4 +1,3 @@ -/* $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 63cc69698..b0480c78a 100644 --- a/xc/extras/Mesa/src/swrast/s_alpha.h +++ b/xc/extras/Mesa/src/swrast/s_alpha.h @@ -1,4 +1,3 @@ -/* $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 af4183757..ae90793e3 100644 --- a/xc/extras/Mesa/src/swrast/s_alphabuf.c +++ b/xc/extras/Mesa/src/swrast/s_alphabuf.c @@ -1,10 +1,9 @@ -/* $Id: s_alphabuf.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"), @@ -38,8 +37,6 @@ #include "s_alphabuf.h" - - #define ALPHA_DRAW_ADDR(X,Y) \ (ctx->DrawBuffer->Alpha + (Y) * ctx->DrawBuffer->Width + (X)) @@ -47,85 +44,72 @@ (ctx->ReadBuffer->Alpha + (Y) * ctx->ReadBuffer->Width + (X)) - /* - * Allocate new front/back/left/right alpha buffers. - * Input: ctx - the context - * + * Allocate a new front and back alpha buffer. */ -static void -alloc_alpha_buffers( GLcontext *ctx, GLframebuffer *buf ) +void +_mesa_alloc_alpha_buffers( GLframebuffer *buffer ) { - GLint bytes = buf->Width * buf->Height * sizeof(GLchan); + GET_CURRENT_CONTEXT(ctx); + const GLint bytes = buffer->Width * buffer->Height * sizeof(GLchan); - ASSERT(ctx->DrawBuffer->UseSoftwareAlphaBuffers); + ASSERT(buffer->UseSoftwareAlphaBuffers); - if (buf->FrontLeftAlpha) { - FREE( buf->FrontLeftAlpha ); + if (buffer->FrontLeftAlpha) { + FREE( buffer->FrontLeftAlpha ); } - buf->FrontLeftAlpha = (GLchan *) MALLOC( bytes ); - if (!buf->FrontLeftAlpha) { + buffer->FrontLeftAlpha = (GLchan *) MALLOC( bytes ); + if (!buffer->FrontLeftAlpha) { /* out of memory */ - _mesa_error( ctx, GL_OUT_OF_MEMORY, - "Couldn't allocate front-left alpha buffer" ); + _mesa_error( NULL, GL_OUT_OF_MEMORY, + "Couldn't allocate front-left alpha buffer" ); } - if (ctx->Visual.doubleBufferMode) { - if (buf->BackLeftAlpha) { - FREE( buf->BackLeftAlpha ); + if (buffer->Visual.doubleBufferMode) { + if (buffer->BackLeftAlpha) { + FREE( buffer->BackLeftAlpha ); } - buf->BackLeftAlpha = (GLchan *) MALLOC( bytes ); - if (!buf->BackLeftAlpha) { + buffer->BackLeftAlpha = (GLchan *) MALLOC( bytes ); + if (!buffer->BackLeftAlpha) { /* out of memory */ - _mesa_error( ctx, GL_OUT_OF_MEMORY, + _mesa_error( NULL, GL_OUT_OF_MEMORY, "Couldn't allocate back-left alpha buffer" ); } } - if (ctx->Visual.stereoMode) { - if (buf->FrontRightAlpha) { - FREE( buf->FrontRightAlpha ); + if (buffer->Visual.stereoMode) { + if (buffer->FrontRightAlpha) { + FREE( buffer->FrontRightAlpha ); } - buf->FrontRightAlpha = (GLchan *) MALLOC( bytes ); - if (!buf->FrontRightAlpha) { + buffer->FrontRightAlpha = (GLchan *) MALLOC( bytes ); + if (!buffer->FrontRightAlpha) { /* out of memory */ - _mesa_error( ctx, GL_OUT_OF_MEMORY, - "Couldn't allocate front-right alpha buffer" ); + _mesa_error( NULL, GL_OUT_OF_MEMORY, + "Couldn't allocate front-right alpha buffer" ); } - if (ctx->Visual.doubleBufferMode) { - if (buf->BackRightAlpha) { - FREE( buf->BackRightAlpha ); + if (buffer->Visual.doubleBufferMode) { + if (buffer->BackRightAlpha) { + FREE( buffer->BackRightAlpha ); } - buf->BackRightAlpha = (GLchan *) MALLOC( bytes ); - if (!buf->BackRightAlpha) { + buffer->BackRightAlpha = (GLchan *) MALLOC( bytes ); + if (!buffer->BackRightAlpha) { /* out of memory */ - _mesa_error( ctx, GL_OUT_OF_MEMORY, - "Couldn't allocate back-right alpha buffer" ); + _mesa_error( NULL, GL_OUT_OF_MEMORY, + "Couldn't allocate back-right alpha buffer" ); } } } - if (ctx->Color.DriverDrawBuffer == GL_FRONT_LEFT) - buf->Alpha = buf->FrontLeftAlpha; - else if (ctx->Color.DriverDrawBuffer == GL_BACK_LEFT) - buf->Alpha = buf->BackLeftAlpha; - else if (ctx->Color.DriverDrawBuffer == GL_FRONT_RIGHT) - buf->Alpha = buf->FrontRightAlpha; - else if (ctx->Color.DriverDrawBuffer == GL_BACK_RIGHT) - buf->Alpha = buf->BackRightAlpha; -} - - -/* - * Allocate a new front and back alpha buffer. - */ -void -_mesa_alloc_alpha_buffers( GLcontext *ctx ) -{ - alloc_alpha_buffers( ctx, ctx->DrawBuffer ); - if (ctx->ReadBuffer != ctx->DrawBuffer) { - alloc_alpha_buffers( ctx, ctx->ReadBuffer ); + if (ctx) { + if (ctx->Color.DriverDrawBuffer == GL_FRONT_LEFT) + buffer->Alpha = buffer->FrontLeftAlpha; + else if (ctx->Color.DriverDrawBuffer == GL_BACK_LEFT) + buffer->Alpha = buffer->BackLeftAlpha; + else if (ctx->Color.DriverDrawBuffer == GL_FRONT_RIGHT) + buffer->Alpha = buffer->FrontRightAlpha; + else if (ctx->Color.DriverDrawBuffer == GL_BACK_RIGHT) + buffer->Alpha = buffer->BackRightAlpha; } } diff --git a/xc/extras/Mesa/src/swrast/s_alphabuf.h b/xc/extras/Mesa/src/swrast/s_alphabuf.h index 029eff87e..531188f55 100644 --- a/xc/extras/Mesa/src/swrast/s_alphabuf.h +++ b/xc/extras/Mesa/src/swrast/s_alphabuf.h @@ -1,10 +1,9 @@ -/* $Id: s_alphabuf.h,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"), @@ -34,7 +33,7 @@ extern void -_mesa_alloc_alpha_buffers( GLcontext *ctx ); +_mesa_alloc_alpha_buffers( GLframebuffer *buffer ); extern void diff --git a/xc/extras/Mesa/src/swrast/s_bitmap.c b/xc/extras/Mesa/src/swrast/s_bitmap.c index 540d092bf..37ad80c92 100644 --- a/xc/extras/Mesa/src/swrast/s_bitmap.c +++ b/xc/extras/Mesa/src/swrast/s_bitmap.c @@ -1,4 +1,3 @@ -/* $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 4fa8e46d7..da3f6f351 100644 --- a/xc/extras/Mesa/src/swrast/s_blend.c +++ b/xc/extras/Mesa/src/swrast/s_blend.c @@ -1,4 +1,3 @@ -/* $Id: s_blend.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.h b/xc/extras/Mesa/src/swrast/s_blend.h index eed71fbc2..569bc2591 100644 --- a/xc/extras/Mesa/src/swrast/s_blend.h +++ b/xc/extras/Mesa/src/swrast/s_blend.h @@ -1,4 +1,3 @@ -/* $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 2e889f1ba..db27fdfdc 100644 --- a/xc/extras/Mesa/src/swrast/s_buffers.c +++ b/xc/extras/Mesa/src/swrast/s_buffers.c @@ -1,4 +1,3 @@ -/* $Id: s_buffers.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -242,19 +241,19 @@ _swrast_Clear( GLcontext *ctx, GLbitfield mask, void -_swrast_alloc_buffers( GLcontext *ctx ) +_swrast_alloc_buffers( GLframebuffer *buffer ) { /* Reallocate other buffers if needed. */ - if (ctx->DrawBuffer->UseSoftwareDepthBuffer) { - _mesa_alloc_depth_buffer( ctx ); + if (buffer->UseSoftwareDepthBuffer) { + _mesa_alloc_depth_buffer( buffer ); } - if (ctx->DrawBuffer->UseSoftwareStencilBuffer) { - _mesa_alloc_stencil_buffer( ctx ); + if (buffer->UseSoftwareStencilBuffer) { + _mesa_alloc_stencil_buffer( buffer ); } - if (ctx->DrawBuffer->UseSoftwareAccumBuffer) { - _mesa_alloc_accum_buffer( ctx ); + if (buffer->UseSoftwareAccumBuffer) { + _mesa_alloc_accum_buffer( buffer ); } - if (ctx->DrawBuffer->UseSoftwareAlphaBuffers) { - _mesa_alloc_alpha_buffers( ctx ); + if (buffer->UseSoftwareAlphaBuffers) { + _mesa_alloc_alpha_buffers( buffer ); } } diff --git a/xc/extras/Mesa/src/swrast/s_context.c b/xc/extras/Mesa/src/swrast/s_context.c index 58f96363e..6e0130c9c 100644 --- a/xc/extras/Mesa/src/swrast/s_context.c +++ b/xc/extras/Mesa/src/swrast/s_context.c @@ -1,4 +1,3 @@ -/* $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 8d0008078..e256a2275 100644 --- a/xc/extras/Mesa/src/swrast/s_context.h +++ b/xc/extras/Mesa/src/swrast/s_context.h @@ -1,4 +1,3 @@ -/* $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 630601c9e..e6e88ded8 100644 --- a/xc/extras/Mesa/src/swrast/s_copypix.c +++ b/xc/extras/Mesa/src/swrast/s_copypix.c @@ -1,10 +1,9 @@ -/* $Id: s_copypix.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"), @@ -404,7 +403,7 @@ copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy, for (j = 0; j < height; j++, ssy += stepy) { _mesa_read_rgba_span( ctx, ctx->ReadBuffer, width, srcx, ssy, (GLchan (*)[4]) p ); - p += (width * sizeof(GLchan) * 4); + p += width * 4; } p = tmpImage; } @@ -418,7 +417,7 @@ copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy, if (overlapping) { /* get from buffered image */ MEMCPY(rgba, p, width * sizeof(GLchan) * 4); - p += (width * sizeof(GLchan) * 4); + p += width * 4; } else { /* get from framebuffer */ diff --git a/xc/extras/Mesa/src/swrast/s_depth.c b/xc/extras/Mesa/src/swrast/s_depth.c index a8694730c..cb7f99840 100644 --- a/xc/extras/Mesa/src/swrast/s_depth.c +++ b/xc/extras/Mesa/src/swrast/s_depth.c @@ -1,4 +1,3 @@ -/* $Id: s_depth.c,v 1.3 2002/02/21 11:43:09 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -1484,35 +1483,35 @@ _mesa_read_depth_span_float( GLcontext *ctx, /* * Allocate a new depth buffer. If there's already a depth buffer allocated * it will be free()'d. The new depth buffer will be uniniitalized. - * This function is only called through Driver.alloc_depth_buffer. */ void -_mesa_alloc_depth_buffer( GLcontext *ctx ) +_mesa_alloc_depth_buffer( GLframebuffer *buffer ) { - /* deallocate current depth buffer if present */ - if (ctx->DrawBuffer->UseSoftwareDepthBuffer) { - GLint bytesPerValue; + GLint bytesPerValue; - if (ctx->DrawBuffer->DepthBuffer) { - FREE(ctx->DrawBuffer->DepthBuffer); - ctx->DrawBuffer->DepthBuffer = NULL; - } + ASSERT(buffer->UseSoftwareDepthBuffer); - /* allocate new depth buffer, but don't initialize it */ - if (ctx->Visual.depthBits <= 16) - bytesPerValue = sizeof(GLushort); - else - bytesPerValue = sizeof(GLuint); + /* deallocate current depth buffer if present */ + if (buffer->DepthBuffer) { + FREE(buffer->DepthBuffer); + buffer->DepthBuffer = NULL; + } + + /* allocate new depth buffer, but don't initialize it */ + if (buffer->Visual.depthBits <= 16) + bytesPerValue = sizeof(GLushort); + else + bytesPerValue = sizeof(GLuint); - ctx->DrawBuffer->DepthBuffer = MALLOC( ctx->DrawBuffer->Width - * ctx->DrawBuffer->Height - * bytesPerValue ); + buffer->DepthBuffer =MALLOC(buffer->Width * buffer->Height * bytesPerValue); - if (!ctx->DrawBuffer->DepthBuffer) { - /* out of memory */ + if (!buffer->DepthBuffer) { + /* out of memory */ + GET_CURRENT_CONTEXT(ctx); + if (ctx) { ctx->Depth.Test = GL_FALSE; ctx->NewState |= _NEW_DEPTH; - _mesa_error( ctx, GL_OUT_OF_MEMORY, "Couldn't allocate depth buffer" ); + _mesa_error(ctx, GL_OUT_OF_MEMORY, "Couldn't allocate depth buffer"); } } } diff --git a/xc/extras/Mesa/src/swrast/s_depth.h b/xc/extras/Mesa/src/swrast/s_depth.h index f46496480..3b4c9128c 100644 --- a/xc/extras/Mesa/src/swrast/s_depth.h +++ b/xc/extras/Mesa/src/swrast/s_depth.h @@ -1,10 +1,9 @@ -/* $Id: s_depth.h,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"), @@ -58,12 +57,11 @@ _mesa_read_depth_span_float( GLcontext *ctx, GLint n, GLint x, GLint y, extern void -_mesa_alloc_depth_buffer( GLcontext* ctx ); +_mesa_alloc_depth_buffer( GLframebuffer *buffer ); extern void -_mesa_clear_depth_buffer( GLcontext* ctx ); - +_mesa_clear_depth_buffer( GLcontext *ctx ); #endif diff --git a/xc/extras/Mesa/src/swrast/s_drawpix.c b/xc/extras/Mesa/src/swrast/s_drawpix.c index 52978aabc..ca3d1dee3 100644 --- a/xc/extras/Mesa/src/swrast/s_drawpix.c +++ b/xc/extras/Mesa/src/swrast/s_drawpix.c @@ -1,4 +1,3 @@ -/* $Id: s_drawpix.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_drawpix.h b/xc/extras/Mesa/src/swrast/s_drawpix.h index 2fd60706d..265d3c60a 100644 --- a/xc/extras/Mesa/src/swrast/s_drawpix.h +++ b/xc/extras/Mesa/src/swrast/s_drawpix.h @@ -1,4 +1,3 @@ -/* $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 daa54a333..0927cd9a9 100644 --- a/xc/extras/Mesa/src/swrast/s_feedback.c +++ b/xc/extras/Mesa/src/swrast/s_feedback.c @@ -1,4 +1,3 @@ -/* $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 e29379c3a..3a3b0557a 100644 --- a/xc/extras/Mesa/src/swrast/s_feedback.h +++ b/xc/extras/Mesa/src/swrast/s_feedback.h @@ -1,4 +1,3 @@ -/* $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 17ebc9f5a..675770586 100644 --- a/xc/extras/Mesa/src/swrast/s_fog.c +++ b/xc/extras/Mesa/src/swrast/s_fog.c @@ -1,4 +1,3 @@ -/* $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 cd1404689..1f5fffa56 100644 --- a/xc/extras/Mesa/src/swrast/s_fog.h +++ b/xc/extras/Mesa/src/swrast/s_fog.h @@ -1,4 +1,3 @@ -/* $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 b2f0a8adc..761bd11e8 100644 --- a/xc/extras/Mesa/src/swrast/s_histogram.c +++ b/xc/extras/Mesa/src/swrast/s_histogram.c @@ -1,4 +1,3 @@ -/* $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 7f33e760e..5f7115c1f 100644 --- a/xc/extras/Mesa/src/swrast/s_histogram.h +++ b/xc/extras/Mesa/src/swrast/s_histogram.h @@ -1,4 +1,3 @@ -/* $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 c38364e18..174b99e05 100644 --- a/xc/extras/Mesa/src/swrast/s_imaging.c +++ b/xc/extras/Mesa/src/swrast/s_imaging.c @@ -1,4 +1,3 @@ -/* $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 a64cfa58b..f68266bec 100644 --- a/xc/extras/Mesa/src/swrast/s_lines.c +++ b/xc/extras/Mesa/src/swrast/s_lines.c @@ -1,4 +1,3 @@ -/* $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 89b9e3751..5372b99b9 100644 --- a/xc/extras/Mesa/src/swrast/s_lines.h +++ b/xc/extras/Mesa/src/swrast/s_lines.h @@ -1,4 +1,3 @@ -/* $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 e019c2421..e2abdf2c9 100644 --- a/xc/extras/Mesa/src/swrast/s_linetemp.h +++ b/xc/extras/Mesa/src/swrast/s_linetemp.h @@ -1,4 +1,3 @@ -/* $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 55f1b0964..b6c9aacf4 100644 --- a/xc/extras/Mesa/src/swrast/s_logic.c +++ b/xc/extras/Mesa/src/swrast/s_logic.c @@ -1,4 +1,3 @@ -/* $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 c95583090..8cb0268a2 100644 --- a/xc/extras/Mesa/src/swrast/s_logic.h +++ b/xc/extras/Mesa/src/swrast/s_logic.h @@ -1,4 +1,3 @@ -/* $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 12a02ed05..c9f4c1bf2 100644 --- a/xc/extras/Mesa/src/swrast/s_masking.c +++ b/xc/extras/Mesa/src/swrast/s_masking.c @@ -1,4 +1,3 @@ -/* $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 fc78f8d0f..5c2bd847a 100644 --- a/xc/extras/Mesa/src/swrast/s_masking.h +++ b/xc/extras/Mesa/src/swrast/s_masking.h @@ -1,4 +1,3 @@ -/* $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 109a6c0c0..e6abb9b66 100644 --- a/xc/extras/Mesa/src/swrast/s_pb.c +++ b/xc/extras/Mesa/src/swrast/s_pb.c @@ -1,4 +1,3 @@ -/* $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 d7c2cca80..70e58cc2b 100644 --- a/xc/extras/Mesa/src/swrast/s_pb.h +++ b/xc/extras/Mesa/src/swrast/s_pb.h @@ -1,4 +1,3 @@ -/* $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 3feaf3c4a..7990f4ea4 100644 --- a/xc/extras/Mesa/src/swrast/s_pixeltex.c +++ b/xc/extras/Mesa/src/swrast/s_pixeltex.c @@ -1,4 +1,3 @@ -/* $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 8963019d7..a28e58011 100644 --- a/xc/extras/Mesa/src/swrast/s_pixeltex.h +++ b/xc/extras/Mesa/src/swrast/s_pixeltex.h @@ -1,4 +1,3 @@ -/* $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 cf8bfd778..81583879a 100644 --- a/xc/extras/Mesa/src/swrast/s_points.c +++ b/xc/extras/Mesa/src/swrast/s_points.c @@ -1,4 +1,3 @@ -/* $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 2d2b2c120..e22c51a1c 100644 --- a/xc/extras/Mesa/src/swrast/s_points.h +++ b/xc/extras/Mesa/src/swrast/s_points.h @@ -1,4 +1,3 @@ -/* $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 8971c2738..83d953136 100644 --- a/xc/extras/Mesa/src/swrast/s_pointtemp.h +++ b/xc/extras/Mesa/src/swrast/s_pointtemp.h @@ -1,4 +1,3 @@ -/* $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 b491a0964..1e1693a66 100644 --- a/xc/extras/Mesa/src/swrast/s_readpix.c +++ b/xc/extras/Mesa/src/swrast/s_readpix.c @@ -1,4 +1,3 @@ -/* $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 5c595b710..619004214 100644 --- a/xc/extras/Mesa/src/swrast/s_scissor.c +++ b/xc/extras/Mesa/src/swrast/s_scissor.c @@ -1,4 +1,3 @@ -/* $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 30f9153fe..6d81f839f 100644 --- a/xc/extras/Mesa/src/swrast/s_scissor.h +++ b/xc/extras/Mesa/src/swrast/s_scissor.h @@ -1,4 +1,3 @@ -/* $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 dd2578dd7..ba24b86c7 100644 --- a/xc/extras/Mesa/src/swrast/s_span.c +++ b/xc/extras/Mesa/src/swrast/s_span.c @@ -1,4 +1,3 @@ -/* $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 859f5f27e..e724c5a02 100644 --- a/xc/extras/Mesa/src/swrast/s_span.h +++ b/xc/extras/Mesa/src/swrast/s_span.h @@ -1,4 +1,3 @@ -/* $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 7415dc346..173520a0d 100644 --- a/xc/extras/Mesa/src/swrast/s_stencil.c +++ b/xc/extras/Mesa/src/swrast/s_stencil.c @@ -1,10 +1,9 @@ -/* $Id: s_stencil.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"), @@ -1109,22 +1108,20 @@ _mesa_write_stencil_span( GLcontext *ctx, GLint n, GLint x, GLint y, * deallocated first. The new stencil buffer will be uninitialized. */ void -_mesa_alloc_stencil_buffer( GLcontext *ctx ) +_mesa_alloc_stencil_buffer( GLframebuffer *buffer ) { - GLuint buffersize = ctx->DrawBuffer->Width * ctx->DrawBuffer->Height; - /* deallocate current stencil buffer if present */ - if (ctx->DrawBuffer->Stencil) { - FREE(ctx->DrawBuffer->Stencil); - ctx->DrawBuffer->Stencil = NULL; + if (buffer->Stencil) { + FREE(buffer->Stencil); + buffer->Stencil = NULL; } /* allocate new stencil buffer */ - ctx->DrawBuffer->Stencil = (GLstencil *) MALLOC(buffersize * sizeof(GLstencil)); - if (!ctx->DrawBuffer->Stencil) { + buffer->Stencil = (GLstencil *) MALLOC(buffer->Width * buffer->Height + * sizeof(GLstencil)); + if (!buffer->Stencil) { /* out of memory */ -/* _mesa_set_enable( ctx, GL_STENCIL_TEST, GL_FALSE ); */ - _mesa_error( ctx, GL_OUT_OF_MEMORY, "_mesa_alloc_stencil_buffer" ); + _mesa_error( NULL, GL_OUT_OF_MEMORY, "_mesa_alloc_stencil_buffer" ); } } diff --git a/xc/extras/Mesa/src/swrast/s_stencil.h b/xc/extras/Mesa/src/swrast/s_stencil.h index b628f8fc8..97dc5b25b 100644 --- a/xc/extras/Mesa/src/swrast/s_stencil.h +++ b/xc/extras/Mesa/src/swrast/s_stencil.h @@ -1,10 +1,9 @@ -/* $Id: s_stencil.h,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"), @@ -54,7 +53,7 @@ _mesa_write_stencil_span( GLcontext *ctx, GLint n, GLint x, GLint y, extern void -_mesa_alloc_stencil_buffer( GLcontext *ctx ); +_mesa_alloc_stencil_buffer( GLframebuffer *buffer ); extern void diff --git a/xc/extras/Mesa/src/swrast/s_texstore.c b/xc/extras/Mesa/src/swrast/s_texstore.c index 5c4e52b2f..12dd5c005 100644 --- a/xc/extras/Mesa/src/swrast/s_texstore.c +++ b/xc/extras/Mesa/src/swrast/s_texstore.c @@ -1,4 +1,3 @@ -/* $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 41e78e4d3..73520cdd8 100644 --- a/xc/extras/Mesa/src/swrast/s_texture.c +++ b/xc/extras/Mesa/src/swrast/s_texture.c @@ -1,10 +1,9 @@ -/* $Id: s_texture.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"), @@ -2966,24 +2965,25 @@ _swrast_texture_fragments( GLcontext *ctx, GLuint texUnit, GLuint n, if (textureUnit->_Current) { /* XXX need this? */ GLchan texel[PB_SIZE][4]; - if (textureUnit->LodBias != 0.0F) { - /* apply LOD bias, but don't clamp yet */ - GLuint i; - for (i=0;i<n;i++) { - lambda[i] += textureUnit->LodBias; - } - } + if (lambda) { + if (textureUnit->LodBias != 0.0F) { + /* apply LOD bias, but don't clamp yet */ + GLuint i; + for (i=0;i<n;i++) { + lambda[i] += textureUnit->LodBias; + } + } - if ((textureUnit->_Current->MinLod != -1000.0 - || textureUnit->_Current->MaxLod != 1000.0) - && lambda) { - /* apply LOD clamping to lambda */ - const GLfloat min = textureUnit->_Current->MinLod; - const GLfloat max = textureUnit->_Current->MaxLod; - GLuint i; - for (i=0;i<n;i++) { - GLfloat l = lambda[i]; - lambda[i] = CLAMP(l, min, max); + if (textureUnit->_Current->MinLod != -1000.0 || + textureUnit->_Current->MaxLod != 1000.0) { + /* apply LOD clamping to lambda */ + const GLfloat min = textureUnit->_Current->MinLod; + const GLfloat max = textureUnit->_Current->MaxLod; + GLuint i; + for (i=0;i<n;i++) { + GLfloat l = lambda[i]; + lambda[i] = CLAMP(l, min, max); + } } } diff --git a/xc/extras/Mesa/src/swrast/s_texture.h b/xc/extras/Mesa/src/swrast/s_texture.h index e285a038c..3bd1b7eed 100644 --- a/xc/extras/Mesa/src/swrast/s_texture.h +++ b/xc/extras/Mesa/src/swrast/s_texture.h @@ -1,4 +1,3 @@ -/* $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 24eacba11..bc17a4b57 100644 --- a/xc/extras/Mesa/src/swrast/s_triangle.c +++ b/xc/extras/Mesa/src/swrast/s_triangle.c @@ -1,4 +1,3 @@ -/* $Id: s_triangle.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_triangle.h b/xc/extras/Mesa/src/swrast/s_triangle.h index 24bb57a69..4d5777480 100644 --- a/xc/extras/Mesa/src/swrast/s_triangle.h +++ b/xc/extras/Mesa/src/swrast/s_triangle.h @@ -1,4 +1,3 @@ -/* $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 0a370cf04..dabb20e13 100644 --- a/xc/extras/Mesa/src/swrast/s_trispan.h +++ b/xc/extras/Mesa/src/swrast/s_trispan.h @@ -1,4 +1,3 @@ -/* $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 bdac05b61..95e40dc61 100644 --- a/xc/extras/Mesa/src/swrast/s_tritemp.h +++ b/xc/extras/Mesa/src/swrast/s_tritemp.h @@ -1,4 +1,3 @@ -/* $Id: s_tritemp.h,v 1.3 2002/02/21 11:43:10 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -23,7 +22,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/swrast/s_tritemp.h,v 1.2 2002/02/27 21:07:54 tsi Exp $ */ /* * Triangle Rasterizer Template @@ -731,34 +730,35 @@ { int subTriangle; GLfixed fx; - GLfixed fxLeftEdge, fxRightEdge, fdxLeftEdge, fdxRightEdge; + GLfixed fxLeftEdge = 0, fxRightEdge = 0; + GLfixed fdxLeftEdge = 0, fdxRightEdge = 0; GLfixed fdxOuter; int idxOuter; float dxOuter; - GLfixed fError, fdError; + GLfixed fError = 0, fdError = 0; float adjx, adjy; GLfixed fy; #ifdef PIXEL_ADDRESS - PIXEL_TYPE *pRow; - int dPRowOuter, dPRowInner; /* offset in bytes */ + PIXEL_TYPE *pRow = NULL; + int dPRowOuter = 0, dPRowInner; /* offset in bytes */ #endif #ifdef INTERP_Z # ifdef DEPTH_TYPE - DEPTH_TYPE *zRow; - int dZRowOuter, dZRowInner; /* offset in bytes */ + DEPTH_TYPE *zRow = NULL; + int dZRowOuter = 0, dZRowInner; /* offset in bytes */ # endif - GLfixed fz, fdzOuter, fdzInner; + GLfixed fz = 0, fdzOuter = 0, fdzInner; #endif #ifdef INTERP_FOG - GLfloat fogLeft, dfogOuter, dfogInner; + GLfloat fogLeft = 0, dfogOuter = 0, dfogInner; #endif #ifdef INTERP_RGB - GLfixed fr, fdrOuter, fdrInner; - GLfixed fg, fdgOuter, fdgInner; - GLfixed fb, fdbOuter, fdbInner; + GLfixed fr = 0, fdrOuter = 0, fdrInner; + GLfixed fg = 0, fdgOuter = 0, fdgInner; + GLfixed fb = 0, fdbOuter = 0, fdbInner; #endif #ifdef INTERP_ALPHA - GLfixed fa, fdaOuter, fdaInner; + GLfixed fa = 0, fdaOuter = 0, fdaInner; #endif #ifdef INTERP_FLOAT_RGBA GLfloat fr, fdrOuter, fdrInner; diff --git a/xc/extras/Mesa/src/swrast/s_zoom.c b/xc/extras/Mesa/src/swrast/s_zoom.c index c94d61d0a..f125b6d98 100644 --- a/xc/extras/Mesa/src/swrast/s_zoom.c +++ b/xc/extras/Mesa/src/swrast/s_zoom.c @@ -1,4 +1,3 @@ -/* $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 ebbb190a0..a195dfe1d 100644 --- a/xc/extras/Mesa/src/swrast/s_zoom.h +++ b/xc/extras/Mesa/src/swrast/s_zoom.h @@ -1,4 +1,3 @@ -/* $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 f051c733d..6799bc309 100644 --- a/xc/extras/Mesa/src/swrast/swrast.h +++ b/xc/extras/Mesa/src/swrast/swrast.h @@ -1,4 +1,3 @@ -/* $Id: swrast.h,v 1.3 2002/02/21 11:43:10 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -73,7 +72,7 @@ struct swrast_device_driver; /* These are the public-access functions exported from swrast. */ extern void -_swrast_alloc_buffers( GLcontext *ctx ); +_swrast_alloc_buffers( GLframebuffer *buffer ); extern GLboolean _swrast_CreateContext( GLcontext *ctx ); diff --git a/xc/extras/Mesa/src/swrast_setup/ss_context.c b/xc/extras/Mesa/src/swrast_setup/ss_context.c index 793244e6c..a6840d505 100644 --- a/xc/extras/Mesa/src/swrast_setup/ss_context.c +++ b/xc/extras/Mesa/src/swrast_setup/ss_context.c @@ -1,4 +1,3 @@ -/* $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 c3258e938..973edd024 100644 --- a/xc/extras/Mesa/src/swrast_setup/ss_context.h +++ b/xc/extras/Mesa/src/swrast_setup/ss_context.h @@ -1,4 +1,3 @@ -/* $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 9f653cea7..700506344 100644 --- a/xc/extras/Mesa/src/swrast_setup/ss_triangle.c +++ b/xc/extras/Mesa/src/swrast_setup/ss_triangle.c @@ -1,4 +1,3 @@ -/* $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 874402755..0712a0d59 100644 --- a/xc/extras/Mesa/src/swrast_setup/ss_triangle.h +++ b/xc/extras/Mesa/src/swrast_setup/ss_triangle.h @@ -1,4 +1,3 @@ -/* $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 faabd3788..a0698cf77 100644 --- a/xc/extras/Mesa/src/swrast_setup/ss_tritmp.h +++ b/xc/extras/Mesa/src/swrast_setup/ss_tritmp.h @@ -1,4 +1,3 @@ -/* $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 9205ba44d..9c7b42cc9 100644 --- a/xc/extras/Mesa/src/swrast_setup/ss_vb.c +++ b/xc/extras/Mesa/src/swrast_setup/ss_vb.c @@ -1,4 +1,3 @@ -/* $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 d11bd58ee..30cbb363c 100644 --- a/xc/extras/Mesa/src/swrast_setup/ss_vb.h +++ b/xc/extras/Mesa/src/swrast_setup/ss_vb.h @@ -1,4 +1,3 @@ -/* $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 fd5023844..8e95ad1f2 100644 --- a/xc/extras/Mesa/src/swrast_setup/ss_vbtmp.h +++ b/xc/extras/Mesa/src/swrast_setup/ss_vbtmp.h @@ -1,4 +1,3 @@ -/* $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 0cbceb83b..802212e88 100644 --- a/xc/extras/Mesa/src/swrast_setup/swrast_setup.h +++ b/xc/extras/Mesa/src/swrast_setup/swrast_setup.h @@ -1,4 +1,3 @@ -/* $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 dbd6f8aa4..a55d9ddb0 100644 --- a/xc/extras/Mesa/src/texformat.c +++ b/xc/extras/Mesa/src/texformat.c @@ -1,4 +1,3 @@ -/* $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 e355ed7f3..fbe1a6538 100644 --- a/xc/extras/Mesa/src/texformat.h +++ b/xc/extras/Mesa/src/texformat.h @@ -1,4 +1,3 @@ -/* $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 0fc323edd..5c3489662 100644 --- a/xc/extras/Mesa/src/texformat_tmp.h +++ b/xc/extras/Mesa/src/texformat_tmp.h @@ -1,4 +1,3 @@ -/* $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 e044e61a9..0bd6d6fa5 100644 --- a/xc/extras/Mesa/src/teximage.c +++ b/xc/extras/Mesa/src/teximage.c @@ -1,4 +1,3 @@ -/* $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 6273ceef8..614bc3b5a 100644 --- a/xc/extras/Mesa/src/teximage.h +++ b/xc/extras/Mesa/src/teximage.h @@ -1,4 +1,3 @@ -/* $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 673af2836..c58e83b6f 100644 --- a/xc/extras/Mesa/src/texobj.c +++ b/xc/extras/Mesa/src/texobj.c @@ -1,4 +1,3 @@ -/* $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 445742454..1d80521b6 100644 --- a/xc/extras/Mesa/src/texobj.h +++ b/xc/extras/Mesa/src/texobj.h @@ -1,4 +1,3 @@ -/* $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 c5ec10791..43111d7af 100644 --- a/xc/extras/Mesa/src/texstate.c +++ b/xc/extras/Mesa/src/texstate.c @@ -1,4 +1,3 @@ -/* $Id: texstate.c,v 1.21 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texstate.h b/xc/extras/Mesa/src/texstate.h index 15d17e94b..656ea23ac 100644 --- a/xc/extras/Mesa/src/texstate.h +++ b/xc/extras/Mesa/src/texstate.h @@ -1,4 +1,3 @@ -/* $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 96abc885a..39f099f12 100644 --- a/xc/extras/Mesa/src/texstore.c +++ b/xc/extras/Mesa/src/texstore.c @@ -1,4 +1,3 @@ -/* $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 bbbee479b..5f5eabc64 100644 --- a/xc/extras/Mesa/src/texstore.h +++ b/xc/extras/Mesa/src/texstore.h @@ -1,4 +1,3 @@ -/* $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 6e74d52d3..726c9483a 100644 --- a/xc/extras/Mesa/src/texutil.c +++ b/xc/extras/Mesa/src/texutil.c @@ -526,7 +526,7 @@ CONVERT_ARGB1555( texsubimage3d ) #define CONVERT_TEXEL_DWORD( dst, src ) \ dst = ((PACK_COLOR_88( src[3], src[0] )) | \ - (PACK_COLOR_88( src[7], src[1] ) << 16)) + (PACK_COLOR_88( src[7], src[4] ) << 16)) #define SRC_TEXEL_BYTES 4 diff --git a/xc/extras/Mesa/src/texutil_tmp.h b/xc/extras/Mesa/src/texutil_tmp.h index db5d3e2bc..44f463e35 100644 --- a/xc/extras/Mesa/src/texutil_tmp.h +++ b/xc/extras/Mesa/src/texutil_tmp.h @@ -1,4 +1,3 @@ -/* $Id: texutil_tmp.h,v 1.6 2002/02/21 23:46:58 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 36bc357ea..5d6d6ca15 100644 --- a/xc/extras/Mesa/src/tnl/t_array_api.c +++ b/xc/extras/Mesa/src/tnl/t_array_api.c @@ -1,4 +1,3 @@ -/* $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 bb2bcddf2..c26112bef 100644 --- a/xc/extras/Mesa/src/tnl/t_array_api.h +++ b/xc/extras/Mesa/src/tnl/t_array_api.h @@ -1,4 +1,3 @@ -/* $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 e8a9ce569..75fa9e6d7 100644 --- a/xc/extras/Mesa/src/tnl/t_array_import.c +++ b/xc/extras/Mesa/src/tnl/t_array_import.c @@ -1,4 +1,3 @@ -/* $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 757c58b6e..7bc248f71 100644 --- a/xc/extras/Mesa/src/tnl/t_array_import.h +++ b/xc/extras/Mesa/src/tnl/t_array_import.h @@ -1,4 +1,3 @@ -/* $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 4ee7a4f78..7f9c0614a 100644 --- a/xc/extras/Mesa/src/tnl/t_context.c +++ b/xc/extras/Mesa/src/tnl/t_context.c @@ -1,4 +1,3 @@ -/* $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 350e83216..fa1288d95 100644 --- a/xc/extras/Mesa/src/tnl/t_context.h +++ b/xc/extras/Mesa/src/tnl/t_context.h @@ -1,4 +1,3 @@ -/* $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 8048736a8..ba97ba769 100644 --- a/xc/extras/Mesa/src/tnl/t_eval_api.c +++ b/xc/extras/Mesa/src/tnl/t_eval_api.c @@ -1,4 +1,3 @@ -/* $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 153f3489e..0ac6c0b14 100644 --- a/xc/extras/Mesa/src/tnl/t_eval_api.h +++ b/xc/extras/Mesa/src/tnl/t_eval_api.h @@ -1,4 +1,3 @@ -/* $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 ac3efbd63..330275c6b 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_alloc.c +++ b/xc/extras/Mesa/src/tnl/t_imm_alloc.c @@ -1,4 +1,3 @@ -/* $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 d88d87841..02a3d729a 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_alloc.h +++ b/xc/extras/Mesa/src/tnl/t_imm_alloc.h @@ -1,4 +1,3 @@ -/* $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 ccc404e58..02408c9de 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_api.c +++ b/xc/extras/Mesa/src/tnl/t_imm_api.c @@ -1,4 +1,3 @@ -/* $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 d03a729dc..c0c5f0b4d 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_api.h +++ b/xc/extras/Mesa/src/tnl/t_imm_api.h @@ -1,4 +1,3 @@ -/* $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 ee6264b54..63b53b79b 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_debug.c +++ b/xc/extras/Mesa/src/tnl/t_imm_debug.c @@ -1,4 +1,3 @@ -/* $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 e238fe350..d0cedde50 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_debug.h +++ b/xc/extras/Mesa/src/tnl/t_imm_debug.h @@ -1,4 +1,3 @@ -/* $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 7a3501784..3bafa911e 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_dlist.c +++ b/xc/extras/Mesa/src/tnl/t_imm_dlist.c @@ -1,4 +1,3 @@ -/* $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 12006169a..eb2a39b6c 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_dlist.h +++ b/xc/extras/Mesa/src/tnl/t_imm_dlist.h @@ -1,4 +1,3 @@ -/* $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 42edf18f4..6a3bf583c 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_elt.c +++ b/xc/extras/Mesa/src/tnl/t_imm_elt.c @@ -1,4 +1,3 @@ -/* $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 3abf7b0a6..cbc3fd62b 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_elt.h +++ b/xc/extras/Mesa/src/tnl/t_imm_elt.h @@ -1,4 +1,3 @@ -/* $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 ad690b074..09f63a4fe 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_eval.c +++ b/xc/extras/Mesa/src/tnl/t_imm_eval.c @@ -1,4 +1,3 @@ -/* $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 f49ef8cf7..58e8a38af 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_eval.h +++ b/xc/extras/Mesa/src/tnl/t_imm_eval.h @@ -1,4 +1,3 @@ -/* $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 2945ad709..62e940dcd 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_exec.c +++ b/xc/extras/Mesa/src/tnl/t_imm_exec.c @@ -1,4 +1,3 @@ -/* $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 ead7a8914..71170bbef 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_exec.h +++ b/xc/extras/Mesa/src/tnl/t_imm_exec.h @@ -1,4 +1,3 @@ -/* $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 17540d417..99ce407fa 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_fixup.c +++ b/xc/extras/Mesa/src/tnl/t_imm_fixup.c @@ -1,4 +1,3 @@ -/* $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 d34228fd5..b0ec903ca 100644 --- a/xc/extras/Mesa/src/tnl/t_imm_fixup.h +++ b/xc/extras/Mesa/src/tnl/t_imm_fixup.h @@ -1,4 +1,3 @@ -/* $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 a50c78bca..8daa3c0c3 100644 --- a/xc/extras/Mesa/src/tnl/t_pipeline.c +++ b/xc/extras/Mesa/src/tnl/t_pipeline.c @@ -1,4 +1,3 @@ -/* $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 6c962bb49..5e9c31435 100644 --- a/xc/extras/Mesa/src/tnl/t_pipeline.h +++ b/xc/extras/Mesa/src/tnl/t_pipeline.h @@ -1,4 +1,3 @@ -/* $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 dcafa3934..9b982f944 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_cliptmp.h +++ b/xc/extras/Mesa/src/tnl/t_vb_cliptmp.h @@ -1,4 +1,3 @@ -/* $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 e72f7cd16..30e116ec5 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_fog.c +++ b/xc/extras/Mesa/src/tnl/t_vb_fog.c @@ -1,4 +1,3 @@ -/* $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 cfd8e084f..24c35b70a 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_light.c +++ b/xc/extras/Mesa/src/tnl/t_vb_light.c @@ -1,4 +1,3 @@ -/* $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 a8ae92cb1..a9cca9ac5 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_lighttmp.h +++ b/xc/extras/Mesa/src/tnl/t_vb_lighttmp.h @@ -1,4 +1,3 @@ -/* $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 2c86f1922..617cbaa7d 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_normals.c +++ b/xc/extras/Mesa/src/tnl/t_vb_normals.c @@ -1,4 +1,3 @@ -/* $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 2a6068f00..ff0970b71 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_points.c +++ b/xc/extras/Mesa/src/tnl/t_vb_points.c @@ -1,4 +1,3 @@ -/* $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 e0553473d..6ec98c88d 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_render.c +++ b/xc/extras/Mesa/src/tnl/t_vb_render.c @@ -1,4 +1,3 @@ -/* $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 e5dd1f03b..2da5a6145 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_rendertmp.h +++ b/xc/extras/Mesa/src/tnl/t_vb_rendertmp.h @@ -1,4 +1,3 @@ -/* $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 5b88d83f0..8d37d18b7 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_texgen.c +++ b/xc/extras/Mesa/src/tnl/t_vb_texgen.c @@ -1,4 +1,3 @@ -/* $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 71cff8527..eb4f2b58c 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_texmat.c +++ b/xc/extras/Mesa/src/tnl/t_vb_texmat.c @@ -1,4 +1,3 @@ -/* $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 6cad378a5..c0aabd844 100644 --- a/xc/extras/Mesa/src/tnl/t_vb_vertex.c +++ b/xc/extras/Mesa/src/tnl/t_vb_vertex.c @@ -1,4 +1,3 @@ -/* $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 9ff01672d..1d4fb0d18 100644 --- a/xc/extras/Mesa/src/tnl/tnl.h +++ b/xc/extras/Mesa/src/tnl/tnl.h @@ -1,4 +1,3 @@ -/* $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 b06378676..7a10f1d99 100644 --- a/xc/extras/Mesa/src/tnl_dd/t_dd.c +++ b/xc/extras/Mesa/src/tnl_dd/t_dd.c @@ -1,4 +1,3 @@ -/* $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 93a41974f..3ba0df1e1 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,3 @@ -/* $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 50b275834..2034584af 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,3 @@ -/* $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 57387cd7e..27e90e0cf 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,3 @@ -/* $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 3b7044841..759efe3e8 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,3 @@ -/* $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 1b23001c4..2478ebaa4 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,3 @@ -/* $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 d5c5a8fd3..cca8ecfa1 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,3 @@ -/* $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 e32427bb2..6890b14bf 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,3 @@ -/* $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 c2ad9aabb..4918dfd21 100644 --- a/xc/extras/Mesa/src/varray.c +++ b/xc/extras/Mesa/src/varray.c @@ -1,4 +1,3 @@ -/* $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 502478fcc..8b078fc20 100644 --- a/xc/extras/Mesa/src/varray.h +++ b/xc/extras/Mesa/src/varray.h @@ -1,4 +1,3 @@ -/* $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 a661836b5..e67fd7c7e 100644 --- a/xc/extras/Mesa/src/vtxfmt.c +++ b/xc/extras/Mesa/src/vtxfmt.c @@ -1,4 +1,3 @@ -/* $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 061c09c6e..e7fd2097d 100644 --- a/xc/extras/Mesa/src/vtxfmt.h +++ b/xc/extras/Mesa/src/vtxfmt.h @@ -1,4 +1,3 @@ -/* $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 e122d5364..a814c530d 100644 --- a/xc/extras/Mesa/src/vtxfmt_tmp.h +++ b/xc/extras/Mesa/src/vtxfmt_tmp.h @@ -1,4 +1,3 @@ -/* $Id: vtxfmt_tmp.h,v 1.3 2002/02/21 11:43:02 alanh Exp $ */ /* * Mesa 3-D graphics library |