Klaus's latest patches and some clean-up

[mesa.git] / src / mesa / swrast / s_span.h

diff --git a/src/mesa/swrast/s_span.h b/src/mesa/swrast/s_span.h
index b1bb847bf6712b7308b65ae695d42930684625c5..ce67c6c76172e99d59acee9922664c1259cabd76 100644 (file)
--- a/src/mesa/swrast/s_span.h
+++ b/src/mesa/swrast/s_span.h
@@ -1,10 +1,10 @@
-/* $Id: s_span.h,v 1.5 2001/05/03 22:13:32 brianp Exp $ */
+/* $Id: s_span.h,v 1.11 2002/01/21 18:12:34 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  4.1
  *
- * 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"),
@@ -25,9 +25,6 @@
  */
 
 
-
-
-
 #ifndef S_SPAN_H
 #define S_SPAN_H
 
@@ -36,64 +33,68 @@
 #include "swrast.h"
 
 
-extern void _mesa_write_index_span( GLcontext *ctx,
-                                 GLuint n, GLint x, GLint y, const GLdepth z[],
-                                const GLfloat fog[],
-                                GLuint index[], GLenum primitive );
+extern void
+_old_write_index_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                        const GLdepth z[], const GLfloat fog[],
+                        GLuint index[], const GLint coverage[],
+                        GLenum primitive );
 
+extern void
+_old_write_rgba_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                       const GLdepth z[], const GLfloat fog[],
+                       GLchan rgba[][4], const GLfloat coverage[],
+                       GLenum primitive );
 
-extern void _mesa_write_monoindex_span( GLcontext *ctx,
-                                     GLuint n, GLint x, GLint y,
-                                     const GLdepth z[],
-                                    const GLfloat fog[],
-                                    GLuint index, GLenum primitive );
+void
+_mesa_write_index_span( GLcontext *ctx,        struct sw_span *span,
+                       const GLfloat fog[MAX_WIDTH], GLenum primitive);
 
+extern void
+_mesa_write_monoindex_span( GLcontext *ctx, struct sw_span *span,
+                            GLuint index, GLenum primitive );
 
-extern void _mesa_write_rgba_span( GLcontext *ctx,
-                                GLuint n, GLint x, GLint y, const GLdepth z[],
-                               const GLfloat fog[],
-                                GLchan rgba[][4], GLenum primitive );
+extern void
+_mesa_write_rgba_span( GLcontext *ctx, struct sw_span *span,
+                      const GLfloat fog[MAX_WIDTH], GLenum primitive);
 
+extern void
+_mesa_write_monocolor_span( GLcontext *ctx, struct sw_span *span,
+                           const GLchan color[4], GLenum primitive );
 
-extern void _mesa_write_monocolor_span( GLcontext *ctx,
-                                     GLuint n, GLint x, GLint y,
-                                     const GLdepth z[],
-                                    const GLfloat fog[],
-                                    const GLchan color[4],
-                                     GLenum primitive );
+extern void
+_mesa_write_texture_span( GLcontext *ctx, struct sw_span *span,
+                         const GLfloat fog[MAX_WIDTH], GLenum primitive );
 
 
-extern void _mesa_write_texture_span( GLcontext *ctx,
-                                   GLuint n, GLint x, GLint y,
-                                   const GLdepth z[],
-                                  const GLfloat fog[],
-                                  const GLfloat s[], const GLfloat t[],
-                                   const GLfloat u[], GLfloat lambda[],
-                                  GLchan rgba[][4], CONST GLchan spec[][4],
-                                   GLenum primitive );
+extern void
+_mesa_rasterize_span(GLcontext *ctx, struct sw_span *span);
+
+
+extern void
+_old_write_texture_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                        const GLdepth z[], const GLfloat fog[],
+                        GLfloat texcoord[][4], GLfloat lambda[],
+                        GLchan rgba[][4], GLchan spec[][4],
+                        const GLfloat coverage[], GLenum primitive );
+
+
+extern void
+_old_write_multitexture_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                              const GLdepth z[], const GLfloat fog[],
+                              GLfloat texcoord[MAX_TEXTURE_UNITS][MAX_WIDTH][4],
+                              GLfloat lambda[MAX_TEXTURE_UNITS][MAX_WIDTH],
+                              GLchan rgba[][4], GLchan spec[][4],
+                              const GLfloat coverage[],  GLenum primitive );
+
+
+extern void
+_mesa_read_rgba_span( GLcontext *ctx, GLframebuffer *buffer,
+                      GLuint n, GLint x, GLint y, GLchan rgba[][4] );
 
 
 extern void
-_mesa_write_multitexture_span( GLcontext *ctx,
-                            GLuint n, GLint x, GLint y,
-                            const GLdepth z[],
-                           const GLfloat fog[],
-                            CONST GLfloat s[MAX_TEXTURE_UNITS][MAX_WIDTH],
-                            CONST GLfloat t[MAX_TEXTURE_UNITS][MAX_WIDTH],
-                            CONST GLfloat u[MAX_TEXTURE_UNITS][MAX_WIDTH],
-                            GLfloat lambda[MAX_TEXTURE_UNITS][MAX_WIDTH],
-                            GLchan rgba[][4],
-                            CONST GLchan spec[][4],
-                            GLenum primitive );
-
-
-extern void _mesa_read_rgba_span( GLcontext *ctx, GLframebuffer *buffer,
-                               GLuint n, GLint x, GLint y,
-                               GLchan rgba[][4] );
-
-
-extern void _mesa_read_index_span( GLcontext *ctx, GLframebuffer *buffer,
-                                GLuint n, GLint x, GLint y, GLuint indx[] );
+_mesa_read_index_span( GLcontext *ctx, GLframebuffer *buffer,
+                       GLuint n, GLint x, GLint y, GLuint indx[] );
 
 
 #endif