commit 31f88675718966bbb7f09718b40de10c7e214739
author mtklein <mtklein@chromium.org> Wed Nov 05 12:28:26 2014 -0800
committer Commit bot <commit-bot@chromium.org> Wed Nov 05 12:28:26 2014 -0800
tree 5c3d2b74b9a9a22cecfd9a934eaf9358dcd2fa53
parent 820dd6c335411aad889c1d7e8a857642ecd87e30

Turn on NVPR 4x MSAA by default when supported in DM and nanobench.

This brings DM and nanobench's default configs in line with GM's.

BUG=skia:

Review URL: https://codereview.chromium.org/704563003

dm/DMGpuGMTask.cpp

diff --git a/dm/DMGpuGMTask.cpp b/dm/DMGpuGMTask.cpp
index fb170a2..2890483 100644
--- a/dm/DMGpuGMTask.cpp
+++ b/dm/DMGpuGMTask.cpp
@@ -22,6 +22,8 @@
     , fSampleCount(sampleCount)
     {}
 
+static bool gAlreadyWarned[GrContextFactory::kGLContextTypeCnt][kGrGLStandardCnt];
+
 void GpuGMTask::draw(GrContextFactory* grFactory) {
     SkImageInfo info = SkImageInfo::Make(SkScalarCeilToInt(fGM->width()),
                                          SkScalarCeilToInt(fGM->height()),
@@ -30,7 +32,11 @@
     SkAutoTUnref<SkSurface> surface(NewGpuSurface(grFactory, fContextType, fGpuAPI, info,
                                                   fSampleCount));
     if (!surface) {
-        this->fail("Could not create context for the config and the api.");
+        if (!gAlreadyWarned[fContextType][fGpuAPI]) {
+            SkDebugf("FYI: couldn't create GPU context, type %d API %d.  Will skip.\n",
+                     fContextType, fGpuAPI);
+            gAlreadyWarned[fContextType][fGpuAPI] = true;
+        }
         return;
     }
     SkCanvas* canvas = surface->getCanvas();

dm/DMGpuSupport.h

diff --git a/dm/DMGpuSupport.h b/dm/DMGpuSupport.h
index af6270d..90b0ea5 100644
--- a/dm/DMGpuSupport.h
+++ b/dm/DMGpuSupport.h
@@ -36,6 +36,7 @@
     kGL_GrGLStandard,
     kGLES_GrGLStandard
 };
+static const int kGrGLStandardCnt = 3;
 
 class GrContextFactory {
 public:
@@ -47,6 +48,7 @@
                                kNVPR_GLContextType   = 0,
                                kNative_GLContextType = 0,
                                kNull_GLContextType   = 0;
+    static const int kGLContextTypeCnt = 1;
     void destroyContexts() {}
 
     void abandonContexts() {}

include/gpu/gl/GrGLFunctions.h

diff --git a/include/gpu/gl/GrGLFunctions.h b/include/gpu/gl/GrGLFunctions.h
index dd62085..0b7beb6 100644
--- a/include/gpu/gl/GrGLFunctions.h
+++ b/include/gpu/gl/GrGLFunctions.h
@@ -22,6 +22,7 @@
     kGL_GrGLStandard,
     kGLES_GrGLStandard,
 };
+static const int kGrGLStandardCnt = 3;
 
 ///////////////////////////////////////////////////////////////////////////////
 

tools/flags/SkCommonFlags.cpp

diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp
index 99d05c1..4d329c5 100644
--- a/tools/flags/SkCommonFlags.cpp
+++ b/tools/flags/SkCommonFlags.cpp
@@ -7,7 +7,7 @@
 
 #include "SkCommonFlags.h"
 
-DEFINE_string(config, "565 8888 pdf gpu nonrendering angle",
+DEFINE_string(config, "565 8888 pdf gpu nonrendering angle nvprmsaa4",
               "Options: 565 8888 pdf gpu nonrendering msaa4 msaa16 nvprmsaa4 nvprmsaa16 "
               "gpunull gpudebug angle mesa");