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

Revert "Enable coverage counting path rendering except on Android framework"

Browse Source 
This reverts commit 196efbf71c.

Reason for revert: 1k SKPs GPU bot fails, perf regressions to look into.

Original change's description:
> Enable coverage counting path rendering except on Android framework
> 
> Android framework will come after collecting a bit more data.
> 
> Bug: skia:
> Change-Id: I6f4738e457f09c976b8bf282153ca75160a1d91c
> Reviewed-on: https://skia-review.googlesource.com/55563
> Commit-Queue: Chris Dalton <csmartdalton@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>

TBR=bsalomon@google.com,csmartdalton@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: skia:
Change-Id: I3f1a7022414ccec80541772d9912065fa4efd74e
Reviewed-on: https://skia-review.googlesource.com/57300
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
This commit is contained in:
Chris Dalton 2017-10-09 18:14:08 +00:00 committed by Skia Commit-Bot
parent c4b015ad5f
commit 4ba211f68f
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,
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)

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
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 (auto ccpr = GrCoverageCountingPathRenderer::CreateIfSupported(*context->caps())) {
context->contextPriv().addOnFlushCallbackObject(ccpr.get());
fChain.push_back(std::move(ccpr));
}
}
#endif
if (options.fGpuPathRenderers & GpuPathRenderers::kAAConvex) {
fChain.push_back(sk_make_sp<GrAAConvexPathRenderer>());
}