Revert of Turn on NVPR 4x MSAA by default when supported in DM and nanobench. (patchs...

Reason for revert:
Timing out on nvpr when drawing conics. Fix will take some thought so reverting for now.

Original issue's description:
> 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:
>
> Committed: https://skia.googlesource.com/skia/+/31f88675718966bbb7f09718b40de10c7e214739

TBR=bsalomon@google.com,mtklein@google.com,mtklein@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:

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

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

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

diff --git a/include/gpu/gl/GrGLFunctions.h b/include/gpu/gl/GrGLFunctions.h
index 0b7beb601f37f737cd6223f5f2f361a1c379c6d7..dd62085012504dcd183441d9a521ac54caef2e3a 100644 (file)
--- a/include/gpu/gl/GrGLFunctions.h
+++ b/include/gpu/gl/GrGLFunctions.h
@@ -22,7 +22,6 @@ enum GrGLStandard {
     kGL_GrGLStandard,
     kGLES_GrGLStandard,
 };
-static const int kGrGLStandardCnt = 3;
 
 ///////////////////////////////////////////////////////////////////////////////
 

diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp
index 4d329c5f30ccbcbe157da9c2da65045b9c886242..99d05c15f7e4cc7fa4dfa45f0ef12b95b67076c5 100644 (file)
--- 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 nvprmsaa4",
+DEFINE_string(config, "565 8888 pdf gpu nonrendering angle",
               "Options: 565 8888 pdf gpu nonrendering msaa4 msaa16 nvprmsaa4 nvprmsaa16 "
               "gpunull gpudebug angle mesa");