Change logicop, blend, masking functions to use the colors/indexes in the

[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 326d02415ae0b5db1acc846ecc81ed4e5e96cb83..40a57e1ae53014e2267fd47366e4c7125e4db5f7 100644 (file)
--- a/src/mesa/swrast/s_span.h
+++ b/src/mesa/swrast/s_span.h
@@ -1,10 +1,8 @@
-/* $Id: s_span.h,v 1.10 2002/01/16 16:00:04 brianp Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
+ * Version:  6.5
  *
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2005  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,67 +32,54 @@
 
 
 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 );
-
-void
-_mesa_write_index_span( GLcontext *ctx,        struct sw_span *span,
-                       GLenum primitive);
+_swrast_span_default_z( GLcontext *ctx, struct sw_span *span );
 
 extern void
-_mesa_write_monoindex_span( GLcontext *ctx, struct sw_span *span,
-                            GLuint index, GLenum primitive );
+_swrast_span_interpolate_z( const GLcontext *ctx, struct sw_span *span );
 
 extern void
-_mesa_write_rgba_span( GLcontext *ctx, struct sw_span *span,
-                       GLenum primitive );
+_swrast_span_default_fog( GLcontext *ctx, struct sw_span *span );
 
 extern void
-_mesa_write_monocolor_span( GLcontext *ctx, struct sw_span *span,
-                           const GLchan color[4], GLenum primitive );
+_swrast_span_default_color( GLcontext *ctx, struct sw_span *span );
 
 extern void
-_mesa_write_texture_span( GLcontext *ctx, struct sw_span *span,
-                         const GLfloat fog[], GLenum primitive );
+_swrast_span_default_texcoords( GLcontext *ctx, struct sw_span *span );
 
+extern GLfloat
+_swrast_compute_lambda(GLfloat dsdx, GLfloat dsdy, GLfloat dtdx, GLfloat dtdy,
+                       GLfloat dqdx, GLfloat dqdy, GLfloat texW, GLfloat texH,
+                       GLfloat s, GLfloat t, GLfloat q, GLfloat invQ);
 
 extern void
-_mesa_rasterize_span(GLcontext *ctx, struct sw_span *span);
+_swrast_write_index_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 );
+_swrast_write_rgba_span( GLcontext *ctx, struct sw_span *span);
 
 
 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 );
-
+_swrast_read_rgba_span( GLcontext *ctx, struct gl_renderbuffer *rb,
+                        GLuint n, GLint x, GLint y, GLchan rgba[][4] );
 
 extern void
-_mesa_read_rgba_span( GLcontext *ctx, GLframebuffer *buffer,
-                      GLuint n, GLint x, GLint y, GLchan rgba[][4] );
+_swrast_read_index_span( GLcontext *ctx, struct gl_renderbuffer *rb,
+                         GLuint n, GLint x, GLint y, GLuint indx[] );
 
+extern void
+_swrast_get_values(GLcontext *ctx, struct gl_renderbuffer *rb,
+                   GLuint count, const GLint x[], const GLint y[],
+                   void *values, GLuint valueSize);
 
 extern void
-_mesa_read_index_span( GLcontext *ctx, GLframebuffer *buffer,
-                       GLuint n, GLint x, GLint y, GLuint indx[] );
+_swrast_put_row(GLcontext *ctx, struct gl_renderbuffer *rb,
+                GLuint count, GLint x, GLint y,
+                const GLvoid *values, GLuint valueSize);
 
+extern void
+_swrast_get_row(GLcontext *ctx, struct gl_renderbuffer *rb,
+                GLuint count, GLint x, GLint y,
+                GLvoid *values, GLuint valueSize);
 
 #endif