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

Remove unused clip atlas cap

Browse Source 
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 <bsalomon@google.com>
Auto-Submit: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
This commit is contained in:
Michael Ludwig 2022-04-27 20:06:56 -04:00 committed by SkCQ
parent 8aef5432c8
commit 582c84c848
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gpu/ganesh/GrCaps.cpp
View File

@ -56,7 +56,6 @@ GrCaps::GrCaps(const GrContextOptions& options) {
fReadPixelsRowBytesSupport = false; fReadPixelsRowBytesSupport = false;
fShouldCollapseSrcOverToSrcWhenAble = false; fShouldCollapseSrcOverToSrcWhenAble = false;
fMustSyncGpuDuringAbandon = true; fMustSyncGpuDuringAbandon = true;
fDriverDisableMSAAClipAtlas = false;
fDisableTessellationPathRenderer = false; fDisableTessellationPathRenderer = false;
fBlendEquationSupport = kBasic_BlendEquationSupport; fBlendEquationSupport = kBasic_BlendEquationSupport;
@ -111,7 +110,6 @@ void GrCaps::applyOptionsOverrides(const GrContextOptions& options) {
fShaderCaps->applyOptionsOverrides(options); fShaderCaps->applyOptionsOverrides(options);
this->onApplyOptionsOverrides(options); this->onApplyOptionsOverrides(options);
if (options.fDisableDriverCorrectnessWorkarounds) { if (options.fDisableDriverCorrectnessWorkarounds) {
SkASSERT(!fDriverDisableMSAAClipAtlas);
SkASSERT(!fDisableTessellationPathRenderer); SkASSERT(!fDisableTessellationPathRenderer);
SkASSERT(!fAvoidStencilBuffers); SkASSERT(!fAvoidStencilBuffers);
SkASSERT(!fAvoidWritePixelsFastPath); SkASSERT(!fAvoidWritePixelsFastPath);
@ -235,8 +233,6 @@ void GrCaps::dumpJSON(SkJSONWriter* writer) const {
writer->appendBool("Write pixels row bytes support", fWritePixelsRowBytesSupport); writer->appendBool("Write pixels row bytes support", fWritePixelsRowBytesSupport);
writer->appendBool("Transfer pixels to row bytes support", fTransferPixelsToRowBytesSupport); writer->appendBool("Transfer pixels to row bytes support", fTransferPixelsToRowBytesSupport);
writer->appendBool("Read pixels row bytes support", fReadPixelsRowBytesSupport); 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]", writer->appendBool("Disable TessellationPathRenderer current driver [workaround]",
fDisableTessellationPathRenderer); fDisableTessellationPathRenderer);
writer->appendBool("Clamp-to-border", fClampToBorderSupport); writer->appendBool("Clamp-to-border", fClampToBorderSupport);

4
src/gpu/ganesh/GrCaps.h
View File

@ -401,9 +401,6 @@ public:
/// op instead of using glClear seems to resolve the issue. /// op instead of using glClear seems to resolve the issue.
bool performStencilClearsAsDraws() const { return fPerformStencilClearsAsDraws; } 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? // Should we disable TessellationPathRenderer due to a faulty driver?
bool disableTessellationPathRenderer() const { return fDisableTessellationPathRenderer; } bool disableTessellationPathRenderer() const { return fDisableTessellationPathRenderer; }
@ -576,7 +573,6 @@ protected:
bool fMustSyncGpuDuringAbandon : 1; bool fMustSyncGpuDuringAbandon : 1;
// Driver workaround // Driver workaround
bool fDriverDisableMSAAClipAtlas : 1;
bool fDisableTessellationPathRenderer : 1; bool fDisableTessellationPathRenderer : 1;
bool fAvoidStencilBuffers : 1; bool fAvoidStencilBuffers : 1;
bool fAvoidWritePixelsFastPath : 1; bool fAvoidWritePixelsFastPath : 1;

5
src/gpu/ganesh/vk/GrVkCaps.cpp
View File

@ -568,11 +568,6 @@ void GrVkCaps::applyDriverCorrectnessWorkarounds(const VkPhysicalDevicePropertie
// GrCaps workarounds // 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) { if (kARM_VkVendor == properties.vendorID) {
fAvoidWritePixelsFastPath = true; // bugs.skia.org/8064 fAvoidWritePixelsFastPath = true; // bugs.skia.org/8064
} }