9 files changed, 0 insertions, 31 deletions
diff --git a/src/mesa/drivers/dri/tdfx/dri_glide.h b/src/mesa/drivers/dri/tdfx/dri_glide.h
index df5a3ca24b..52a53f7dd3 100644
--- a/src/mesa/drivers/dri/tdfx/dri_glide.h
+++ b/src/mesa/drivers/dri/tdfx/dri_glide.h
@@ -37,8 +37,6 @@
 #ifndef __DRI_GLIDE_H__
 #define __DRI_GLIDE_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include <glide.h>
 #include "dri_mesaint.h"
 
@@ -60,4 +58,3 @@ extern void grDRIInvalidateAll( void );
 extern void grDRIResetSAREA( void );
 extern void grDRIBufferSwap( FxU32 swapInterval );
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.h b/src/mesa/drivers/dri/tdfx/tdfx_context.h
index 5af5a3d16a..7d18e77c4d 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_context.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_context.h
@@ -40,8 +40,6 @@
 #ifndef __TDFX_CONTEXT_H__
 #define __TDFX_CONTEXT_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include <sys/time.h>
 #include "dri_util.h"
 #ifdef XFree86Server
@@ -1005,6 +1003,4 @@ extern int TDFX_DEBUG;
 #define FX_COMPRESS_S3TC_AS_FXT1_HACK 1
 #define FX_TC_NAPALM 0
 
-#endif /* GLX_DIRECT_RENDERING */
-
 #endif /* __TDFX_CONTEXT_H__ */
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_dd.h b/src/mesa/drivers/dri/tdfx/tdfx_dd.h
index e49d8e2a33..5ceba9d5f0 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_dd.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_dd.h
@@ -37,12 +37,9 @@
 #ifndef __TDFX_DD_H__
 #define __TDFX_DD_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "context.h"
 
 extern void tdfxDDInitDriverFuncs( const __GLcontextModes *visual,
                                    struct dd_function_table *functions );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_lock.h b/src/mesa/drivers/dri/tdfx/tdfx_lock.h
index 90d4937628..616e65b2a1 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_lock.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_lock.h
@@ -37,8 +37,6 @@
 #ifndef __TDFX_LOCK_H__
 #define __TDFX_LOCK_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 /* You can turn this on to find locking conflicts.
  */
 #define DEBUG_LOCKING		0
@@ -143,7 +141,4 @@ extern void tdfxGetLock( tdfxContextPtr fxMesa );
     UNLOCK_HARDWARE( fxMesa );			\
   } while (0)
 
-
-#endif /* GLX_DIRECT_RENDERING */
-
 #endif /* __TDFX_LOCK_H__ */
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_pixels.h b/src/mesa/drivers/dri/tdfx/tdfx_pixels.h
index 93b7b8874f..c38ce070ca 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_pixels.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_pixels.h
@@ -39,8 +39,6 @@
 #ifndef __TDFX_PIXELS_H__
 #define __TDFX_PIXELS_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "context.h"
 
 extern void
@@ -77,4 +75,3 @@ tdfx_drawpixels_R8G8B8A8( GLcontext *ctx, GLint x, GLint y,
 			  const GLvoid *pixels );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_render.h b/src/mesa/drivers/dri/tdfx/tdfx_render.h
index 395e09f7e9..09d0d90197 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_render.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_render.h
@@ -37,8 +37,6 @@
 #ifndef __TDFX_RENDER_H__
 #define __TDFX_RENDER_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "tdfx_context.h"
 
 extern void tdfxInitRenderFuncs( struct dd_function_table *functions );
@@ -49,6 +47,4 @@ extern void tdfxUploadClipping( tdfxContextPtr fxMesa );
 
 #define FLUSH_BATCH( fxMesa )
 
-
-#endif
 #endif
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_screen.h b/src/mesa/drivers/dri/tdfx/tdfx_screen.h
index 3faeb84e75..f6c2e8ee3a 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_screen.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_screen.h
@@ -37,8 +37,6 @@
 #ifndef __TDFX_SCREEN_H__
 #define __TDFX_SCREEN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 typedef struct {
    drm_handle_t handle;
    drmSize size;
@@ -70,4 +68,3 @@ typedef struct {
 
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_span.h b/src/mesa/drivers/dri/tdfx/tdfx_span.h
index 8373d1af40..a95aad5dbf 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_span.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_span.h
@@ -38,11 +38,8 @@
 #ifndef __TDFX_SPAN_H__
 #define __TDFX_SPAN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "context.h"
 
 extern void tdfxDDInitSpanFuncs( GLcontext *ctx );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_state.h b/src/mesa/drivers/dri/tdfx/tdfx_state.h
index 5e59a16016..b10c38f591 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_state.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_state.h
@@ -38,8 +38,6 @@
 #ifndef __TDFX_STATE_H__
 #define __TDFX_STATE_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "context.h"
 #include "tdfx_context.h"
 
@@ -61,4 +59,3 @@ extern void tdfxUpdateViewport( GLcontext *ctx );
 
 
 #endif
-#endif