diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_context.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_context.h | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_texstate.c | 3 | 
3 files changed, 1 insertions, 5 deletions
| diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c index 4407f8c4b5..4ddf024468 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 bae188397d..8630c9edda 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 7bd7cf22e8..49231d415f 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)) { | 
