From 9acfc6cac2c68ab48121b321ad4e2d14f03224c7 Mon Sep 17 00:00:00 2001 From: Chris Dalton Date: Thu, 26 Jul 2018 12:34:49 -0600 Subject: 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: I45b30ccd578bee1388a3a07a234af76a19768de6 Reviewed-on: https://skia-review.googlesource.com/142272 Commit-Queue: Chris Dalton Reviewed-by: Brian Osman Reviewed-by: Brian Salomon --- tools/flags/SkCommonFlags.cpp | 6 +++--- tools/flags/SkCommonFlagsGpu.h | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'tools/flags') diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp index 459f65579f..9a8194cadf 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, "default", +DEFINE_string(pr, "all", "Set of enabled gpu path renderers. Defined as a list of: " - "[~]all [~]default [~]dashline [~]nvpr [~]aaconvex " - "[~]aalinearizing [~]small [~]tess]"); + "[~]none [~]dashline [~]nvpr [~]ccpr [~]aahairline [~]aaconvex [~]aalinearizing " + "[~]small [~]tess] [~]all"); 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 23800ec911..cb8a439ccc 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, "all")) { - return GpuPathRenderers::kAll; - } else if (!strcmp(name, "default")) { - return GpuPathRenderers::kDefault; + if (!strcmp(name, "none")) { + return GpuPathRenderers::kNone; } 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, "none")) { - return GpuPathRenderers::kNone; + } else if (!strcmp(name, "all")) { + return GpuPathRenderers::kAll; } 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::kDefault; + return GpuPathRenderers::kAll; } - GpuPathRenderers gpuPathRenderers = '~' == FLAGS_pr[0][0] ? - GpuPathRenderers::kDefault : GpuPathRenderers::kNone; + GpuPathRenderers gpuPathRenderers = '~' == FLAGS_pr[0][0] + ? GpuPathRenderers::kAll : GpuPathRenderers::kNone; for (int i = 0; i < FLAGS_pr.count(); ++i) { const char* name = FLAGS_pr[i]; if (name[0] == '~') { -- cgit v1.2.3