Rename the various function types in t_context.h to include a tnl_ prefix.

[mesa.git] / src / mesa / drivers / glide / fxglidew.h

diff --git a/src/mesa/drivers/glide/fxglidew.h b/src/mesa/drivers/glide/fxglidew.h
index 324b5d99f0f8cc05ea1de542a48ffd6fee249f9e..472cf9473ccf66c5d11776119ed821772e8637d0 100644 (file)
--- a/src/mesa/drivers/glide/fxglidew.h
+++ b/src/mesa/drivers/glide/fxglidew.h
@@ -1,5 +1,3 @@
-/* $Id: fxglidew.h,v 1.17 2003/10/09 15:12:21 dborca Exp $ */
-
 /*
  * Mesa 3-D graphics library
  * Version:  4.0
@@ -71,14 +69,15 @@ typedef struct {
                int fbRam;      /* 1, 2, or 4 MB */
                int fbiRev;     /* Rev of Pixelfx chip */
                int nTexelfx;   /* How many texelFX chips are there? */
-               int numChips;   /* Number of Voodoo chips [koolsmoky] */
+               int numChips;   /* Number of Voodoo chips */
                GrTMUConfig_t tmuConfig[GLIDE_NUM_TMU]; /* Configuration of the Texelfx chips */
                /* Glide3 extensions */
+               FxBool HavePalExt;      /* PALETTE6666 */
                FxBool HavePixExt;      /* PIXEXT */
                FxBool HaveTexFmt;      /* TEXFMT */
                FxBool HaveCmbExt;      /* COMBINE */
                FxBool HaveMirExt;      /* TEXMIRROR */
-               FxBool HaveTexus2;      /* Texus 2 - FXT1 */
+               FxBool HaveTexUma;      /* TEXUMA */
         }
         SSTs[MAX_NUM_SST];     /* configuration for each board */
         struct tdfx_glide Glide;
@@ -119,7 +118,10 @@ typedef struct {
         float oow;             /* 1/W (used for W-buffering, texturing) */
         unsigned char pargb[4];        /* B, G, R, A [0..255] */
         GrTmuVertex tmuvtx[GLIDE_NUM_TMU];
-        long pad[16 - 11];     /* future use; also ensure 64b structure */
+        float fog;             /* fog coordinate */
+        unsigned char pspec[4];        /* B, G, R, A [0..255] */
+        float psize;           /* point size */
+        long pad[16 - 14];     /* ensure 64b structure */
 } GrVertex;
 
 #define GR_VERTEX_X_OFFSET              0
@@ -133,6 +135,8 @@ typedef struct {
 #define GR_VERTEX_SOW_TMU1_OFFSET       8
 #define GR_VERTEX_TOW_TMU1_OFFSET       9
 #define GR_VERTEX_OOW_TMU1_OFFSET       10
+#define GR_VERTEX_FOG_OFFSET            11
+#define GR_VERTEX_PSPEC_OFFSET          12
 
 
 
@@ -150,36 +154,10 @@ typedef struct {
 
 
 /*
- * Write region: ToDo possible exploit the PixelPipe parameter.
- */
-#define FX_grLfbWriteRegion(dst_buffer,dst_x,dst_y,src_format,src_width,src_height,src_stride,src_data)        \
-        do { \
-            BEGIN_BOARD_LOCK(); \
-            grLfbWriteRegion(dst_buffer,\
-                             dst_x,     \
-                             dst_y,     \
-                             src_format,\
-                             src_width, \
-                             src_height,\
-                             FXFALSE,   \
-                             src_stride,\
-                             src_data);        \
-            END_BOARD_LOCK(); \
-        } while(0)
-
-
-
-/*
- * ScreenWidth/Height stuff.
+ * Query
  */
 extern int FX_grSstScreenWidth(void);
 extern int FX_grSstScreenHeight(void);
-
-
-
-/*
- * Query
- */
 extern void FX_grSstPerfStats(GrSstPerfStats_t *st);
 extern int FX_grSstQueryHardware(GrHwConfiguration *config);
 #define FX_grGetInteger FX_grGetInteger_NoLock