From c3ded1b33da5a48a4c70d07bb23b479a8daacff7 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Sun, 23 Feb 2003 19:38:23 +0000
Subject: [PATCH] clean up header usage

---
 src/mesa/drivers/dri/radeon/radeon_context.c | 59 ++------------------
 src/mesa/drivers/dri/radeon/radeon_context.h |  4 ++
 src/mesa/drivers/dri/radeon/radeon_ioctl.c   |  1 -
 src/mesa/drivers/dri/radeon/radeon_lock.c    |  1 -
 src/mesa/drivers/dri/radeon/radeon_state.c   |  3 -
 5 files changed, 10 insertions(+), 58 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c
index 96be52fa882..41b28e04d51 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -46,10 +46,14 @@
 #include "radeon_context.h"
 #include "radeon_ioctl.h"
 #include "radeon_state.h"
-#include "radeon_subset.h"
-#include "radeon_tex.h"
+
+#if _HAVE_FULL_GL
 #include "radeon_tcl.h"
 #include "radeon_vtxfmt.h"
+#include "radeon_tex.h"
+#else
+#include "radeon_subset.h"
+#endif
 
 #if defined(USE_X86_ASM)
 #include "X86/common_x86_asm.h"
@@ -110,57 +114,6 @@ static const GLubyte *radeonGetString( GLcontext *ctx, GLenum name )
    case GL_RENDERER:
       sprintf( buffer, "Mesa DRI Radeon SUBSET " RADEON_DATE);
 
-      /* Append any chipset-specific information.  None yet.
-       */
-
-      /* Append any AGP-specific information.
-       */
-      switch ( rmesa->radeonScreen->AGPMode ) {
-      case 1:
-	 strncat( buffer, " AGP 1x", 7 );
-	 break;
-      case 2:
-	 strncat( buffer, " AGP 2x", 7 );
-	 break;
-      case 4:
-	 strncat( buffer, " AGP 4x", 7 );
-	 break;
-      }
-
-      /* Append any CPU-specific information.
-       */
-#ifdef USE_X86_ASM
-      if ( _mesa_x86_cpu_features ) {
-	 strncat( buffer, " x86", 4 );
-      }
-#ifdef USE_MMX_ASM
-      if ( cpu_has_mmx ) {
-	 strncat( buffer, "/MMX", 4 );
-      }
-#endif
-#ifdef USE_3DNOW_ASM
-      if ( cpu_has_3dnow ) {
-	 strncat( buffer, "/3DNow!", 7 );
-      }
-#endif
-#ifdef USE_SSE_ASM
-      if ( cpu_has_xmm ) {
-	 strncat( buffer, "/SSE", 4 );
-      }
-#endif
-#endif
-
-      if ( rmesa->dri.drmMinor < 3 ) {
-	 strncat( buffer, " DRM-COMPAT", 11 );
-      }
-	 
-      if ( !(rmesa->TclFallback & RADEON_TCL_FALLBACK_TCL_DISABLE) ) {
-	 strncat( buffer, " TCL", 4 );
-      }
-      else {
-	 strncat( buffer, " NO-TCL", 7 );
-      }
-
       return (GLubyte *)buffer;
 
    default:
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.h b/src/mesa/drivers/dri/radeon/radeon_context.h
index 9e06309ca5f..9c1f5674205 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.h
+++ b/src/mesa/drivers/dri/radeon/radeon_context.h
@@ -439,8 +439,12 @@ struct radeon_hw_state {
    struct radeon_state_atom zbs;
    struct radeon_state_atom mtl; 
    struct radeon_state_atom mat[5];	/**< \brief matrix transformations */
+#if _HAVE_LIGHTING
    struct radeon_state_atom lit[8];	/**< \brief includes vec, scl commands */
+#endif
+#if _HAVE_USERCLIP
    struct radeon_state_atom ucp[6];
+#endif
    struct radeon_state_atom eye;	/**< \brief eye pos */
    struct radeon_state_atom grd;	/**< \brief guard band clipping */
    struct radeon_state_atom fog;	/**< \brief fog */
diff --git a/src/mesa/drivers/dri/radeon/radeon_ioctl.c b/src/mesa/drivers/dri/radeon/radeon_ioctl.c
index c45c10fcad7..610d262a5f9 100644
--- a/src/mesa/drivers/dri/radeon/radeon_ioctl.c
+++ b/src/mesa/drivers/dri/radeon/radeon_ioctl.c
@@ -41,7 +41,6 @@
 #include "radeon_context.h"
 #include "radeon_state.h"
 #include "radeon_ioctl.h"
-#include "radeon_tcl.h"
 #include "radeon_macros.h"  /* for INREG() */
 #include <unistd.h>  /* for usleep() */
 #include <errno.h>
diff --git a/src/mesa/drivers/dri/radeon/radeon_lock.c b/src/mesa/drivers/dri/radeon/radeon_lock.c
index bc4c617d6be..d1c0b7f87ea 100644
--- a/src/mesa/drivers/dri/radeon/radeon_lock.c
+++ b/src/mesa/drivers/dri/radeon/radeon_lock.c
@@ -37,7 +37,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "glheader.h"
 #include "radeon_context.h"
 #include "radeon_lock.h"
-#include "radeon_tex.h"
 #include "radeon_state.h"
 #include "radeon_ioctl.h"
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c
index 29d0b931ea5..aa2a73da0ed 100644
--- a/src/mesa/drivers/dri/radeon/radeon_state.c
+++ b/src/mesa/drivers/dri/radeon/radeon_state.c
@@ -53,9 +53,6 @@
 #include "radeon_context.h"
 #include "radeon_ioctl.h"
 #include "radeon_state.h"
-#include "radeon_tcl.h"
-#include "radeon_tex.h"
-#include "radeon_vtxfmt.h"
 
 
 #define MODEL_PROJ 0