From: Eric Anholt <eric@anholt.net>
Date: Wed, 5 May 2010 04:19:55 +0000 (-0700)
Subject: intel: Don't tile textures so small that size is blown up by over 2x.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=453f0b1f243b26e02b371293e9c8bbf09362c14a;p=mesa.git

intel: Don't tile textures so small that size is blown up by over 2x.

Noted on the mailing list for an app that puts each glyph for its text
into a separate texture.
---

diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index ef1966ea7e1..71ef7a8e39b 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -116,17 +116,16 @@ intel_miptree_create(struct intel_context *intel,
 		     GLboolean expect_accelerated_upload)
 {
    struct intel_mipmap_tree *mt;
-   uint32_t tiling;
+   uint32_t tiling = I915_TILING_NONE;
 
    if (intel->use_texture_tiling && compress_byte == 0) {
       if (intel->gen >= 4 &&
 	  (base_format == GL_DEPTH_COMPONENT ||
 	   base_format == GL_DEPTH_STENCIL_EXT))
 	 tiling = I915_TILING_Y;
-      else
+      else if (width0 >= 64)
 	 tiling = I915_TILING_X;
-   } else
-      tiling = I915_TILING_NONE;
+   }
 
    mt = intel_miptree_create_internal(intel, target, internal_format,
 				      first_level, last_level, width0,