Implement support for mixed sampled render targets

tests/SurfaceTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkDevice.h"
@@ skipping 102 matching lines @@
         return;
     }
     
     GrBackendObject textureHandle = dummySurface->asTexture()->getTextureHandle();
 
     GrBackendTextureDesc wrappedDesc;
     wrappedDesc.fConfig = dummySurface->config();
     wrappedDesc.fWidth = dummySurface->width();
     wrappedDesc.fHeight = dummySurface->height();
     wrappedDesc.fOrigin = dummySurface->origin();
-    wrappedDesc.fSampleCnt = dummySurface->asRenderTarget()->numSamples();
+    wrappedDesc.fSampleCnt = dummySurface->asRenderTarget()->numColorSamples();
     wrappedDesc.fFlags = kRenderTarget_GrBackendTextureFlag;
     wrappedDesc.fTextureHandle = textureHandle;
 
     SkAutoTUnref<SkSurface> surface(SkSurface::NewWrappedRenderTarget(ctx, wrappedDesc, NULL));
     REPORTER_ASSERT(reporter, surface);
 }
 #endif
 
 
 static void test_image(skiatest::Reporter* reporter) {
@@ skipping 602 matching lines @@
     // Now lets jam new colors into our "external" texture, and see if the images notice
     const SkPMColor expected1 = SkPreMultiplyColor(SK_ColorBLUE);
     sk_memset32(storage, expected1, w * h);
     tex->writePixels(0, 0, w, h, kSkia8888_GrPixelConfig, storage, GrContext::kFlushWrites_PixelOp);
 
     // We expect the ref'd image to see the new color, but cpy'd one should still see the old color
     test_image_color(reporter, refImg, expected1);
     test_image_color(reporter, cpyImg, expected0);
 }
 #endif