From 5501b59f169e5c7cd7617779337b91e0c12ff03a Mon Sep 17 00:00:00 2001 From: Chris Dalton Date: Wed, 20 Jan 2021 15:00:54 -0700 Subject: [PATCH] Reland "Disable the MSAA atlas mode for CCPR" This is a reland of 97c476ecb7e6c5a93875951dc6ee1af28e3ac9d7 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 > Commit-Queue: Chris Dalton Change-Id: Ied3390d7df0b01d5e9d565247f5aed0addb5ab8f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/356336 Commit-Queue: Chris Dalton Reviewed-by: Brian Salomon --- src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp | 2 ++ tests/GrCCPRTest.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp b/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp index 55c80c01e0..c2eb0b217d 100644 --- a/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp +++ b/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp @@ -38,6 +38,7 @@ bool GrCoverageCountingPathRenderer::IsSupported(const GrCaps& caps, CoverageTyp return true; } +#if 0 if (!caps.driverDisableMSAACCPR() && caps.internalMultisampleCount(defaultA8Format) > 1 && caps.sampleLocationsSupport() && @@ -47,6 +48,7 @@ bool GrCoverageCountingPathRenderer::IsSupported(const GrCaps& caps, CoverageTyp } return true; } +#endif return false; } diff --git a/tests/GrCCPRTest.cpp b/tests/GrCCPRTest.cpp index 60fbe130c4..d152ac4215 100644 --- a/tests/GrCCPRTest.cpp +++ b/tests/GrCCPRTest.cpp @@ -63,9 +63,11 @@ public: fDContext.get(), GrColorType::kRGBA_8888, nullptr, SkBackingFit::kExact, {kCanvasSize, kCanvasSize})) , fDoStroke(DoStroke::kYes == doStroke) { +#if 0 if (!fCCPR) { ERRORF(reporter, "ccpr not enabled in GrDirectContext for ccpr tests"); } +#endif if (!fRTC) { ERRORF(reporter, "failed to create GrSurfaceDrawContext for ccpr tests"); }