diff options
| -rw-r--r-- | include/gpu/GrContextOptions.h | 11 | ||||
| -rw-r--r-- | src/gpu/GrPathRendererChain.cpp | 7 | ||||
| -rw-r--r-- | tools/flags/SkCommonFlagsPathRenderer.h | 4 |
3 files changed, 10 insertions, 12 deletions
diff --git a/include/gpu/GrContextOptions.h b/include/gpu/GrContextOptions.h index 471195a589..8c577842a0 100644 --- a/include/gpu/GrContextOptions.h +++ b/include/gpu/GrContextOptions.h @@ -99,12 +99,11 @@ struct GrContextOptions { kDashLine = 1 << 0, kStencilAndCover = 1 << 1, kMSAA = 1 << 2, - kAAHairline = 1 << 3, - kAAConvex = 1 << 4, - kAALinearizing = 1 << 5, - kSmall = 1 << 6, - kCoverageCounting = 1 << 7, - kTessellating = 1 << 8, + kAAConvex = 1 << 3, + kAALinearizing = 1 << 4, + kSmall = 1 << 5, + kCoverageCounting = 1 << 6, + kTessellating = 1 << 7, kAll = (kTessellating | (kTessellating - 1)), diff --git a/src/gpu/GrPathRendererChain.cpp b/src/gpu/GrPathRendererChain.cpp index 32e204a95c..b379a48720 100644 --- a/src/gpu/GrPathRendererChain.cpp +++ b/src/gpu/GrPathRendererChain.cpp @@ -47,9 +47,10 @@ GrPathRendererChain::GrPathRendererChain(GrContext* context, const Options& opti } } #endif - if (options.fGpuPathRenderers & GpuPathRenderers::kAAHairline) { - fChain.push_back(sk_make_sp<GrAAHairLinePathRenderer>()); - } + + // AA hairline path renderer is very specialized - no other renderer can do this job well + fChain.push_back(sk_make_sp<GrAAHairLinePathRenderer>()); + if (options.fGpuPathRenderers & GpuPathRenderers::kAAConvex) { fChain.push_back(sk_make_sp<GrAAConvexPathRenderer>()); } diff --git a/tools/flags/SkCommonFlagsPathRenderer.h b/tools/flags/SkCommonFlagsPathRenderer.h index 9a89bb93ea..8ed74aa8fb 100644 --- a/tools/flags/SkCommonFlagsPathRenderer.h +++ b/tools/flags/SkCommonFlagsPathRenderer.h @@ -19,7 +19,7 @@ DECLARE_string(pr); #define DEFINE_pathrenderer_flag \ DEFINE_string(pr, "default", \ "Set of enabled gpu path renderers. Defined as a list of: " \ - "[[~]all [~]default [~]dashline [~]nvpr [~]msaa [~]aahairline [~]aaconvex " \ + "[[~]all [~]default [~]dashline [~]nvpr [~]msaa [~]aaconvex " \ "[~]aalinearizing [~]small [~]tess]") inline GrContextOptions::GpuPathRenderers get_named_pathrenderers_flags(const char* name) { @@ -34,8 +34,6 @@ inline GrContextOptions::GpuPathRenderers get_named_pathrenderers_flags(const ch return GpuPathRenderers::kStencilAndCover; } else if (!strcmp(name, "msaa")) { return GpuPathRenderers::kMSAA; - } else if (!strcmp(name, "aahairline")) { - return GpuPathRenderers::kAAHairline; } else if (!strcmp(name, "aaconvex")) { return GpuPathRenderers::kAAConvex; } else if (!strcmp(name, "aalinearizing")) { |