Implement support for mixed sampled render targets

src/core/SkMultiPictureDraw.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // Need to include something before #if SK_SUPPORT_GPU so that the Android
 // framework build, which gets its defines from SkTypes rather than a makefile,
 // has the definition before checking it.
@@ skipping 123 matching lines @@
             GrRenderTarget* rt = data.fCanvas->internal_private_accessTopLayerRenderTarget();
             SkASSERT(rt);
 
             // TODO: sorting the cacheable layers from smallest to largest
             // would improve the packing and reduce the number of swaps
             // TODO: another optimization would be to make a first pass to
             // lock any required layer that is already in the atlas
             GrLayerHoister::FindLayersToAtlas(context, data.fPicture, initialMatrix,
                                               clipBounds,
                                               &atlasedNeedRendering, &atlasedRecycled,
-                                              rt->numSamples());
+                                              rt->numColorSamples());
         }
     }
 
     GrLayerHoister::DrawLayersToAtlas(context, atlasedNeedRendering);
 
     SkTDArray<GrHoistedLayer> needRendering, recycled;
 #endif
 
     for (int i = 0; i < count; ++i) {
         const DrawData& data = fGPUDrawData[i];
@@ skipping 12 matching lines @@
 
             const SkMatrix initialMatrix = canvas->getTotalMatrix();
 
             GrRenderTarget* rt = data.fCanvas->internal_private_accessTopLayerRenderTarget();
             SkASSERT(rt);
 
             // Find the layers required by this canvas. It will return atlased
             // layers in the 'recycled' list since they have already been drawn.
             GrLayerHoister::FindLayersToHoist(context, picture, initialMatrix,
                                               clipBounds, &needRendering, &recycled,
-                                              rt->numSamples());
+                                              rt->numColorSamples());
 
             GrLayerHoister::DrawLayers(context, needRendering);
 
             // Render the entire picture using new layers
             GrRecordReplaceDraw(picture, canvas, context->getLayerCache(),
                                 initialMatrix, NULL);
 
             GrLayerHoister::UnlockLayers(context, needRendering);
             GrLayerHoister::UnlockLayers(context, recycled);
 
@@ skipping 11 matching lines @@
 
 #if !defined(SK_IGNORE_GPU_LAYER_HOISTING) && SK_SUPPORT_GPU
     GrLayerHoister::UnlockLayers(context, atlasedNeedRendering);
     GrLayerHoister::UnlockLayers(context, atlasedRecycled);
 #if !GR_CACHE_HOISTED_LAYERS
     GrLayerHoister::PurgeCache(context);
 #endif
 #endif
 }