Implement support for mixed sampled render targets

src/image/SkSurface_Gpu.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkSurface_Gpu.h"
 
 #include "SkCanvas.h"
@@ skipping 19 matching lines @@
 SkCanvas* SkSurface_Gpu::onNewCanvas() {
     SkCanvas::InitFlags flags = SkCanvas::kDefault_InitFlags;
     // When we think this works...
 //    flags |= SkCanvas::kConservativeRasterClip_InitFlag;
 
     return SkNEW_ARGS(SkCanvas, (fDevice, &this->props(), flags));
 }
 
 SkSurface* SkSurface_Gpu::onNewSurface(const SkImageInfo& info) {
     GrRenderTarget* rt = fDevice->accessRenderTarget();
-    int sampleCount = rt->numSamples();
+    int sampleCount = rt->numColorSamples();
     // TODO: Make caller specify this (change virtual signature of onNewSurface).
     static const Budgeted kBudgeted = kNo_Budgeted;
     return SkSurface::NewRenderTarget(fDevice->context(), kBudgeted, info, sampleCount,
                                       &this->props());
 }
 
 SkImage* SkSurface_Gpu::onNewImageSnapshot(Budgeted budgeted) {
     const SkImageInfo info = fDevice->imageInfo();
-    const int sampleCount = fDevice->accessRenderTarget()->numSamples();
+    const int sampleCount = fDevice->accessRenderTarget()->numColorSamples();
     SkImage* image = NULL;
     GrTexture* tex = fDevice->accessRenderTarget()->asTexture();
     if (tex) {
         image = SkNEW_ARGS(SkImage_Gpu,
                            (info.width(), info.height(), info.alphaType(),
                             tex, sampleCount, budgeted));
     }
     if (image) {
         as_IB(image)->initWithProps(this->props());
     }
@@ skipping 55 matching lines @@
     }
     SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(surface->asRenderTarget(), props,
                                                          SkGpuDevice::kNeedClear_Flag));
     if (!device) {
         return NULL;
     }
     return SkNEW_ARGS(SkSurface_Gpu, (device));
 }
 
 #endif