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

8 files changed, 0 insertions, 24 deletions

diff --git a/src/mesa/drivers/dri/r128/r128_context.h b/src/mesa/drivers/dri/r128/r128_context.h
index 4574f298bf8..e91257f7fc8 100644
--- a/src/mesa/drivers/dri/r128/r128_context.h
+++ b/src/mesa/drivers/dri/r128/r128_context.h
@@ -36,8 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R128_CONTEXT_H__
 #define __R128_CONTEXT_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "dri_util.h"
 #include "drm.h"
 #include "r128_drm.h"
@@ -268,5 +266,4 @@ extern int R128_DEBUG;
 #define DEBUG_VERBOSE_2D	0x40
 #define DEBUG_VERBOSE_FALL	0x80
 
-#endif
 #endif /* __R128_CONTEXT_H__ */
diff --git a/src/mesa/drivers/dri/r128/r128_dd.h b/src/mesa/drivers/dri/r128/r128_dd.h
index 1c8a5030500..7a0abb73f83 100644
--- a/src/mesa/drivers/dri/r128/r128_dd.h
+++ b/src/mesa/drivers/dri/r128/r128_dd.h
@@ -36,9 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R128_DD_H__
 #define __R128_DD_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void r128InitDriverFuncs( struct dd_function_table *functions );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/r128/r128_ioctl.h b/src/mesa/drivers/dri/r128/r128_ioctl.h
index 1ee17cf7c62..d2f2dded8b5 100644
--- a/src/mesa/drivers/dri/r128/r128_ioctl.h
+++ b/src/mesa/drivers/dri/r128/r128_ioctl.h
@@ -35,8 +35,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R128_IOCTL_H__
 #define __R128_IOCTL_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "r128_dri.h"
 #include "r128_reg.h"
 #include "r128_lock.h"
@@ -143,5 +141,4 @@ do {									\
       UNLOCK_HARDWARE( rmesa );						\
    } while (0)
 
-#endif
 #endif /* __R128_IOCTL_H__ */
diff --git a/src/mesa/drivers/dri/r128/r128_lock.h b/src/mesa/drivers/dri/r128/r128_lock.h
index e734ba29def..39bdde98200 100644
--- a/src/mesa/drivers/dri/r128/r128_lock.h
+++ b/src/mesa/drivers/dri/r128/r128_lock.h
@@ -36,8 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R128_LOCK_H__
 #define __R128_LOCK_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void r128GetLock( r128ContextPtr rmesa, GLuint flags );
 
 /* Turn DEBUG_LOCKING on to find locking conflicts.
@@ -107,5 +105,4 @@ extern int prevLockLine;
       DEBUG_RESET();							\
    } while (0)
 
-#endif
 #endif /* __R128_LOCK_H__ */
diff --git a/src/mesa/drivers/dri/r128/r128_screen.h b/src/mesa/drivers/dri/r128/r128_screen.h
index 45e5114e8c8..8db8eea3587 100644
--- a/src/mesa/drivers/dri/r128/r128_screen.h
+++ b/src/mesa/drivers/dri/r128/r128_screen.h
@@ -36,8 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R128_SCREEN_H__
 #define __R128_SCREEN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "xmlconfig.h"
 
 typedef struct {
@@ -83,5 +81,4 @@ typedef struct {
 } r128ScreenRec, *r128ScreenPtr;
 
 
-#endif
 #endif /* __R128_SCREEN_H__ */
diff --git a/src/mesa/drivers/dri/r128/r128_span.h b/src/mesa/drivers/dri/r128/r128_span.h
index 44356c5b241..03de567b32e 100644
--- a/src/mesa/drivers/dri/r128/r128_span.h
+++ b/src/mesa/drivers/dri/r128/r128_span.h
@@ -36,9 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R128_SPAN_H__
 #define __R128_SPAN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void r128DDInitSpanFuncs( GLcontext *ctx );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/r128/r128_state.h b/src/mesa/drivers/dri/r128/r128_state.h
index c51ac239427..ac33853b167 100644
--- a/src/mesa/drivers/dri/r128/r128_state.h
+++ b/src/mesa/drivers/dri/r128/r128_state.h
@@ -36,8 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R128_STATE_H__
 #define __R128_STATE_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "r128_context.h"
 
 extern void r128DDInitState( r128ContextPtr rmesa );
@@ -51,4 +49,3 @@ extern void r128UpdateWindow( GLcontext *ctx );
 extern void r128EmitHwStateLocked( r128ContextPtr rmesa );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/r128/r128_tex.h b/src/mesa/drivers/dri/r128/r128_tex.h
index d6d2aeff954..54053b8b315 100644
--- a/src/mesa/drivers/dri/r128/r128_tex.h
+++ b/src/mesa/drivers/dri/r128/r128_tex.h
@@ -36,8 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R128_TEX_H__
 #define __R128_TEX_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void r128UpdateTextureState( GLcontext *ctx );
 
 extern void r128UploadTexImages( r128ContextPtr rmesa, r128TexObjPtr t );
@@ -84,5 +82,4 @@ static __inline__ u_int32_t r128PackColor( GLuint cpp,
     }
 }
 
-#endif
 #endif /* __R128_TEX_H__ */