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

6 files changed, 3 insertions, 20 deletions

diff --git a/src/mesa/drivers/dri/sis/sis_common2.h b/src/mesa/drivers/dri/sis/sis_common2.h
index 40ae451be5..c52abd5e51 100644
--- a/src/mesa/drivers/dri/sis/sis_common2.h
+++ b/src/mesa/drivers/dri/sis/sis_common2.h
@@ -44,10 +44,9 @@ extern void *sis_debug_malloc(int x);
 #include "sis_debug.h"
 #endif
 
-#ifdef GLX_DIRECT_RENDERING
-# include <stdio.h>
-# include <stdlib.h>
-# include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 typedef struct _Box
 {
   short x1, y1, x2, y2;
@@ -55,7 +54,6 @@ typedef struct _Box
 BoxRec;
 #define NullBox ((BoxPtr)0)
 typedef struct _Box *BoxPtr;
-#endif /* GLX_DIRECT_RENDERING */
 
 /* BitBlt Commands */
 #define CMD0_DD_ENABLE      0x06
diff --git a/src/mesa/drivers/dri/sis/sis_dd.h b/src/mesa/drivers/dri/sis/sis_dd.h
index a016bf8b26..da76596e92 100644
--- a/src/mesa/drivers/dri/sis/sis_dd.h
+++ b/src/mesa/drivers/dri/sis/sis_dd.h
@@ -32,11 +32,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __SIS_DD_H__
 #define __SIS_DD_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void sisUpdateBufferSize( sisContextPtr smesa );
 
 extern void sisInitDriverFuncs( struct dd_function_table *functions );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/sis/sis_span.h b/src/mesa/drivers/dri/sis/sis_span.h
index d95a0eef30..c9760e4d26 100644
--- a/src/mesa/drivers/dri/sis/sis_span.h
+++ b/src/mesa/drivers/dri/sis/sis_span.h
@@ -32,12 +32,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __SIS_SPAN_H__
 #define __SIS_SPAN_H__
  
-#ifdef GLX_DIRECT_RENDERING
-
 extern void sisSpanRenderStart( GLcontext *ctx );
 extern void sisSpanRenderFinish( GLcontext *ctx );
 
 extern void sisDDInitSpanFuncs( GLcontext *ctx );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/sis/sis_state.h b/src/mesa/drivers/dri/sis/sis_state.h
index b7251157fb..770ba478a4 100644
--- a/src/mesa/drivers/dri/sis/sis_state.h
+++ b/src/mesa/drivers/dri/sis/sis_state.h
@@ -32,8 +32,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __SIS_STATE_H__
 #define __SIS_STATE_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "sis_context.h"
 
 extern void sisDDInitState( sisContextPtr smesa );
@@ -54,4 +52,3 @@ extern void sisDDDrawBuffer( GLcontext *ctx, GLenum mode );
 extern void sisUpdateHWState( GLcontext *ctx );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/sis/sis_stencil.h b/src/mesa/drivers/dri/sis/sis_stencil.h
index db6098ff04..4a36c98f3d 100644
--- a/src/mesa/drivers/dri/sis/sis_stencil.h
+++ b/src/mesa/drivers/dri/sis/sis_stencil.h
@@ -32,9 +32,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __SIS_STENCIL_H__
 #define __SIS_STENCIL_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void sisDDInitStencilFuncs( GLcontext *ctx );
 
 #endif
-#endif
diff --git a/src/mesa/drivers/dri/sis/sis_tex.h b/src/mesa/drivers/dri/sis/sis_tex.h
index 2349824885..8ddc7c469e 100644
--- a/src/mesa/drivers/dri/sis/sis_tex.h
+++ b/src/mesa/drivers/dri/sis/sis_tex.h
@@ -32,10 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __SIS_TEX_H__
 #define __SIS_TEX_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void sisInitTextureFuncs( struct dd_function_table *table );
 extern void sisUpdateTextureState( GLcontext *ctx );
 
-#endif /* GLX_DIRECT_RENDERING */
 #endif /* __SIS_TEX_H__ */