AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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/)

Browse Source 
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
This commit is contained in:
egdaniel 2014-11-05 14:21:33 -08:00 committed by Commit bot
parent fdcf2c0863
commit d5cd4ee5b8
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dm/DMGpuGMTask.cpp
View File

@ -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();

2
dm/DMGpuSupport.h
View File

@ -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() {}

1
include/gpu/gl/GrGLFunctions.h
View File

@ -22,7 +22,6 @@ enum GrGLStandard {
kGL_GrGLStandard,
kGLES_GrGLStandard,
};
static const int kGrGLStandardCnt = 3;
///////////////////////////////////////////////////////////////////////////////

2
tools/flags/SkCommonFlags.cpp
View File

@ -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");