Eliminate mixed samples as an FBO type or AA type
From now on, sample counts always refer to the number of actual color
samples, and render targets don't have separate color and stencil
sample counts.
If mixed samples support is available when making a
"GrAAType::kCoverage" draw, then an op may attach and use a mixed
sampled stencil buffer internally. But this will all be invisible to
the client.
After this CL, we temporarily won't have a mode to use nvpr with mixed
samples. That will soon be fixed by a follow-on CL that enables nvpr
with mixed samples in the normal "gl" and "gles" configs.
Bug: skia:
Change-Id: I1cb8277f0d2d0d371f24bb9f39cd473ed5c5c83b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221878
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/GrClipStackClip.cpp b/src/gpu/GrClipStackClip.cpp
index 48d4cb4..925e24e 100644
--- a/src/gpu/GrClipStackClip.cpp
+++ b/src/gpu/GrClipStackClip.cpp
@@ -115,10 +115,8 @@
}
// We only use this method when rendering coverage clip masks.
- SkASSERT(GrFSAAType::kNone == renderTargetContext->fsaaType());
- auto aaTypeFlags = (element->isAA())
- ? GrPathRenderer::AATypeFlags::kCoverage
- : GrPathRenderer::AATypeFlags::kNone;
+ SkASSERT(renderTargetContext->numSamples() <= 1);
+ auto aaType = (element->isAA()) ? GrAAType::kCoverage : GrAAType::kNone;
GrPathRendererChain::DrawType type =
needsStencil ? GrPathRendererChain::DrawType::kStencilAndColor
@@ -130,7 +128,7 @@
canDrawArgs.fClipConservativeBounds = &scissorRect;
canDrawArgs.fViewMatrix = &viewMatrix;
canDrawArgs.fShape = &shape;
- canDrawArgs.fAATypeFlags = aaTypeFlags;
+ canDrawArgs.fAAType = aaType;
SkASSERT(!renderTargetContext->wrapsVkSecondaryCB());
canDrawArgs.fTargetIsWrappedVkSecondaryCB = false;
canDrawArgs.fHasUserStencilSettings = hasUserStencilSettings;
@@ -215,13 +213,9 @@
int maxWindowRectangles = renderTargetContext->priv().maxWindowRectangles();
int maxAnalyticFPs = kMaxAnalyticFPs;
- if (GrFSAAType::kNone != renderTargetContext->fsaaType()) {
- // With mixed samples (non-msaa color buffer), any coverage info is lost from color once it
- // hits the color buffer anyway, so we may as well use coverage AA if nothing else in the
- // pipe is multisampled.
- if (renderTargetContext->numColorSamples() > 1 || useHWAA || hasUserStencilSettings) {
- maxAnalyticFPs = 0;
- }
+ if (renderTargetContext->numSamples() > 1 || useHWAA || hasUserStencilSettings) {
+ // Disable analytic clips when we have MSAA. In MSAA we never conflate coverage and opacity.
+ maxAnalyticFPs = 0;
// We disable MSAA when avoiding stencil.
SkASSERT(!context->priv().caps()->avoidStencilBuffers());
}
@@ -273,8 +267,8 @@
SkASSERT(rtIBounds.contains(scissor)); // Mask shouldn't be larger than the RT.
#endif
- // If the stencil buffer is multisampled we can use it to do everything.
- if ((GrFSAAType::kNone == renderTargetContext->fsaaType() && reducedClip.maskRequiresAA()) ||
+ // MIXED SAMPLES TODO: We may want to explore using the stencil buffer for AA clipping.
+ if ((renderTargetContext->numSamples() <= 1 && reducedClip.maskRequiresAA()) ||
context->priv().caps()->avoidStencilBuffers() ||
renderTargetContext->wrapsVkSecondaryCB()) {
sk_sp<GrTextureProxy> result;