From d5cd4ee5b81b51e43be7ed13f3c0f0f6c1b3fe14 Mon Sep 17 00:00:00 2001 From: egdaniel Date: Wed, 5 Nov 2014 14:21:33 -0800 Subject: 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 | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'dm/DMGpuGMTask.cpp') 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 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(); -- cgit v1.2.3