diff options
| -rw-r--r-- | src/mesa/drivers/svga/svgamesa.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/svga/svgamesa15.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/svga/svgamesa15.h | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/svga/svgamesa16.c | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/svga/svgamesa16.h | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/svga/svgamesa24.c | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/svga/svgamesa24.h | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/svga/svgamesa32.c | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/svga/svgamesa32.h | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/svga/svgapix.h | 7 |
10 files changed, 38 insertions, 37 deletions
diff --git a/src/mesa/drivers/svga/svgamesa.c b/src/mesa/drivers/svga/svgamesa.c index 9f5e75199f..5f636e14af 100644 --- a/src/mesa/drivers/svga/svgamesa.c +++ b/src/mesa/drivers/svga/svgamesa.c @@ -1,9 +1,9 @@ -/* $Id: svgamesa.c,v 1.22 2002/10/24 23:57:23 brianp Exp $ */ +/* $Id: svgamesa.c,v 1.23 2002/11/11 18:42:38 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 - * Copyright (C) 1995-2000 Brian Paul + * Version: 5.0 + * Copyright (C) 1995-2002 Brian Paul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/mesa/drivers/svga/svgamesa15.c b/src/mesa/drivers/svga/svgamesa15.c index d14d58d756..54b6c977a7 100644 --- a/src/mesa/drivers/svga/svgamesa15.c +++ b/src/mesa/drivers/svga/svgamesa15.c @@ -1,9 +1,9 @@ -/* $Id: svgamesa15.c,v 1.10 2002/10/04 19:10:11 brianp Exp $ */ +/* $Id: svgamesa15.c,v 1.11 2002/11/11 18:42:39 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 - * Copyright (C) 1995-2000 Brian Paul + * Version: 5.0 + * Copyright (C) 1995-2002 Brian Paul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/mesa/drivers/svga/svgamesa15.h b/src/mesa/drivers/svga/svgamesa15.h index 62e65636c3..3ed7db82ee 100644 --- a/src/mesa/drivers/svga/svgamesa15.h +++ b/src/mesa/drivers/svga/svgamesa15.h @@ -1,9 +1,9 @@ -/* $Id: svgamesa15.h,v 1.6 2001/02/06 00:03:48 brianp Exp $ */ +/* $Id: svgamesa15.h,v 1.7 2002/11/11 18:42:39 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 - * Copyright (C) 1995-2000 Brian Paul + * Version: 5.0 + * Copyright (C) 1995-2002 Brian Paul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -31,7 +31,7 @@ #ifndef SVGA_MESA_15_H #define SVGA_MESA_15_H -extern void __clear_color15( GLcontext *ctx, const GLchan color[4] ); +extern void __clear_color15( GLcontext *ctx, const GLfloat color[4] ); extern void __clear15( GLcontext *ctx, GLbitfield mask, GLboolean all, GLint x, GLint y, GLint width, GLint height ); extern void __write_rgba_span15( const GLcontext *ctx, GLuint n, GLint x, GLint y, const GLubyte rgba[][4], const GLubyte mask[] ); extern void __write_mono_rgba_span15( const GLcontext *ctx, GLuint n, GLint x, GLint y, const GLchan color[4], const GLubyte mask[]); diff --git a/src/mesa/drivers/svga/svgamesa16.c b/src/mesa/drivers/svga/svgamesa16.c index 9078d92709..72ac818329 100644 --- a/src/mesa/drivers/svga/svgamesa16.c +++ b/src/mesa/drivers/svga/svgamesa16.c @@ -1,9 +1,9 @@ -/* $Id: svgamesa16.c,v 1.10 2002/10/04 19:10:11 brianp Exp $ */ +/* $Id: svgamesa16.c,v 1.11 2002/11/11 18:42:40 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 - * Copyright (C) 1995-2000 Brian Paul + * Version: 5.0 + * Copyright (C) 1995-2002 Brian Paul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -57,7 +57,7 @@ static unsigned long __svga_getpixel16(int x, int y) return shortBuffer[offset]; } -void __clear_color16( GLcontext *ctx, const GLchan color[4] ) +void __clear_color16( GLcontext *ctx, const GLfloat color[4] ) { GLubyte col[3]; CLAMPED_FLOAT_TO_UBYTE(col[0], color[0]); diff --git a/src/mesa/drivers/svga/svgamesa16.h b/src/mesa/drivers/svga/svgamesa16.h index 8e4886c6fb..247c1f4045 100644 --- a/src/mesa/drivers/svga/svgamesa16.h +++ b/src/mesa/drivers/svga/svgamesa16.h @@ -1,9 +1,9 @@ -/* $Id: svgamesa16.h,v 1.5 2001/02/06 00:03:48 brianp Exp $ */ +/* $Id: svgamesa16.h,v 1.6 2002/11/11 18:42:41 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.2 - * Copyright (C) 1995-2000 Brian Paul + * Version: 5.0 + * Copyright (C) 1995-2002 Brian Paul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -31,7 +31,7 @@ #ifndef SVGA_MESA_16_H #define SVGA_MESA_16_H -extern void __clear_color16( GLcontext *ctx, const GLchan color[4] ); +extern void __clear_color16( GLcontext *ctx, const GLfloat color[4] ); extern void __clear16( GLcontext *ctx, GLbitfield mask, GLboolean all, GLint x, GLint y, GLint width, GLint height ); extern void __write_rgba_span16( const GLcontext *ctx, GLuint n, GLint x, GLint y, const GLubyte rgba[][4], const GLubyte mask[] ); extern void __write_mono_rgba_span16( const GLcontext *ctx, GLuint n, GLint x, GLint y, const GLchan color[4], const GLubyte mask[]); diff --git a/src/mesa/drivers/svga/svgamesa24.c b/src/mesa/drivers/svga/svgamesa24.c index fc56ccb6b3..07491cc67a 100644 --- a/src/mesa/drivers/svga/svgamesa24.c +++ b/src/mesa/drivers/svga/svgamesa24.c @@ -1,9 +1,9 @@ -/* $Id: svgamesa24.c,v 1.11 2002/10/04 19:10:11 brianp Exp $ */ +/* $Id: svgamesa24.c,v 1.12 2002/11/11 18:42:41 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 - * Copyright (C) 1995-2000 Brian Paul + * Version: 5.0 + * Copyright (C) 1995-2002 Brian Paul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -79,7 +79,7 @@ static unsigned long __svga_getpixel24(int x, int y) return rgbBuffer[offset].r<<16 | rgbBuffer[offset].g<<8 | rgbBuffer[offset].b; } -void __clear_color24( GLcontext *ctx, const GLchan color[4] ) +void __clear_color24( GLcontext *ctx, const GLfloat color[4] ) { GLubyte col[3]; CLAMPED_FLOAT_TO_UBYTE(col[0], color[0]); diff --git a/src/mesa/drivers/svga/svgamesa24.h b/src/mesa/drivers/svga/svgamesa24.h index 8c5d9518c9..54d1a8298b 100644 --- a/src/mesa/drivers/svga/svgamesa24.h +++ b/src/mesa/drivers/svga/svgamesa24.h @@ -1,9 +1,9 @@ -/* $Id: svgamesa24.h,v 1.5 2001/02/06 00:03:48 brianp Exp $ */ +/* $Id: svgamesa24.h,v 1.6 2002/11/11 18:42:41 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.2 - * Copyright (C) 1995-2000 Brian Paul + * Version: 5.0 + * Copyright (C) 1995-2002 Brian Paul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -31,7 +31,7 @@ #ifndef SVGA_MESA_24_H #define SVGA_MESA_24_H -extern void __clear_color24( GLcontext *ctx, const GLchan color[4] ); +extern void __clear_color24( GLcontext *ctx, const GLfloat color[4] ); extern void __clear24( GLcontext *ctx, GLbitfield mask, GLboolean all, GLint x, GLint y, GLint width, GLint height ); extern void __write_rgba_span24( const GLcontext *ctx, GLuint n, GLint x, GLint y, const GLubyte rgba[][4], const GLubyte mask[] ); extern void __write_mono_rgba_span24( const GLcontext *ctx, GLuint n, GLint x, GLint y, const GLchan color[4], const GLubyte mask[]); diff --git a/src/mesa/drivers/svga/svgamesa32.c b/src/mesa/drivers/svga/svgamesa32.c index 2ef3a191be..8a366998d6 100644 --- a/src/mesa/drivers/svga/svgamesa32.c +++ b/src/mesa/drivers/svga/svgamesa32.c @@ -1,9 +1,9 @@ -/* $Id: svgamesa32.c,v 1.11 2002/10/04 19:10:11 brianp Exp $ */ +/* $Id: svgamesa32.c,v 1.12 2002/11/11 18:42:42 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 - * Copyright (C) 1995-2000 Brian Paul + * Version: 5.0 + * Copyright (C) 1995-2002 Brian Paul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -76,7 +76,7 @@ static unsigned long __svga_getpixel32(int x, int y) return intBuffer[offset]; } -void __clear_color32( GLcontext *ctx, const GLchan color[4] ) +void __clear_color32( GLcontext *ctx, const GLfloat color[4] ) { GLubyte col[3]; CLAMPED_FLOAT_TO_UBYTE(col[0], color[0]); diff --git a/src/mesa/drivers/svga/svgamesa32.h b/src/mesa/drivers/svga/svgamesa32.h index 51c1c664bf..f518e11ad5 100644 --- a/src/mesa/drivers/svga/svgamesa32.h +++ b/src/mesa/drivers/svga/svgamesa32.h @@ -1,9 +1,9 @@ -/* $Id: svgamesa32.h,v 1.5 2001/02/06 00:03:48 brianp Exp $ */ +/* $Id: svgamesa32.h,v 1.6 2002/11/11 18:42:42 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.2 - * Copyright (C) 1995-2000 Brian Paul + * Version: 5.0 + * Copyright (C) 1995-2002 Brian Paul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -31,7 +31,7 @@ #ifndef SVGA_MESA_32_H #define SVGA_MESA_32_H -extern void __clear_color32( GLcontext *ctx, const GLchan color[4] ); +extern void __clear_color32( GLcontext *ctx, const GLfloat color[4] ); extern void __clear32( GLcontext *ctx, GLbitfield mask, GLboolean all, GLint x, GLint y, GLint width, GLint height ); extern void __write_rgba_span32( const GLcontext *ctx, GLuint n, GLint x, GLint y, const GLubyte rgba[][4], const GLubyte mask[] ); extern void __write_mono_rgba_span32( const GLcontext *ctx, GLuint n, GLint x, GLint y, const GLchan color[4], const GLubyte mask[]); diff --git a/src/mesa/drivers/svga/svgapix.h b/src/mesa/drivers/svga/svgapix.h index dd4bf6978c..0b19551bf6 100644 --- a/src/mesa/drivers/svga/svgapix.h +++ b/src/mesa/drivers/svga/svgapix.h @@ -1,9 +1,9 @@ -/* $Id: svgapix.h,v 1.4 2000/11/14 17:51:15 brianp Exp $ */ +/* $Id: svgapix.h,v 1.5 2002/11/11 18:42:44 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 - * Copyright (C) 1995-2000 Brian Paul + * Version: 5.0 + * Copyright (C) 1995-2002 Brian Paul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -34,6 +34,7 @@ #include "GL/gl.h" #include "GL/svgamesa.h" #include "context.h" +#include "colormac.h" #include "vga.h" struct svgamesa_context { |