Index: cc/layers/picture_layer_impl.cc |
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc |
index c6c8d668bad1c26c4c653dd34afb777608be4a18..fd6c7991bde01afe87fb3ade0da564dc89229a1a 100644 |
--- a/cc/layers/picture_layer_impl.cc |
+++ b/cc/layers/picture_layer_impl.cc |
@@ -294,12 +294,16 @@ void PictureLayerImpl::AppendQuads(RenderPass* render_pass, |
append_quads_data->num_incomplete_tiles++; |
} |
+ // Only swizzle contents for software rasterization, where texture |
+ // uploads require it. |
+ bool swizzle_contents = !layer_tree_impl()->use_gpu_rasterization() && |
+ draw_info.contents_swizzled(); |
vmiura
2015/06/10 01:48:25
nit: It would be nice if draw_info.contents_swizzl
|
TileDrawQuad* quad = |
render_pass->CreateAndAppendDrawQuad<TileDrawQuad>(); |
quad->SetNew(shared_quad_state, geometry_rect, opaque_rect, |
visible_geometry_rect, draw_info.resource_id(), |
texture_rect, draw_info.resource_size(), |
- draw_info.contents_swizzled(), nearest_neighbor_); |
+ swizzle_contents, nearest_neighbor_); |
ValidateQuadResources(quad); |
has_draw_quad = true; |
break; |