Add msaa configs to bench_pictures

tools/PictureRenderer.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef PictureRenderer_DEFINED
 #define PictureRenderer_DEFINED
 
@@ skipping 144 matching lines @@
         fGrContext = fGrContextFactory.get(glContextType);
         if (NULL == fGrContext) {
             return false;
         } else {
             fGrContext->ref();
             return true;
         }
 #endif
     }
 
+#if SK_SUPPORT_GPU
+    void setSampleCount(int sampleCount) {
+        fSampleCount = sampleCount;
+    }
+#endif
+
     void setDrawFilters(DrawFilterFlags const * const filters, const SkString& configName) {
         memcpy(fDrawFilters, filters, sizeof(fDrawFilters));
         fDrawFiltersConfig = configName;
     }
 
     void setBBoxHierarchyType(BBoxHierarchyType bbhType) {
         fBBoxHierarchyType = bbhType;
     }
 
     BBoxHierarchyType getBBoxHierarchyType() { return fBBoxHierarchyType; }
@@ skipping 19 matching lines @@
             config.appendf("_viewport_%ix%i", fViewport.width(), fViewport.height());
         }
         if (kRTree_BBoxHierarchyType == fBBoxHierarchyType) {
             config.append("_rtree");
         } else if (kTileGrid_BBoxHierarchyType == fBBoxHierarchyType) {
             config.append("_grid");
         }
 #if SK_SUPPORT_GPU
         switch (fDeviceType) {
             case kGPU_DeviceType:
-                config.append("_gpu");
+                if (fSampleCount == 4) {

[bsalomon, 2013/04/29 18:59:26]

if (fSampleCount) {
    config.appendf("_msaa%d", fSampleCount);
} else {
    config.append("_gpu");
}

[jvanverth1, 2013/04/29 19:36:27]

Done.

+                    config.append("_msaa4");
+                } else if (fSampleCount == 16) {
+                    config.append("_msaa16");
+                } else {
+                    config.append("_gpu");
+                }
                 break;
 #if SK_ANGLE
             case kAngle_DeviceType:
                 config.append("_angle");
                 break;
 #endif
             default:
                 // Assume that no extra info means bitmap.
                 break;
         }
@@ skipping 39 matching lines @@
     }
 #endif
 
     PictureRenderer()
         : fPicture(NULL)
         , fDeviceType(kBitmap_DeviceType)
         , fBBoxHierarchyType(kNone_BBoxHierarchyType)
         , fScaleFactor(SK_Scalar1)
 #if SK_SUPPORT_GPU
         , fGrContext(NULL)
+        , fSampleCount(0)
 #endif
         {
             fGridInfo.fMargin.setEmpty();
             fGridInfo.fOffset.setZero();
             fGridInfo.fTileInterval.set(1, 1);
             sk_bzero(fDrawFilters, sizeof(fDrawFilters));
             fViewport.set(0, 0);
         }
 
 #if SK_SUPPORT_GPU
@@ skipping 34 matching lines @@
     uint32_t recordFlags();
     SkCanvas* setupCanvas();
     virtual SkCanvas* setupCanvas(int width, int height);
 
 private:
     SkISize                fViewport;
     SkScalar               fScaleFactor;
 #if SK_SUPPORT_GPU
     GrContextFactory       fGrContextFactory;
     GrContext*             fGrContext;
+    int                    fSampleCount;

[scroggo, 2013/04/29 19:05:44]

Should this be an enum that only accepts 4, 16, and 0?

[jvanverth1, 2013/04/29 19:36:27]

Done.

 #endif
 
     virtual SkString getConfigNameInternal() = 0;
 
     typedef SkRefCnt INHERITED;
 };
 
 /**
  * This class does not do any rendering, but its render function executes recording, which we want
  * to time.
@@ skipping 206 matching lines @@
 
     typedef PictureRenderer INHERITED;
 };
 
 extern PictureRenderer* CreateGatherPixelRefsRenderer();
 extern PictureRenderer* CreatePictureCloneRenderer();
 
 }
 
 #endif  // PictureRenderer_DEFINED