diff options
| -rw-r--r-- | include/gpu/GrCaps.h | 3 | ||||
| -rw-r--r-- | src/gpu/GrCaps.cpp | 1 | ||||
| -rw-r--r-- | src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 5 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkCaps.cpp | 1 |
5 files changed, 12 insertions, 1 deletions
diff --git a/include/gpu/GrCaps.h b/include/gpu/GrCaps.h index 817d7152d6..ac4de03ed8 100644 --- a/include/gpu/GrCaps.h +++ b/include/gpu/GrCaps.h @@ -74,6 +74,8 @@ public: bool avoidInstancedDrawsToFPTargets() const { return fAvoidInstancedDrawsToFPTargets; } + bool blacklistCoverageCounting() const { return fBlacklistCoverageCounting; } + bool avoidStencilBuffers() const { return fAvoidStencilBuffers; } /** @@ -210,6 +212,7 @@ protected: // Driver workaround bool fUseDrawInsteadOfClear : 1; bool fAvoidInstancedDrawsToFPTargets : 1; + bool fBlacklistCoverageCounting : 1; bool fAvoidStencilBuffers : 1; // ANGLE workaround diff --git a/src/gpu/GrCaps.cpp b/src/gpu/GrCaps.cpp index 3566b4ebf4..a0e435a9c3 100644 --- a/src/gpu/GrCaps.cpp +++ b/src/gpu/GrCaps.cpp @@ -79,6 +79,7 @@ GrCaps::GrCaps(const GrContextOptions& options) { #endif fBufferMapThreshold = options.fBufferMapThreshold; fAvoidInstancedDrawsToFPTargets = false; + fBlacklistCoverageCounting = false; fAvoidStencilBuffers = false; fPreferVRAMUseOverFlushes = true; diff --git a/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp b/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp index 9c41a9a4e1..583f39b321 100644 --- a/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp +++ b/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp @@ -31,7 +31,8 @@ bool GrCoverageCountingPathRenderer::IsSupported(const GrCaps& caps) { shaderCaps.maxVertexSamplers() >= 1 && caps.instanceAttribSupport() && caps.isConfigTexturable(kAlpha_half_GrPixelConfig) && - caps.isConfigRenderable(kAlpha_half_GrPixelConfig, /*withMSAA=*/false); + caps.isConfigRenderable(kAlpha_half_GrPixelConfig, /*withMSAA=*/false) && + !caps.blacklistCoverageCounting(); } sk_sp<GrCoverageCountingPathRenderer> diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 6193814bbe..d476586316 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -388,6 +388,11 @@ void GrGLCaps::init(const GrContextOptions& contextOptions, fPreferClientSideDynamicBuffers = true; } + // Mali GPUs have serious issues with CCPR. Blacklisting until we can look into workarounds. + if (kARM_GrGLVendor == ctxInfo.vendor()) { + fBlacklistCoverageCounting = true; + } + if (!contextOptions.fAvoidStencilBuffers) { // To reduce surface area, if we avoid stencil buffers, we also disable MSAA. this->initFSAASupport(contextOptions, ctxInfo, gli); diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp index 945f87f6de..c92c7d59f9 100644 --- a/src/gpu/vk/GrVkCaps.cpp +++ b/src/gpu/vk/GrVkCaps.cpp @@ -36,6 +36,7 @@ GrVkCaps::GrVkCaps(const GrContextOptions& contextOptions, const GrVkInterface* fInstanceAttribSupport = true; fUseDrawInsteadOfClear = false; + fBlacklistCoverageCounting = true; // blacklisting ccpr until we work through a few issues. fFenceSyncSupport = true; // always available in Vulkan fCrossContextTextureSupport = false; |