Bug #2428: #ifdef GLX_DIRECT_RENDERING in DRI drivers is pointless.

9 files changed, 0 insertions, 27 deletions

diff --git a/src/mesa/drivers/dri/mach64/mach64_context.h b/src/mesa/drivers/dri/mach64/mach64_context.h
index 9edd5867c0..d82fca5aa8 100644
--- a/src/mesa/drivers/dri/mach64/mach64_context.h
+++ b/src/mesa/drivers/dri/mach64/mach64_context.h
@@ -32,8 +32,6 @@
 #ifndef __MACH64_CONTEXT_H__
 #define __MACH64_CONTEXT_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "dri_util.h"
 #include "drm.h"
 #include "mach64_drm.h"
@@ -403,5 +401,4 @@ extern int MACH64_DEBUG;
 #define DEBUG_VERBOSE_PRIMS	0x040
 #define DEBUG_VERBOSE_COUNT	0x080
 #define DEBUG_NOWAIT		0x100
-#endif
 #endif /* __MACH64_CONTEXT_H__ */
diff --git a/src/mesa/drivers/dri/mach64/mach64_dd.h b/src/mesa/drivers/dri/mach64/mach64_dd.h
index 92b10c6078..74cf1d304f 100644
--- a/src/mesa/drivers/dri/mach64/mach64_dd.h
+++ b/src/mesa/drivers/dri/mach64/mach64_dd.h
@@ -31,9 +31,6 @@
 #ifndef __MACH64_DD_H__
 #define __MACH64_DD_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void mach64InitDriverFuncs( struct dd_function_table *functions );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/mach64/mach64_ioctl.h b/src/mesa/drivers/dri/mach64/mach64_ioctl.h
index d78fac4111..8bd958531c 100644
--- a/src/mesa/drivers/dri/mach64/mach64_ioctl.h
+++ b/src/mesa/drivers/dri/mach64/mach64_ioctl.h
@@ -32,8 +32,6 @@
 #ifndef __MACH64_IOCTL_H__
 #define __MACH64_IOCTL_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "mach64_dri.h"
 #include "mach64_reg.h"
 #include "mach64_lock.h"
@@ -147,5 +145,4 @@ do {						\
 } while (0)
 
 
-#endif
 #endif /* __MACH64_IOCTL_H__ */
diff --git a/src/mesa/drivers/dri/mach64/mach64_lock.h b/src/mesa/drivers/dri/mach64/mach64_lock.h
index 3a77c1c690..973880ee25 100644
--- a/src/mesa/drivers/dri/mach64/mach64_lock.h
+++ b/src/mesa/drivers/dri/mach64/mach64_lock.h
@@ -31,8 +31,6 @@
 #ifndef __MACH64_LOCK_H__
 #define __MACH64_LOCK_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void mach64GetLock( mach64ContextPtr mmesa, GLuint flags );
 
 
@@ -103,5 +101,4 @@ extern int   prevLockLine;
       DEBUG_RESET();							\
    } while (0)
 
-#endif
 #endif /* __MACH64_LOCK_H__ */
diff --git a/src/mesa/drivers/dri/mach64/mach64_reg.h b/src/mesa/drivers/dri/mach64/mach64_reg.h
index 2fd31de6c7..abbba295a5 100644
--- a/src/mesa/drivers/dri/mach64/mach64_reg.h
+++ b/src/mesa/drivers/dri/mach64/mach64_reg.h
@@ -32,8 +32,6 @@
 #ifndef __MACH64_REG_H__
 #define __MACH64_REG_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 /*
  * Not sure how this compares with the G200, but the Rage Pro has two
  * banks of registers, with bank 0 at (aperture base + memmap offset - 1KB)
@@ -405,5 +403,4 @@
 #define MACH64_LAST_FRAME_REG			MACH64_PAT_REG0
 #define MACH64_LAST_DISPATCH_REG		MACH64_PAT_REG1
 
-#endif
 #endif /* __MACH64_REG_H__ */
diff --git a/src/mesa/drivers/dri/mach64/mach64_screen.h b/src/mesa/drivers/dri/mach64/mach64_screen.h
index 298c0e6c83..5305058e2f 100644
--- a/src/mesa/drivers/dri/mach64/mach64_screen.h
+++ b/src/mesa/drivers/dri/mach64/mach64_screen.h
@@ -32,8 +32,6 @@
 #ifndef __MACH64_SCREEN_H__
 #define __MACH64_SCREEN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "xmlconfig.h"
 
 typedef struct {
@@ -77,5 +75,4 @@ typedef struct {
    driOptionCache optionCache;
 } mach64ScreenRec, *mach64ScreenPtr;
 
-#endif
 #endif /* __MACH64_SCREEN_H__ */
diff --git a/src/mesa/drivers/dri/mach64/mach64_span.h b/src/mesa/drivers/dri/mach64/mach64_span.h
index 52883ba1e9..b83ac7c721 100644
--- a/src/mesa/drivers/dri/mach64/mach64_span.h
+++ b/src/mesa/drivers/dri/mach64/mach64_span.h
@@ -31,9 +31,6 @@
 #ifndef __MACH64_SPAN_H__
 #define __MACH64_SPAN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void mach64DDInitSpanFuncs( GLcontext *ctx );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/mach64/mach64_state.h b/src/mesa/drivers/dri/mach64/mach64_state.h
index 41d78716f5..95bcab3653 100644
--- a/src/mesa/drivers/dri/mach64/mach64_state.h
+++ b/src/mesa/drivers/dri/mach64/mach64_state.h
@@ -31,8 +31,6 @@
 #ifndef __MACH64_STATE_H__
 #define __MACH64_STATE_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "mach64_context.h"
 
 extern void mach64DDInitState( mach64ContextPtr mmesa );
@@ -47,4 +45,3 @@ extern void mach64DDUpdateHWState( GLcontext *ctx );
 extern void mach64EmitHwStateLocked( mach64ContextPtr mmesa );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/mach64/mach64_tex.h b/src/mesa/drivers/dri/mach64/mach64_tex.h
index acae887d30..d950dd12b4 100644
--- a/src/mesa/drivers/dri/mach64/mach64_tex.h
+++ b/src/mesa/drivers/dri/mach64/mach64_tex.h
@@ -32,8 +32,6 @@
 #ifndef __MACH64_TEX_H__
 #define __MACH64_TEX_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void mach64UpdateTextureState( GLcontext *ctx );
 
 extern void mach64SwapOutTexObj( mach64ContextPtr mach64ctx,
@@ -99,4 +97,3 @@ static __inline__ GLuint mach64PackColor( GLuint cpp,
 }
 
 #endif
-#endif