From: Oliver McFadden <z3ro.geek@gmail.com>
Date: Wed, 9 May 2007 21:44:07 +0000 (+0000)
Subject: r300: Removed the "texmicrotile" variable; the tiling code is disabled via a
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=672ecba175d4062b983031df15b686ee39f45d17;p=mesa.git

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 4407f8c4b58..4ddf0244680 100644
--- 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 bae188397d2..8630c9edda5 100644
--- 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 7bd7cf22e89..49231d415f5 100644
--- 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)) {