diff options
| author |  egdaniel <egdaniel@google.com> | 2014-11-05 14:21:33 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-05 14:21:33 -0800 |
| commit | d5cd4ee5b81b51e43be7ed13f3c0f0f6c1b3fe14 (patch) | |
| tree | a1159afd9cb56c1e8480f569712d1bac50c61ca5 /dm | |
| parent | fdcf2c0863cdd5779bd6203d45b77d2daf21f159 (diff) | |
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
Diffstat (limited to 'dm')
| -rw-r--r-- | dm/DMGpuGMTask.cpp | 8 | ||||
| -rw-r--r-- | dm/DMGpuSupport.h | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/dm/DMGpuGMTask.cpp b/dm/DMGpuGMTask.cpp index 2890483f55..fb170a26b9 100644 --- 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 90b0ea55cf..af6270dfc3 100644 --- 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() {} |