util: rename xmlpool.h to driconf.h

[mesa.git] / src / mesa / drivers / dri / r200 / r200_context.c

diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index 4db7e9d005a3be81771f00860a4e35acf4ad3d93..ab0c6c9d38e8ddcb130d643d26c8e26305083741 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -37,7 +37,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/api_arrayelt.h"
 #include "main/api_exec.h"
 #include "main/context.h"
-#include "main/imports.h"
+
 #include "main/extensions.h"
 #include "main/version.h"
 #include "main/vtxfmt.h"
@@ -65,7 +65,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "radeon_span.h"
 
 #include "utils.h"
-#include "util/xmlpool.h" /* for symbolic values of enum-type options */
+#include "util/driconf.h" /* for symbolic values of enum-type options */
 
 /* Return various strings for glGetString().
  */
@@ -103,7 +103,7 @@ static const struct tnl_pipeline_stage *r200_pipeline[] = {
 
    /* Try and go straight to t&l
     */
-   &_r200_tcl_stage,  
+   &_r200_tcl_stage,
 
    /* Catch any t&l fallbacks
     */
@@ -115,7 +115,7 @@ static const struct tnl_pipeline_stage *r200_pipeline[] = {
    &_tnl_texture_transform_stage,
    &_tnl_point_attenuation_stage,
    &_tnl_vertex_program_stage,
-   /* Try again to go to tcl? 
+   /* Try again to go to tcl?
     *     - no good for asymmetric-twoside (do with multipass)
     *     - no good for asymmetric-unfilled (do with multipass)
     *     - good for material
@@ -124,7 +124,7 @@ static const struct tnl_pipeline_stage *r200_pipeline[] = {
     *
     * - worth it/not worth it?
     */
-                       
+
    /* Else do them here.
     */
 /*    &_r200_render_stage,  */ /* FIXME: bugs with ut2003 */
@@ -266,7 +266,7 @@ GLboolean r200CreateContext( gl_api api,
 
    ctx->Const.StripTextureBorder = GL_TRUE;
 
-   /* FIXME: When no memory manager is available we should set this 
+   /* FIXME: When no memory manager is available we should set this
     * to some reasonable value based on texture memory pool size */
    ctx->Const.MaxTextureSize = 2048;
    ctx->Const.Max3DTextureLevels = 9;
@@ -378,7 +378,7 @@ GLboolean r200CreateContext( gl_api api,
    r200InitState( rmesa );
    r200InitSwtcl( ctx );
 
-   rmesa->prefer_gart_client_texturing = 
+   rmesa->prefer_gart_client_texturing =
       (getenv("R200_GART_CLIENT_TEXTURES") != 0);
 
    tcl_mode = driQueryOptioni(&rmesa->radeon.optionCache, "tcl_mode");