From 7c0998a130b5b1a64811defd17ab3266985515f4 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Wed, 18 Jul 2018 21:24:11 +0000 Subject: Revert "Add kAAHairline to GpuPathRenderers" This reverts commit 880b9d302fadd6449a511b8664682f16cde7dd9c. Reason for revert: Appears to be breaking serialization. See https://ci.chromium.org/raw/build/logs.chromium.org/skia/20180718T201711.486335899Z_000000000077bbff/+/annotations Original change's description: > Add kAAHairline to GpuPathRenderers > > With the upcoming ccpr stroking, this will no longer be the only path > renderer that can handle hairlines. > > Bug: skia: > Change-Id: Idf2543f053c8603c80fcd647ca18ffd9860a85f3 > Reviewed-on: https://skia-review.googlesource.com/142246 > Reviewed-by: Brian Osman > Commit-Queue: Chris Dalton TBR=brianosman@google.com,csmartdalton@google.com Change-Id: I1967c2cf6b1f1307270bf62bb04130cdf84317b7 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/142280 Reviewed-by: Ben Wagner Commit-Queue: Ben Wagner --- tools/flags/SkCommonFlags.cpp | 6 +++--- tools/flags/SkCommonFlagsGpu.h | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'tools') diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp index a2c2375e10..ed4d169585 100644 --- a/tools/flags/SkCommonFlags.cpp +++ b/tools/flags/SkCommonFlags.cpp @@ -161,10 +161,10 @@ DEFINE_bool(cachePathMasks, true, "Allows path mask textures to be cached in GPU DEFINE_bool(noGS, false, "Disables support for geometry shaders."); -DEFINE_string(pr, "all", +DEFINE_string(pr, "default", "Set of enabled gpu path renderers. Defined as a list of: " - "[~]none [~]dashline [~]nvpr [~]ccpr [~]aahairline [~]aaconvex [~]aalinearizing " - "[~]small [~]tess] [~]all"); + "[~]all [~]default [~]dashline [~]nvpr [~]aaconvex " + "[~]aalinearizing [~]small [~]tess]"); void SetCtxOptionsFromCommonFlags(GrContextOptions* ctxOptions) { static std::unique_ptr gGpuExecutor = (0 != FLAGS_gpuThreads) diff --git a/tools/flags/SkCommonFlagsGpu.h b/tools/flags/SkCommonFlagsGpu.h index cb8a439ccc..23800ec911 100644 --- a/tools/flags/SkCommonFlagsGpu.h +++ b/tools/flags/SkCommonFlagsGpu.h @@ -18,26 +18,26 @@ DECLARE_bool(noGS); DECLARE_string(pr); inline GpuPathRenderers get_named_pathrenderers_flags(const char* name) { - if (!strcmp(name, "none")) { - return GpuPathRenderers::kNone; + if (!strcmp(name, "all")) { + return GpuPathRenderers::kAll; + } else if (!strcmp(name, "default")) { + return GpuPathRenderers::kDefault; } else if (!strcmp(name, "dashline")) { return GpuPathRenderers::kDashLine; } else if (!strcmp(name, "nvpr")) { return GpuPathRenderers::kStencilAndCover; - } else if (!strcmp(name, "ccpr")) { - return GpuPathRenderers::kCoverageCounting; - } else if (!strcmp(name, "aahairline")) { - return GpuPathRenderers::kAAHairline; } else if (!strcmp(name, "aaconvex")) { return GpuPathRenderers::kAAConvex; } else if (!strcmp(name, "aalinearizing")) { return GpuPathRenderers::kAALinearizing; } else if (!strcmp(name, "small")) { return GpuPathRenderers::kSmall; + } else if (!strcmp(name, "ccpr")) { + return GpuPathRenderers::kCoverageCounting; } else if (!strcmp(name, "tess")) { return GpuPathRenderers::kTessellating; - } else if (!strcmp(name, "all")) { - return GpuPathRenderers::kAll; + } else if (!strcmp(name, "none")) { + return GpuPathRenderers::kNone; } SK_ABORT(SkStringPrintf("error: unknown named path renderer \"%s\"\n", name).c_str()); return GpuPathRenderers::kNone; @@ -45,10 +45,10 @@ inline GpuPathRenderers get_named_pathrenderers_flags(const char* name) { inline GpuPathRenderers CollectGpuPathRenderersFromFlags() { if (FLAGS_pr.isEmpty()) { - return GpuPathRenderers::kAll; + return GpuPathRenderers::kDefault; } - GpuPathRenderers gpuPathRenderers = '~' == FLAGS_pr[0][0] - ? GpuPathRenderers::kAll : GpuPathRenderers::kNone; + GpuPathRenderers gpuPathRenderers = '~' == FLAGS_pr[0][0] ? + GpuPathRenderers::kDefault : GpuPathRenderers::kNone; for (int i = 0; i < FLAGS_pr.count(); ++i) { const char* name = FLAGS_pr[i]; if (name[0] == '~') { -- cgit v1.2.3