r300: Removed the "texmicrotile" variable; the tiling code is disabled via a

compiler conditional anyway; probably broken?

diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index 4407f8c4b581d83937ce3f40f7d8be6a90d4da55..4ddf024468017104f9c0a84a39b00f4d2db41704 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -200,8 +200,6 @@ GLboolean r300CreateContext(const __GLcontextModes * glVisual,
        r300->initialMaxAnisotropy = driQueryOptionf(&r300->radeon.optionCache,
                                                     "def_max_anisotropy");
 
-       //r300->texmicrotile = GL_TRUE;
-
        /* Init default driver functions then plug in our R300-specific functions
         * (the texture functions are especially important)
         */

diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index bae188397d2222c1f3e7ccb2bd6556b27f4a3425..8630c9edda5c687480068250c5e1bce1e06c9a64 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -869,7 +869,6 @@ struct r300_context {
        GLvector4f *temp_attrib[_TNL_ATTRIB_MAX];
 #endif
 
-       GLboolean texmicrotile;
        GLboolean disable_lowimpact_fallback;
 };
 

diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c
index 7bd7cf22e898d9a998b5e10419b195828e639c2c..49231d415f52becd399b48f6d8b891d5241bb041 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_texstate.c
+++ b/src/mesa/drivers/dri/r300/r300_texstate.c
@@ -221,8 +221,7 @@ static void r300SetTexImages(r300ContextPtr rmesa,
        /* figure out if this texture is suitable for tiling. */
 #if 0                          /* Disabled for now */
        if (texelBytes) {
-               if (rmesa->texmicrotile
-                   && (tObj->Target != GL_TEXTURE_RECTANGLE_NV) &&
+               if ((tObj->Target != GL_TEXTURE_RECTANGLE_NV) &&
                    /* texrect might be able to use micro tiling too in theory? */
                    (baseImage->Height > 1)) {