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

11 files changed, 0 insertions, 38 deletions

diff --git a/src/mesa/drivers/dri/r200/r200_context.h b/src/mesa/drivers/dri/r200/r200_context.h
index bb5a3cf30dc..cedf1b974f1 100644
--- a/src/mesa/drivers/dri/r200/r200_context.h
+++ b/src/mesa/drivers/dri/r200/r200_context.h
@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_CONTEXT_H__
 #define __R200_CONTEXT_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "tnl/t_vertex.h"
 #include "drm.h"
 #include "radeon_drm.h"
@@ -990,5 +988,4 @@ extern int R200_DEBUG;
 #define DEBUG_PIXEL     0x2000
 #define DEBUG_MEMORY    0x4000
 
-#endif
 #endif /* __R200_CONTEXT_H__ */
diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.h b/src/mesa/drivers/dri/r200/r200_ioctl.h
index 939dab36853..8927acd7faa 100644
--- a/src/mesa/drivers/dri/r200/r200_ioctl.h
+++ b/src/mesa/drivers/dri/r200/r200_ioctl.h
@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_IOCTL_H__
 #define __R200_IOCTL_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "simple_list.h"
 #include "radeon_dri.h"
 #include "r200_lock.h"
@@ -214,8 +212,4 @@ static __inline char *r200AllocCmdBuf( r200ContextPtr rmesa,
    return head;
 }
 
-
-
-
-#endif
 #endif /* __R200_IOCTL_H__ */
diff --git a/src/mesa/drivers/dri/r200/r200_lock.h b/src/mesa/drivers/dri/r200/r200_lock.h
index 587e4fe5ccd..e4c3a7e9352 100644
--- a/src/mesa/drivers/dri/r200/r200_lock.h
+++ b/src/mesa/drivers/dri/r200/r200_lock.h
@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_LOCK_H__
 #define __R200_LOCK_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void r200GetLock( r200ContextPtr rmesa, GLuint flags );
 
 /* Turn DEBUG_LOCKING on to find locking conflicts.
@@ -106,5 +104,4 @@ extern int prevLockLine;
       DEBUG_RESET();							\
    } while (0)
 
-#endif
 #endif /* __R200_LOCK_H__ */
diff --git a/src/mesa/drivers/dri/r200/r200_maos.h b/src/mesa/drivers/dri/r200/r200_maos.h
index a430497db98..b9e4d3c2392 100644
--- a/src/mesa/drivers/dri/r200/r200_maos.h
+++ b/src/mesa/drivers/dri/r200/r200_maos.h
@@ -36,12 +36,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_MAOS_H__
 #define __R200_MAOS_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "r200_context.h"
 
 extern void r200EmitArrays( GLcontext *ctx, GLuint inputs );
 extern void r200ReleaseArrays( GLcontext *ctx, GLuint newinputs );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/r200/r200_pixel.h b/src/mesa/drivers/dri/r200/r200_pixel.h
index 9282d2b147d..8f3923b6b16 100644
--- a/src/mesa/drivers/dri/r200/r200_pixel.h
+++ b/src/mesa/drivers/dri/r200/r200_pixel.h
@@ -35,9 +35,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_PIXEL_H__
 #define __R200_PIXEL_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void r200InitPixelFuncs( GLcontext *ctx );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/r200/r200_screen.h b/src/mesa/drivers/dri/r200/r200_screen.h
index 42200f8962b..fa8c33faadf 100644
--- a/src/mesa/drivers/dri/r200/r200_screen.h
+++ b/src/mesa/drivers/dri/r200/r200_screen.h
@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_SCREEN_H__
 #define __R200_SCREEN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "xf86drm.h"
 #include "drm.h"
 #include "radeon_drm.h"
@@ -103,5 +101,4 @@ typedef struct {
    driOptionCache optionCache;
 } r200ScreenRec, *r200ScreenPtr;
 
-#endif
 #endif /* __R200_SCREEN_H__ */
diff --git a/src/mesa/drivers/dri/r200/r200_span.h b/src/mesa/drivers/dri/r200/r200_span.h
index 72911e9455c..9ddf245b636 100644
--- a/src/mesa/drivers/dri/r200/r200_span.h
+++ b/src/mesa/drivers/dri/r200/r200_span.h
@@ -36,9 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_SPAN_H__
 #define __R200_SPAN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void r200InitSpanFuncs( GLcontext *ctx );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/r200/r200_state.h b/src/mesa/drivers/dri/r200/r200_state.h
index 9d9de8e9a28..d467d73bd80 100644
--- a/src/mesa/drivers/dri/r200/r200_state.h
+++ b/src/mesa/drivers/dri/r200/r200_state.h
@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_STATE_H__
 #define __R200_STATE_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "r200_context.h"
 
 extern void r200InitState( r200ContextPtr rmesa );
@@ -67,4 +65,3 @@ extern void r200Fallback( GLcontext *ctx, GLuint bit, GLboolean mode );
 extern void r200LightingSpaceChange( GLcontext *ctx );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/r200/r200_tcl.h b/src/mesa/drivers/dri/r200/r200_tcl.h
index 7dd43bf7fac..ac5bc119468 100644
--- a/src/mesa/drivers/dri/r200/r200_tcl.h
+++ b/src/mesa/drivers/dri/r200/r200_tcl.h
@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_TCL_H__
 #define __R200_TCL_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "r200_context.h"
 
 extern void r200TclPrimitive( GLcontext *ctx, GLenum prim, int hw_prim );
@@ -68,6 +66,4 @@ extern float r200ComputeFogBlendFactor( GLcontext *ctx, GLfloat fogcoord );
 
 #define TCL_FALLBACK( ctx, bit, mode )	r200TclFallback( ctx, bit, mode )
 
-
-#endif
 #endif
diff --git a/src/mesa/drivers/dri/r200/r200_tex.h b/src/mesa/drivers/dri/r200/r200_tex.h
index 7c507a7fd0b..acabbc11bd1 100644
--- a/src/mesa/drivers/dri/r200/r200_tex.h
+++ b/src/mesa/drivers/dri/r200/r200_tex.h
@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_TEX_H__
 #define __R200_TEX_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void r200UpdateTextureState( GLcontext *ctx );
 
 extern int r200UploadTexImages( r200ContextPtr rmesa, r200TexObjPtr t, GLuint face );
@@ -46,5 +44,4 @@ extern void r200DestroyTexObj( r200ContextPtr rmesa, r200TexObjPtr t );
 
 extern void r200InitTextureFuncs( struct dd_function_table *functions );
 
-#endif
 #endif /* __R200_TEX_H__ */
diff --git a/src/mesa/drivers/dri/r200/r200_vtxfmt.h b/src/mesa/drivers/dri/r200/r200_vtxfmt.h
index 071a74082ff..82cbda2742b 100644
--- a/src/mesa/drivers/dri/r200/r200_vtxfmt.h
+++ b/src/mesa/drivers/dri/r200/r200_vtxfmt.h
@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_VTXFMT_H__
 #define __R200_VTXFMT_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "r200_context.h"
 
 
@@ -122,6 +120,4 @@ struct dynfn *r200_makeX86MultiTexCoord2fvARB( GLcontext *, const int * );
 struct dynfn *r200_makeX86MultiTexCoord1fARB( GLcontext *, const int * );
 struct dynfn *r200_makeX86MultiTexCoord1fvARB( GLcontext *, const int * );
 
-
-#endif
 #endif