diff options
| author |  jvanverth <jvanverth@google.com> | 2014-11-06 13:52:45 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-06 13:52:45 -0800 |
| commit | aa30ab3079ad3c1f408e3f170dac1cdd42ed2b62 (patch) | |
| tree | bca7bf2584494be08b4e2e0905a39709c436b424 /dm | |
| parent | 06ba179838ba4fe187cf290750aeeb4a02a2960b (diff) | |
Revert of Get gpudft support working in dm, gm, nanobench and bench_pictures (patchset #2 id:20001 of https://codereview.chromium.org/699453005/)
Reason for revert:
Not compiling in ANGLE build
Original issue's description:
> Get gpudft support working in dm, gm, nanobench and bench_pictures
>
> Adds a new config to test distance field text.
> Clean up some flags and #defines to read "distance field text",
> not "distance field fonts" to be consistent with Chromium
>
> NOTREECHECKS=true
>
> Committed: https://skia.googlesource.com/skia/+/06ba179838ba4fe187cf290750aeeb4a02a2960b
TBR=bsalomon@google.com,mtklein@google.com,reed@google.com
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/707723005
Diffstat (limited to 'dm')
| -rw-r--r-- | dm/DM.cpp | 15 | ||||
| -rw-r--r-- | dm/DMGpuGMTask.cpp | 6 | ||||
| -rw-r--r-- | dm/DMGpuGMTask.h | 4 | ||||
| -rw-r--r-- | dm/DMGpuSupport.h | 10 |
4 files changed, 13 insertions, 22 deletions
@@ -86,14 +86,13 @@ static void kick_off_gms(const SkTDArray<GMRegistry::Factory>& gms, START("565", CpuGMTask, kRGB_565_SkColorType); START("8888", CpuGMTask, kN32_SkColorType); - START("gpu", GpuGMTask, native, gpuAPI, 0, false); - START("msaa4", GpuGMTask, native, gpuAPI, 4, false); - START("msaa16", GpuGMTask, native, gpuAPI, 16, false); - START("nvprmsaa4", GpuGMTask, nvpr, gpuAPI, 4, false); - START("nvprmsaa16", GpuGMTask, nvpr, gpuAPI, 16, false); - START("gpudft", GpuGMTask, native, gpuAPI, 0, true); - START("gpunull", GpuGMTask, null, gpuAPI, 0, false); - START("gpudebug", GpuGMTask, debug, gpuAPI, 0, false); + START("gpu", GpuGMTask, native, gpuAPI, 0); + START("msaa4", GpuGMTask, native, gpuAPI, 4); + START("msaa16", GpuGMTask, native, gpuAPI, 16); + START("nvprmsaa4", GpuGMTask, nvpr, gpuAPI, 4); + START("nvprmsaa16", GpuGMTask, nvpr, gpuAPI, 16); + START("gpunull", GpuGMTask, null, gpuAPI, 0); + START("gpudebug", GpuGMTask, debug, gpuAPI, 0); #if SK_ANGLE START("angle", GpuGMTask, angle, gpuAPI, 0); #endif diff --git a/dm/DMGpuGMTask.cpp b/dm/DMGpuGMTask.cpp index 9347ebdfe9..2890483f55 100644 --- a/dm/DMGpuGMTask.cpp +++ b/dm/DMGpuGMTask.cpp @@ -13,15 +13,13 @@ GpuGMTask::GpuGMTask(const char* config, skiagm::GMRegistry::Factory gmFactory, GrContextFactory::GLContextType contextType, GrGLStandard gpuAPI, - int sampleCount, - bool useDFText) + int sampleCount) : GpuTask(reporter, taskRunner) , fGM(gmFactory(NULL)) , fName(UnderJoin(fGM->getName(), config)) , fContextType(contextType) , fGpuAPI(gpuAPI) , fSampleCount(sampleCount) - , fUseDFText(useDFText) {} static bool gAlreadyWarned[GrContextFactory::kGLContextTypeCnt][kGrGLStandardCnt]; @@ -32,7 +30,7 @@ void GpuGMTask::draw(GrContextFactory* grFactory) { kN32_SkColorType, kPremul_SkAlphaType); SkAutoTUnref<SkSurface> surface(NewGpuSurface(grFactory, fContextType, fGpuAPI, info, - fSampleCount, fUseDFText)); + fSampleCount)); if (!surface) { if (!gAlreadyWarned[fContextType][fGpuAPI]) { SkDebugf("FYI: couldn't create GPU context, type %d API %d. Will skip.\n", diff --git a/dm/DMGpuGMTask.h b/dm/DMGpuGMTask.h index 553436d040..23f3a45b0c 100644 --- a/dm/DMGpuGMTask.h +++ b/dm/DMGpuGMTask.h @@ -22,8 +22,7 @@ public: skiagm::GMRegistry::Factory, GrContextFactory::GLContextType, GrGLStandard gpuAPI, - int sampleCount, - bool useDFText); + int sampleCount); virtual void draw(GrContextFactory*) SK_OVERRIDE; virtual bool shouldSkip() const SK_OVERRIDE; @@ -35,7 +34,6 @@ private: const GrContextFactory::GLContextType fContextType; GrGLStandard fGpuAPI; const int fSampleCount; - const bool fUseDFText; }; } // namespace DM diff --git a/dm/DMGpuSupport.h b/dm/DMGpuSupport.h index 33d8995b44..90b0ea55cf 100644 --- a/dm/DMGpuSupport.h +++ b/dm/DMGpuSupport.h @@ -21,11 +21,8 @@ static inline SkSurface* NewGpuSurface(GrContextFactory* grFactory, GrContextFactory::GLContextType type, GrGLStandard gpuAPI, SkImageInfo info, - int samples, - bool useDFText) { - uint32_t flags = useDFText ? SkSurfaceProps::kUseDistanceFieldFonts_Flag : 0; - SkSurfaceProps props(flags, SkSurfaceProps::kLegacyFontHost_InitType); - return SkSurface::NewRenderTarget(grFactory->get(type, gpuAPI), info, samples, &props); + int samples) { + return SkSurface::NewRenderTarget(grFactory->get(type, gpuAPI), info, samples, NULL); } } // namespace DM @@ -65,8 +62,7 @@ static inline SkSurface* NewGpuSurface(GrContextFactory*, GrContextFactory::GLContextType, GrGLStandard, SkImageInfo, - int, - bool) { + int) { return NULL; } |