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/GrPathRenderer.h b/src/gpu/GrPathRenderer.h
index bba03d3..dfe7a71 100644
--- a/src/gpu/GrPathRenderer.h
+++ b/src/gpu/GrPathRenderer.h
@@ -72,17 +72,6 @@
kYes
};
- /**
- * This enum defines a set of flags indicating which AA methods would be acceptable for a path
- * renderer to employ (if any) while drawing a given path.
- */
- enum class AATypeFlags {
- kNone = 0,
- kCoverage = (1 << 0),
- kMSAA = (1 << 1),
- kMixedSampledStencilThenCover = (1 << 2),
- };
-
struct CanDrawPathArgs {
SkDEBUGCODE(CanDrawPathArgs() { memset(this, 0, sizeof(*this)); }) // For validation.
@@ -90,7 +79,7 @@
const SkIRect* fClipConservativeBounds;
const SkMatrix* fViewMatrix;
const GrShape* fShape;
- AATypeFlags fAATypeFlags;
+ GrAAType fAAType;
bool fTargetIsWrappedVkSecondaryCB;
// This is only used by GrStencilAndCoverPathRenderer
@@ -125,7 +114,7 @@
const SkIRect* fClipConservativeBounds;
const SkMatrix* fViewMatrix;
const GrShape* fShape;
- AATypeFlags fAATypeFlags;
+ GrAAType fAAType;
bool fGammaCorrect;
#ifdef SK_DEBUG
void validate() const {
@@ -213,6 +202,4 @@
typedef SkRefCnt INHERITED;
};
-GR_MAKE_BITFIELD_CLASS_OPS(GrPathRenderer::AATypeFlags);
-
#endif