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

Revert "Enable coverage counting path rendering on non-Android"

Browse Source 
This reverts commit c739b7260a.

Reason for revert: Turning tree red.
Original change's description:
> Enable coverage counting path rendering on non-Android
> 
> Bug: skia:
> Change-Id: Ife4c4378bf4323fb4a58fecfade09320ebc28026
> Reviewed-on: https://skia-review.googlesource.com/53000
> Reviewed-by: Derek Sollenberger <djsollen@google.com>
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>

TBR=djsollen@google.com,csmartdalton@google.com,reed@google.com

Change-Id: I89ef472a95320ff21684ca697295cd8b3939322e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/53522
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
This commit is contained in:
Jim Van Verth 2017-09-29 18:42:13 +00:00 committed by Skia Commit-Bot
parent e74dafc74d
commit f57c6de784
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/private/GrTypesPriv.h
View File

@ -757,7 +757,9 @@ enum class GpuPathRenderers {
kTessellating = 1 << 7, kTessellating = 1 << 7,
kAll = (kTessellating | (kTessellating - 1)), kAll = (kTessellating | (kTessellating - 1)),
kDefault = kAll
// Temporarily disabling CCPR by default until it has had a time to soak.
kDefault = kAll & ~kCoverageCounting,
}; };
GR_MAKE_BITFIELD_CLASS_OPS(GpuPathRenderers) GR_MAKE_BITFIELD_CLASS_OPS(GpuPathRenderers)

3
src/gpu/GrPathRendererChain.cpp
View File

@ -50,15 +50,12 @@ GrPathRendererChain::GrPathRendererChain(GrContext* context, const Options& opti
// AA hairline path renderer is very specialized - no other renderer can do this job well // AA hairline path renderer is very specialized - no other renderer can do this job well
fChain.push_back(sk_make_sp<GrAAHairLinePathRenderer>()); fChain.push_back(sk_make_sp<GrAAHairLinePathRenderer>());
// Temporarily disable ccpr on Android while we collect data.
#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK
if (options.fGpuPathRenderers & GpuPathRenderers::kCoverageCounting) { if (options.fGpuPathRenderers & GpuPathRenderers::kCoverageCounting) {
if (auto ccpr = GrCoverageCountingPathRenderer::CreateIfSupported(*context->caps())) { if (auto ccpr = GrCoverageCountingPathRenderer::CreateIfSupported(*context->caps())) {
context->contextPriv().addOnFlushCallbackObject(ccpr.get()); context->contextPriv().addOnFlushCallbackObject(ccpr.get());
fChain.push_back(std::move(ccpr)); fChain.push_back(std::move(ccpr));
} }
} }
#endif
if (options.fGpuPathRenderers & GpuPathRenderers::kAAConvex) { if (options.fGpuPathRenderers & GpuPathRenderers::kAAConvex) {
fChain.push_back(sk_make_sp<GrAAConvexPathRenderer>()); fChain.push_back(sk_make_sp<GrAAConvexPathRenderer>());
} }