Reland "Disable the MSAA atlas mode for CCPR"

This is a reland of 97c476ecb7

Original change's description:
> Disable the MSAA atlas mode for CCPR
>
> We have a long term path rendering plan that uses dynamic MSAA instead.
> This CL is a test to see if we can drop support for CCPR now.
>
> Change-Id: I1bff3ca3143a6b453b65a7932a1805c195922805
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/354036
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>

Change-Id: Ied3390d7df0b01d5e9d565247f5aed0addb5ab8f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/356336
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
This commit is contained in:
Chris Dalton 2021-01-20 15:00:54 -07:00 committed by Skia Commit-Bot
parent 6d717d401a
commit 5501b59f16
2 changed files with 4 additions and 0 deletions

View File

@ -38,6 +38,7 @@ bool GrCoverageCountingPathRenderer::IsSupported(const GrCaps& caps, CoverageTyp
return true; return true;
} }
#if 0
if (!caps.driverDisableMSAACCPR() && if (!caps.driverDisableMSAACCPR() &&
caps.internalMultisampleCount(defaultA8Format) > 1 && caps.internalMultisampleCount(defaultA8Format) > 1 &&
caps.sampleLocationsSupport() && caps.sampleLocationsSupport() &&
@ -47,6 +48,7 @@ bool GrCoverageCountingPathRenderer::IsSupported(const GrCaps& caps, CoverageTyp
} }
return true; return true;
} }
#endif
return false; return false;
} }

View File

@ -63,9 +63,11 @@ public:
fDContext.get(), GrColorType::kRGBA_8888, nullptr, SkBackingFit::kExact, fDContext.get(), GrColorType::kRGBA_8888, nullptr, SkBackingFit::kExact,
{kCanvasSize, kCanvasSize})) {kCanvasSize, kCanvasSize}))
, fDoStroke(DoStroke::kYes == doStroke) { , fDoStroke(DoStroke::kYes == doStroke) {
#if 0
if (!fCCPR) { if (!fCCPR) {
ERRORF(reporter, "ccpr not enabled in GrDirectContext for ccpr tests"); ERRORF(reporter, "ccpr not enabled in GrDirectContext for ccpr tests");
} }
#endif
if (!fRTC) { if (!fRTC) {
ERRORF(reporter, "failed to create GrSurfaceDrawContext for ccpr tests"); ERRORF(reporter, "failed to create GrSurfaceDrawContext for ccpr tests");
} }