cc: Avoid power of two textures.

cc/picture_layer_impl.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/picture_layer_impl.h"
 
 #include "base/time.h"
 #include "cc/append_quads_data.h"
 #include "cc/checkerboard_draw_quad.h"
 #include "cc/debug_border_draw_quad.h"
@@ skipping 342 matching lines @@
 
   // If long and skinny, tile at the max untiled content size, and clamp
   // the smaller dimension to the content size, e.g. 1000x12 layer with
   // 500x500 max untiled size would get 500x12 tiles.  Also do this
   // if the layer is small.
   if (any_dimension_one_tile || !any_dimension_too_large) {
     int width =
         std::min(max_untiled_content_size.width(), content_bounds.width());
     int height =
         std::min(max_untiled_content_size.height(), content_bounds.height());
-    // Round width and height up to the closest multiple of 64.  This is to
-    // help IMG drivers where facter of 8 texture sizes are faster, and also
-    // to prevent creating textures of too many different size for better
-    // recycling.
-    width = RoundUp(width, 64);
-    height = RoundUp(height, 64);
+    // Round width and height up to the closest multiple of 64, or 56 if
+    // we should avoid power-of-two textures. This helps reduce the number
+    // of different textures sizes to help recycling, and also keeps all
+    // textures multiple-of-eight, which is preferred on some drivers (IMG).
+    bool avoidPow2 = layerTreeImpl()->rendererCapabilities().avoidPow2Textures;
+    int roundUpTo = avoidPow2 ? 56 : 64;
+    width = RoundUp(width, roundUpTo);
+    height = RoundUp(height, roundUpTo);
     return gfx::Size(width, height);
   }
 
   return default_tile_size;
 }
 
 void PictureLayerImpl::SyncFromActiveLayer() {
   DCHECK(layerTreeImpl()->IsPendingTree());
   if (!drawsContent())
     return;
@@ skipping 334 matching lines @@
   return twin;
 }
 
 void PictureLayerImpl::getDebugBorderProperties(
     SkColor* color, float* width) const {
   *color = DebugColors::TiledContentLayerBorderColor();
   *width = DebugColors::TiledContentLayerBorderWidth(layerTreeImpl());
 }
 
 }  // namespace cc