commit d5cd4ee5b81b51e43be7ed13f3c0f0f6c1b3fe14
author egdaniel <egdaniel@google.com> Wed Nov 05 14:21:33 2014 -0800
committer Commit bot <commit-bot@chromium.org> Wed Nov 05 14:21:33 2014 -0800
tree a1159afd9cb56c1e8480f569712d1bac50c61ca5
parent fdcf2c0863cdd5779bd6203d45b77d2daf21f159

Revert of Turn on NVPR 4x MSAA by default when supported in DM and nanobench. (patchset #2 id:20001 of https://codereview.chromium.org/704563003/)

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

dm/DMGpuGMTask.cpp

diff --git a/dm/DMGpuGMTask.cpp b/dm/DMGpuGMTask.cpp
index 2890483..fb170a2 100644
--- a/dm/DMGpuGMTask.cpp
+++ b/dm/DMGpuGMTask.cpp
@@ -22,8 +22,6 @@
     , 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 @@
     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();

dm/DMGpuSupport.h

diff --git a/dm/DMGpuSupport.h b/dm/DMGpuSupport.h
index 90b0ea5..af6270d 100644
--- a/dm/DMGpuSupport.h
+++ b/dm/DMGpuSupport.h
@@ -36,7 +36,6 @@
     kGL_GrGLStandard,
     kGLES_GrGLStandard
 };
-static const int kGrGLStandardCnt = 3;
 
 class GrContextFactory {
 public:
@@ -48,7 +47,6 @@
                                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 0b7beb6..dd62085 100644
--- a/include/gpu/gl/GrGLFunctions.h
+++ b/include/gpu/gl/GrGLFunctions.h
@@ -22,7 +22,6 @@
     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 4d329c5..99d05c1 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 nvprmsaa4",
+DEFINE_string(config, "565 8888 pdf gpu nonrendering angle",
               "Options: 565 8888 pdf gpu nonrendering msaa4 msaa16 nvprmsaa4 nvprmsaa16 "
               "gpunull gpudebug angle mesa");