From 582c84c8481a9762515cf16c948b9a7a9c1134a1 Mon Sep 17 00:00:00 2001 From: Michael Ludwig Date: Wed, 27 Apr 2022 20:06:56 -0400 Subject: [PATCH] Remove unused clip atlas cap This referred to CCPR's atlas and is not actually related to the current clip atlas. Nothing was checking for this cap, and my guess is it could have been cleaned up when CCPR was removed. Change-Id: If276a123a1d9ccf7301bf26f65ff3f4fbe97b3e1 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/534521 Reviewed-by: Brian Salomon Auto-Submit: Michael Ludwig Commit-Queue: Brian Salomon --- src/gpu/ganesh/GrCaps.cpp | 4 ---- src/gpu/ganesh/GrCaps.h | 4 ---- src/gpu/ganesh/vk/GrVkCaps.cpp | 5 ----- 3 files changed, 13 deletions(-) diff --git a/src/gpu/ganesh/GrCaps.cpp b/src/gpu/ganesh/GrCaps.cpp index 3d02f16551..ccd98eb245 100644 --- a/src/gpu/ganesh/GrCaps.cpp +++ b/src/gpu/ganesh/GrCaps.cpp @@ -56,7 +56,6 @@ GrCaps::GrCaps(const GrContextOptions& options) { fReadPixelsRowBytesSupport = false; fShouldCollapseSrcOverToSrcWhenAble = false; fMustSyncGpuDuringAbandon = true; - fDriverDisableMSAAClipAtlas = false; fDisableTessellationPathRenderer = false; fBlendEquationSupport = kBasic_BlendEquationSupport; @@ -111,7 +110,6 @@ void GrCaps::applyOptionsOverrides(const GrContextOptions& options) { fShaderCaps->applyOptionsOverrides(options); this->onApplyOptionsOverrides(options); if (options.fDisableDriverCorrectnessWorkarounds) { - SkASSERT(!fDriverDisableMSAAClipAtlas); SkASSERT(!fDisableTessellationPathRenderer); SkASSERT(!fAvoidStencilBuffers); SkASSERT(!fAvoidWritePixelsFastPath); @@ -235,8 +233,6 @@ void GrCaps::dumpJSON(SkJSONWriter* writer) const { writer->appendBool("Write pixels row bytes support", fWritePixelsRowBytesSupport); writer->appendBool("Transfer pixels to row bytes support", fTransferPixelsToRowBytesSupport); writer->appendBool("Read pixels row bytes support", fReadPixelsRowBytesSupport); - writer->appendBool("Disable msaa clip mask atlas on current driver [workaround]", - fDriverDisableMSAAClipAtlas); writer->appendBool("Disable TessellationPathRenderer current driver [workaround]", fDisableTessellationPathRenderer); writer->appendBool("Clamp-to-border", fClampToBorderSupport); diff --git a/src/gpu/ganesh/GrCaps.h b/src/gpu/ganesh/GrCaps.h index 43b0f63ac1..a606b232cc 100644 --- a/src/gpu/ganesh/GrCaps.h +++ b/src/gpu/ganesh/GrCaps.h @@ -401,9 +401,6 @@ public: /// op instead of using glClear seems to resolve the issue. bool performStencilClearsAsDraws() const { return fPerformStencilClearsAsDraws; } - // Should we disable the clip mask atlas due to a faulty driver? - bool driverDisableMSAAClipAtlas() const { return fDriverDisableMSAAClipAtlas; } - // Should we disable TessellationPathRenderer due to a faulty driver? bool disableTessellationPathRenderer() const { return fDisableTessellationPathRenderer; } @@ -576,7 +573,6 @@ protected: bool fMustSyncGpuDuringAbandon : 1; // Driver workaround - bool fDriverDisableMSAAClipAtlas : 1; bool fDisableTessellationPathRenderer : 1; bool fAvoidStencilBuffers : 1; bool fAvoidWritePixelsFastPath : 1; diff --git a/src/gpu/ganesh/vk/GrVkCaps.cpp b/src/gpu/ganesh/vk/GrVkCaps.cpp index 4f61e299d3..0cf29677a7 100644 --- a/src/gpu/ganesh/vk/GrVkCaps.cpp +++ b/src/gpu/ganesh/vk/GrVkCaps.cpp @@ -568,11 +568,6 @@ void GrVkCaps::applyDriverCorrectnessWorkarounds(const VkPhysicalDevicePropertie // GrCaps workarounds //////////////////////////////////////////////////////////////////////////// -#ifdef SK_BUILD_FOR_ANDROID - // MSAA CCPR was slow on Android. http://skbug.com/9676 - fDriverDisableMSAAClipAtlas = true; -#endif - if (kARM_VkVendor == properties.vendorID) { fAvoidWritePixelsFastPath = true; // bugs.skia.org/8064 }