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

Make AA hairline renderer non-optional

Browse Source 
Change-Id: I0d4166a4e9ea894f479755f9f7137c5941cf8a22
Reviewed-on: https://skia-review.googlesource.com/41081
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2017-08-30 14:41:12 -04:00 committed by Skia Commit-Bot
parent ecfed2beaf
commit c0e66273f8
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/gpu/GrContextOptions.h
View File

@ -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)),

7
src/gpu/GrPathRendererChain.cpp
View File

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

4
tools/flags/SkCommonFlagsPathRenderer.h
View File

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