From: Eric Anholt Date: Mon, 6 May 2013 21:14:39 +0000 (-0700) Subject: i965: Use Y-tiled blits to untile for cached mappings of miptrees. X-Git-Tag: android-x86-4.4-r3~11734 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3f09e528d59127a2552ea4802937c39e87c3288e;p=android-x86%2Fexternal-mesa.git i965: Use Y-tiled blits to untile for cached mappings of miptrees. Fixes a regression in firefox's unaccelerated compositing path for WebGL with the introduction of Y tiling. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64213 Reviewed-by: Kenneth Graunke --- diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c index 89702282576..7f4cb4acc2f 100644 --- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c @@ -1903,7 +1903,8 @@ intel_miptree_map_singlesample(struct intel_context *intel, else if (intel->has_llc && !(mode & GL_MAP_WRITE_BIT) && !mt->compressed && - mt->region->tiling == I915_TILING_X && + (mt->region->tiling == I915_TILING_X || + (intel->gen >= 6 && mt->region->tiling == I915_TILING_Y)) && mt->region->pitch < 32768) { intel_miptree_map_blit(intel, mt, map, level, slice); } else if (mt->region->tiling != I915_TILING_NONE &&