tnl: Replace deprecated ColorPtr[] with AttribPtr or new BackfaceColorPtr.

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

diff --git a/src/mesa/drivers/glide/fxg.h b/src/mesa/drivers/glide/fxg.h
index 2841bab16cb02aa22553382537d616a7e2b39e85..e71201116838cdb61d7af6337890db41986b5c3c 100644 (file)
--- a/src/mesa/drivers/glide/fxg.h
+++ b/src/mesa/drivers/glide/fxg.h
@@ -37,9 +37,11 @@
 #include <glide.h>
 #include <g3ext.h>
 
-#define DEBUG_TRAP 0
+#ifndef FX_TRAP_GLIDE
+#define FX_TRAP_GLIDE 0
+#endif
 
-#if DEBUG_TRAP
+#if FX_TRAP_GLIDE
 /*
 ** rendering functions
 */
@@ -74,7 +76,6 @@ void FX_CALL trap_grFinish (void);
 void FX_CALL trap_grFlush (void);
 GrContext_t FX_CALL trap_grSstWinOpen (FxU32 hWnd, GrScreenResolution_t screen_resolution, GrScreenRefresh_t refresh_rate, GrColorFormat_t color_format, GrOriginLocation_t origin_location, int nColBuffers, int nAuxBuffers);
 FxBool FX_CALL trap_grSstWinClose (GrContext_t context);
-void FX_CALL trap_grSetNumPendingBuffers (FxI32 NumPendingBuffers);
 FxBool FX_CALL trap_grSelectContext (GrContext_t context);
 void FX_CALL trap_grSstOrigin (GrOriginLocation_t origin);
 void FX_CALL trap_grSstSelect (int which_sst);
@@ -172,7 +173,7 @@ void FX_CALL trap_guFogGenerateExp (GrFog_t *fogtable, float density);
 void FX_CALL trap_guFogGenerateExp2 (GrFog_t *fogtable, float density);
 void FX_CALL trap_guFogGenerateLinear (GrFog_t *fogtable, float nearZ, float farZ);
 
-#ifndef DEBUG_TRAP_internal
+#ifndef FX_TRAP_GLIDE_internal
 /*
 ** rendering functions
 */
@@ -207,7 +208,6 @@ void FX_CALL trap_guFogGenerateLinear (GrFog_t *fogtable, float nearZ, float far
 #define grFlush                         trap_grFlush
 #define grSstWinOpen                    trap_grSstWinOpen
 #define grSstWinClose                   trap_grSstWinClose
-#define grSetNumPendingBuffers          trap_grSetNumPendingBuffers
 #define grSelectContext                 trap_grSelectContext
 #define grSstOrigin                     trap_grSstOrigin
 #define grSstSelect                     trap_grSstSelect
@@ -304,8 +304,8 @@ void FX_CALL trap_guFogGenerateLinear (GrFog_t *fogtable, float nearZ, float far
 #define guFogGenerateExp                trap_guFogGenerateExp
 #define guFogGenerateExp2               trap_guFogGenerateExp2
 #define guFogGenerateLinear             trap_guFogGenerateLinear
-#endif /* DEBUG_TRAP_internal */
-#endif /* DEBUG_TRAP */
+#endif /* FX_TRAP_GLIDE_internal */
+#endif /* FX_TRAP_GLIDE */
 
 
 
@@ -320,7 +320,7 @@ typedef struct _TxMip {
         void *data[TX_MAX_LEVEL];
         FxU32 pal[256];
 } TxMip;
-typedef void (*TxErrorCallbackFnc_t) (const char *string, FxBool fatal);
+
 #define TX_DITHER_NONE                                  0x00000000
 #define TX_DITHER_4x4                                   0x00000001
 #define TX_DITHER_ERR                                   0x00000002
@@ -335,6 +335,7 @@ struct tdfx_glide {
    /*
    ** glide extensions
    */
+   void (FX_CALL *grSetNumPendingBuffers) (FxI32 NumPendingBuffers);
    char * (FX_CALL *grGetRegistryOrEnvironmentStringExt) (char *theEntry);
    void (FX_CALL *grGetGammaTableExt) (FxU32 nentries, FxU32 *red, FxU32 *green, FxU32 *blue);
    void (FX_CALL *grChromaRangeModeExt) (GrChromakeyMode_t mode);
@@ -376,6 +377,6 @@ struct tdfx_glide {
    void (FX_CALL *txPalToNcc) (GuNccTable *ncc_table, const FxU32 *pal);
 };
 
-void tdfx_hook_glide (struct tdfx_glide *Glide);
+void tdfx_hook_glide (struct tdfx_glide *Glide, int pointcast);
 
 #endif