Merge commit 'origin/master' into gallium-0.2

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

diff --git a/src/mesa/swrast/s_trispan.h b/src/mesa/swrast/s_trispan.h
index cd577f51ca641e3568b8c8ce183f81abfcdf492d..15207e863e3b389075bca201da899b8b26eedd37 100644 (file)
--- a/src/mesa/swrast/s_trispan.h
+++ b/src/mesa/swrast/s_trispan.h
@@ -1,4 +1,3 @@
-/* $Id: s_trispan.h,v 1.1 2001/05/14 16:23:04 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -29,51 +28,4 @@
 #define S_TRISPAN_H
 
 
-/*
- * The triangle_span structure is used by the triangle template code in
- * s_tritemp.h.  It describes how colors, Z, texcoords, etc are to be
- * interpolated across each scanline of triangle.
- * With this structure it's easy to hand-off span rasterization to a
- * subroutine instead of doing it all inline like we used to do.
- * It also cleans up the local variable namespace a great deal.
- *
- * It would be interesting to experiment with multiprocessor rasterization
- * with this structure.  The triangle rasterizer could simply emit a
- * stream of these structures which would be consumed by one or more
- * span-processing threads which could run in parallel.
- */
-
-
-#define SPAN_RGBA         0x01
-#define SPAN_SPEC         0x02
-#define SPAN_INDEX        0x04
-#define SPAN_Z            0x08
-#define SPAN_FOG          0x10
-#define SPAN_TEXTURE      0x20
-#define SPAN_INT_TEXTURE  0x40
-#define SPAN_LAMBDA       0x80
-
-
-struct triangle_span {
-   GLint x, y;
-   GLuint count;
-   GLuint activeMask;  /* OR of the SPAN_* flags */
-   GLfixed red, redStep;
-   GLfixed green, greenStep;
-   GLfixed blue, blueStep;
-   GLfixed alpha, alphaStep;
-   GLfixed specRed, specRedStep;
-   GLfixed specGreen, specGreenStep;
-   GLfixed specBlue, specBlueStep;
-   GLfixed index, indexStep;
-   GLfixed z, zStep;
-   GLfloat fog, fogStep;
-   GLfloat tex[MAX_TEXTURE_UNITS][4], texStep[MAX_TEXTURE_UNITS][4];
-   GLfixed intTex[2], intTexStep[2];
-   /* Needed for texture lambda (LOD) computation */
-   GLfloat rho[MAX_TEXTURE_UNITS];
-   GLfloat texWidth[MAX_TEXTURE_UNITS], texHeight[MAX_TEXTURE_UNITS];
-};
-
-
 #endif /* S_TRISPAN_H */