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/bench/VertexColorSpaceBench.cpp b/bench/VertexColorSpaceBench.cpp
index 33d2a6a..0a5a15b 100644
--- a/bench/VertexColorSpaceBench.cpp
+++ b/bench/VertexColorSpaceBench.cpp
@@ -151,8 +151,8 @@
return FixedFunctionFlags::kNone;
}
- GrProcessorSet::Analysis finalize(
- const GrCaps&, const GrAppliedClip*, GrFSAAType, GrClampType) override {
+ GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*,
+ bool hasMixedSampledCoverage, GrClampType) override {
return GrProcessorSet::EmptySetAnalysis();
}
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index 667e40c..0cab138 100644
--- a/gm/beziereffects.cpp
+++ b/gm/beziereffects.cpp
@@ -58,11 +58,12 @@
public:
FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; }
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
return fProcessorSet.finalize(
fColor, GrProcessorAnalysisCoverage::kSingleChannel, clip,
- &GrUserStencilSettings::kUnused, fsaaType, caps, clampType, &fColor);
+ &GrUserStencilSettings::kUnused, hasMixedSampledCoverage, caps, clampType, &fColor);
}
void visitProxies(const VisitProxyFunc& func) const override {
diff --git a/gm/clockwise.cpp b/gm/clockwise.cpp
index 1dd96ec..0fa0935 100644
--- a/gm/clockwise.cpp
+++ b/gm/clockwise.cpp
@@ -143,8 +143,8 @@
const char* name() const override { return "ClockwiseTestOp"; }
FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; }
- GrProcessorSet::Analysis finalize(
- const GrCaps&, const GrAppliedClip*, GrFSAAType, GrClampType) override {
+ GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*,
+ bool hasMixedSampledCoverage, GrClampType) override {
return GrProcessorSet::EmptySetAnalysis();
}
void onPrepare(GrOpFlushState*) override {}
diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp
index 801ebb9..987ecf1 100644
--- a/gm/convexpolyeffect.cpp
+++ b/gm/convexpolyeffect.cpp
@@ -86,11 +86,12 @@
FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; }
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
return fProcessors.finalize(
fColor, GrProcessorAnalysisCoverage::kNone, clip, &GrUserStencilSettings::kUnused,
- fsaaType, caps, clampType, &fColor);
+ hasMixedSampledCoverage, caps, clampType, &fColor);
}
private:
diff --git a/gm/fwidth_squircle.cpp b/gm/fwidth_squircle.cpp
index 92b92f0..8a563ad 100644
--- a/gm/fwidth_squircle.cpp
+++ b/gm/fwidth_squircle.cpp
@@ -153,7 +153,7 @@
const char* name() const override { return "ClockwiseTestOp"; }
FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; }
GrProcessorSet::Analysis finalize(
- const GrCaps&, const GrAppliedClip*, GrFSAAType, GrClampType) override {
+ const GrCaps&, const GrAppliedClip*, bool hasMixedSampledCoverage, GrClampType) override {
return GrProcessorSet::EmptySetAnalysis();
}
void onPrepare(GrOpFlushState*) override {}
diff --git a/gm/samplelocations.cpp b/gm/samplelocations.cpp
index 4bab565..d3053a9 100644
--- a/gm/samplelocations.cpp
+++ b/gm/samplelocations.cpp
@@ -210,8 +210,8 @@
FixedFunctionFlags fixedFunctionFlags() const override {
return FixedFunctionFlags::kUsesHWAA | FixedFunctionFlags::kUsesStencil;
}
- GrProcessorSet::Analysis finalize(
- const GrCaps&, const GrAppliedClip*, GrFSAAType, GrClampType) override {
+ GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*,
+ bool hasMixedSampledCoverage, GrClampType) override {
return GrProcessorSet::EmptySetAnalysis();
}
void onPrepare(GrOpFlushState*) override {}
@@ -254,7 +254,8 @@
DrawResult SampleLocationsGM::onDraw(
GrContext* ctx, GrRenderTargetContext* rtc, SkCanvas* canvas, SkString* errorMsg) {
- if (rtc->numStencilSamples() <= 1) {
+ if (rtc->numSamples() <= 1) {
+ // MIXED SAMPLES TODO: && !ctx->caps()->mixedSamplesSupport()
*errorMsg = "MSAA only.";
return DrawResult::kSkip;
}
@@ -279,10 +280,12 @@
if (auto offscreenRTC = ctx->priv().makeDeferredRenderTargetContext(
rtc->asSurfaceProxy()->backendFormat(), SkBackingFit::kExact, 200, 200,
- rtc->asSurfaceProxy()->config(), nullptr, rtc->numStencilSamples(), GrMipMapped::kNo,
+ rtc->asSurfaceProxy()->config(), nullptr, rtc->numSamples(), GrMipMapped::kNo,
fOrigin)) {
offscreenRTC->clear(nullptr, {0,1,0,1}, GrRenderTargetContext::CanClearFullscreen::kYes);
+ // MIXED SAMPLES TODO: Mixed sampled stencil buffer.
+
// Stencil.
offscreenRTC->priv().testingOnly_addDrawOp(
SampleLocationsTestOp::Make(ctx, canvas->getTotalMatrix(), fGradType));
diff --git a/gm/windowrectangles.cpp b/gm/windowrectangles.cpp
index 13d0489..a20f3f3 100644
--- a/gm/windowrectangles.cpp
+++ b/gm/windowrectangles.cpp
@@ -214,7 +214,7 @@
const GrReducedClip reducedClip(stack, SkRect::Make(kCoverRect), rtc->caps(), kNumWindows);
GrPaint paint;
- if (GrFSAAType::kNone == rtc->fsaaType()) {
+ if (rtc->numSamples() <= 1) {
paint.setColor4f({ 0, 0.25f, 1, 1 });
this->visualizeAlphaMask(ctx, rtc, reducedClip, std::move(paint));
} else {
diff --git a/include/core/SkSurfaceCharacterization.h b/include/core/SkSurfaceCharacterization.h
index 74416e2..774b0b8 100644
--- a/include/core/SkSurfaceCharacterization.h
+++ b/include/core/SkSurfaceCharacterization.h
@@ -40,8 +40,7 @@
: fCacheMaxResourceBytes(0)
, fOrigin(kBottomLeft_GrSurfaceOrigin)
, fConfig(kUnknown_GrPixelConfig)
- , fFSAAType(GrFSAAType::kNone)
- , fStencilCnt(0)
+ , fSampleCnt(0)
, fIsTextureable(Textureable::kYes)
, fIsMipMapped(MipMapped::kYes)
, fUsesGLFBO0(UsesGLFBO0::kNo)
@@ -72,8 +71,7 @@
int width() const { return fImageInfo.width(); }
int height() const { return fImageInfo.height(); }
SkColorType colorType() const { return fImageInfo.colorType(); }
- GrFSAAType fsaaType() const { return fFSAAType; }
- int stencilCount() const { return fStencilCnt; }
+ int sampleCount() const { return fSampleCnt; }
bool isTextureable() const { return Textureable::kYes == fIsTextureable; }
bool isMipMapped() const { return MipMapped::kYes == fIsMipMapped; }
bool usesGLFBO0() const { return UsesGLFBO0::kYes == fUsesGLFBO0; }
@@ -98,7 +96,7 @@
const SkImageInfo& ii,
GrSurfaceOrigin origin,
GrPixelConfig config,
- GrFSAAType FSAAType, int stencilCnt,
+ int sampleCnt,
Textureable isTextureable, MipMapped isMipMapped,
UsesGLFBO0 usesGLFBO0,
VulkanSecondaryCBCompatible vulkanSecondaryCBCompatible,
@@ -108,8 +106,7 @@
, fImageInfo(ii)
, fOrigin(origin)
, fConfig(config)
- , fFSAAType(FSAAType)
- , fStencilCnt(stencilCnt)
+ , fSampleCnt(sampleCnt)
, fIsTextureable(isTextureable)
, fIsMipMapped(isMipMapped)
, fUsesGLFBO0(usesGLFBO0)
@@ -122,8 +119,7 @@
const SkImageInfo& ii,
GrSurfaceOrigin origin,
GrPixelConfig config,
- GrFSAAType fsaaType,
- int stencilCnt,
+ int sampleCnt,
Textureable isTextureable,
MipMapped isMipMapped,
UsesGLFBO0 usesGLFBO0,
@@ -143,8 +139,7 @@
fImageInfo = ii;
fOrigin = origin;
fConfig = config;
- fFSAAType = fsaaType;
- fStencilCnt = stencilCnt;
+ fSampleCnt = sampleCnt;
fIsTextureable = isTextureable;
fIsMipMapped = isMipMapped;
fUsesGLFBO0 = usesGLFBO0;
@@ -158,8 +153,7 @@
SkImageInfo fImageInfo;
GrSurfaceOrigin fOrigin;
GrPixelConfig fConfig;
- GrFSAAType fFSAAType;
- int fStencilCnt;
+ int fSampleCnt;
Textureable fIsTextureable;
MipMapped fIsMipMapped;
UsesGLFBO0 fUsesGLFBO0;
diff --git a/include/gpu/GrRenderTarget.h b/include/gpu/GrRenderTarget.h
index 2189c63..e29d338 100644
--- a/include/gpu/GrRenderTarget.h
+++ b/include/gpu/GrRenderTarget.h
@@ -32,29 +32,10 @@
GrRenderTarget* asRenderTarget() override { return this; }
const GrRenderTarget* asRenderTarget() const override { return this; }
- // GrRenderTarget
- bool isStencilBufferMultisampled() const { return fSampleCnt > 1; }
-
- GrFSAAType fsaaType() const {
- SkASSERT(fSampleCnt >= 1);
- if (fSampleCnt <= 1) {
- SkASSERT(!this->hasMixedSamples());
- return GrFSAAType::kNone;
- }
- return this->hasMixedSamples() ? GrFSAAType::kMixedSamples : GrFSAAType::kUnifiedMSAA;
- }
-
/**
- * Returns the number of samples/pixel in the stencil buffer (One if non-MSAA).
+ * Returns the number of samples/pixel in the color buffer (One if non-MSAA).
*/
- int numStencilSamples() const { return fSampleCnt; }
-
- /**
- * Returns the number of samples/pixel in the color buffer (One if non-MSAA or mixed sampled).
- */
- int numColorSamples() const {
- return GrFSAAType::kMixedSamples == this->fsaaType() ? 1 : fSampleCnt;
- }
+ int numSamples() const { return fSampleCnt; }
/**
* Call to indicate the multisample contents were modified such that the
diff --git a/include/gpu/GrSurface.h b/include/gpu/GrSurface.h
index 32f04c7..6998eb4 100644
--- a/include/gpu/GrSurface.h
+++ b/include/gpu/GrSurface.h
@@ -86,12 +86,6 @@
bool readOnly() const { return fSurfaceFlags & GrInternalSurfaceFlags::kReadOnly; }
protected:
- void setHasMixedSamples() {
- SkASSERT(this->asRenderTarget());
- fSurfaceFlags |= GrInternalSurfaceFlags::kMixedSampled;
- }
- bool hasMixedSamples() const { return fSurfaceFlags & GrInternalSurfaceFlags::kMixedSampled; }
-
void setGLRTFBOIDIs0() {
SkASSERT(this->asRenderTarget());
fSurfaceFlags |= GrInternalSurfaceFlags::kGLRTFBOIDIs0;
diff --git a/include/private/GrTypesPriv.h b/include/private/GrTypesPriv.h
index b6369b4..396dd0e 100644
--- a/include/private/GrTypesPriv.h
+++ b/include/private/GrTypesPriv.h
@@ -282,15 +282,10 @@
enum class GrAAType : unsigned {
/** No antialiasing */
kNone,
- /** Use fragment shader code to compute a fractional pixel coverage. */
+ /** Use fragment shader code or mixed samples to blend with a fractional pixel coverage. */
kCoverage,
/** Use normal MSAA. */
- kMSAA,
- /**
- * Use "mixed samples" MSAA such that the stencil buffer is multisampled but the color buffer is
- * not.
- */
- kMixedSamples
+ kMSAA
};
static inline bool GrAATypeIsHW(GrAAType type) {
@@ -301,23 +296,11 @@
return false;
case GrAAType::kMSAA:
return true;
- case GrAAType::kMixedSamples:
- return true;
}
SK_ABORT("Unknown AA Type");
return false;
}
-/** The type of full scene antialiasing supported by a render target. */
-enum class GrFSAAType {
- /** No FSAA */
- kNone,
- /** Regular MSAA where each attachment has the same sample count. */
- kUnifiedMSAA,
- /** One color sample, N stencil samples. */
- kMixedSamples,
-};
-
/**
* Some pixel configs are inherently clamped to [0,1], some are allowed to go outside that range,
* and some are FP but manually clamped in the XP.
@@ -782,18 +765,10 @@
// RT-level
- // For internal resources:
- // this is enabled whenever MSAA is enabled and GrCaps reports mixed samples are supported
- // For wrapped resources:
- // this is disabled for FBO0
- // but, otherwise, is enabled whenever MSAA is enabled and GrCaps reports mixed samples
- // are supported
- kMixedSampled = 1 << 1,
-
// This flag is for use with GL only. It tells us that the internal render target wraps FBO 0.
kGLRTFBOIDIs0 = 1 << 2,
- kRenderTargetMask = kMixedSampled | kGLRTFBOIDIs0,
+ kRenderTargetMask = kGLRTFBOIDIs0,
};
GR_MAKE_BITFIELD_CLASS_OPS(GrInternalSurfaceFlags)
diff --git a/samplecode/SampleCCPRGeometry.cpp b/samplecode/SampleCCPRGeometry.cpp
index 5eb5955..7d79369 100644
--- a/samplecode/SampleCCPRGeometry.cpp
+++ b/samplecode/SampleCCPRGeometry.cpp
@@ -94,8 +94,8 @@
private:
FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; }
- GrProcessorSet::Analysis finalize(
- const GrCaps&, const GrAppliedClip*, GrFSAAType, GrClampType) override {
+ GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*,
+ bool hasMixedSampledCoverage, GrClampType) override {
return GrProcessorSet::EmptySetAnalysis();
}
void onPrepare(GrOpFlushState*) override {}
diff --git a/src/atlastext/SkAtlasTextTarget.cpp b/src/atlastext/SkAtlasTextTarget.cpp
index e6f1d4e..5bfcdb9 100644
--- a/src/atlastext/SkAtlasTextTarget.cpp
+++ b/src/atlastext/SkAtlasTextTarget.cpp
@@ -212,9 +212,9 @@
for (int i = 0; i < fGeoCount; ++i) {
fGeoData[i].fColor = color4f;
}
- // Atlas text doesn't use MSAA, so no need to handle a GrFSAAType.
+ // Atlas text doesn't use MSAA, so no need to handle mixed samples.
// Also, no need to support normalized F16 with manual clamp?
- this->finalize(caps, nullptr /* applied clip */, GrFSAAType::kNone, GrClampType::kAuto);
+ this->finalize(caps, nullptr /* applied clip */, false /* mixed samples */, GrClampType::kAuto);
}
void GrAtlasTextOp::executeForTextTarget(SkAtlasTextTarget* target) {
diff --git a/src/core/SkDeferredDisplayListRecorder.cpp b/src/core/SkDeferredDisplayListRecorder.cpp
index 1b0168e..bdbee29 100644
--- a/src/core/SkDeferredDisplayListRecorder.cpp
+++ b/src/core/SkDeferredDisplayListRecorder.cpp
@@ -134,7 +134,7 @@
desc.fWidth = fCharacterization.width();
desc.fHeight = fCharacterization.height();
desc.fConfig = fCharacterization.config();
- desc.fSampleCnt = fCharacterization.stencilCount();
+ desc.fSampleCnt = fCharacterization.sampleCount();
sk_sp<SkDeferredDisplayList::LazyProxyData> lazyProxyData = fLazyProxyData;
@@ -143,10 +143,6 @@
// DDL is being replayed into.
GrInternalSurfaceFlags surfaceFlags = GrInternalSurfaceFlags::kNone;
- if (fContext->priv().caps()->usesMixedSamples() && desc.fSampleCnt > 1 && !usesGLFBO0) {
- // In GL, FBO 0 never supports mixed samples
- surfaceFlags |= GrInternalSurfaceFlags::kMixedSampled;
- }
if (usesGLFBO0) {
surfaceFlags |= GrInternalSurfaceFlags::kGLRTFBOIDIs0;
}
diff --git a/src/core/SkSurfaceCharacterization.cpp b/src/core/SkSurfaceCharacterization.cpp
index 00453a6..a73c6e7 100644
--- a/src/core/SkSurfaceCharacterization.cpp
+++ b/src/core/SkSurfaceCharacterization.cpp
@@ -24,8 +24,7 @@
fOrigin == other.fOrigin &&
fImageInfo == other.fImageInfo &&
fConfig == other.fConfig &&
- fFSAAType == other.fFSAAType &&
- fStencilCnt == other.fStencilCnt &&
+ fSampleCnt == other.fSampleCnt &&
fIsTextureable == other.fIsTextureable &&
fIsMipMapped == other.fIsMipMapped &&
fUsesGLFBO0 == other.fUsesGLFBO0 &&
@@ -45,8 +44,8 @@
}
return SkSurfaceCharacterization(fContextInfo, fCacheMaxResourceBytes,
- fImageInfo.makeWH(width, height), fOrigin, fConfig, fFSAAType,
- fStencilCnt, fIsTextureable, fIsMipMapped, fUsesGLFBO0,
+ fImageInfo.makeWH(width, height), fOrigin, fConfig,
+ fSampleCnt, fIsTextureable, fIsMipMapped, fUsesGLFBO0,
fVulkanSecondaryCBCompatible, fSurfaceProps);
}
diff --git a/src/gpu/GrBlurUtils.cpp b/src/gpu/GrBlurUtils.cpp
index 577641a..1a97888 100644
--- a/src/gpu/GrBlurUtils.cpp
+++ b/src/gpu/GrBlurUtils.cpp
@@ -402,7 +402,7 @@
maskRect,
viewMatrix,
*shape,
- renderTargetContext->numColorSamples()));
+ renderTargetContext->numSamples()));
if (maskProxy) {
filteredMask = maskFilter->filterMaskGPU(context,
std::move(maskProxy),
diff --git a/src/gpu/GrCaps.cpp b/src/gpu/GrCaps.cpp
index af32a53..049fd5d 100644
--- a/src/gpu/GrCaps.cpp
+++ b/src/gpu/GrCaps.cpp
@@ -28,7 +28,7 @@
fSampleLocationsSupport = false;
fMultisampleDisableSupport = false;
fInstanceAttribSupport = false;
- fUsesMixedSamples = false;
+ fMixedSamplesSupport = false;
fUsePrimitiveRestart = false;
fPreferClientSideDynamicBuffers = false;
fPreferFullscreenClears = false;
@@ -205,7 +205,7 @@
writer->appendBool("Sample Locations Support", fSampleLocationsSupport);
writer->appendBool("Multisample disable support", fMultisampleDisableSupport);
writer->appendBool("Instance Attrib Support", fInstanceAttribSupport);
- writer->appendBool("Uses Mixed Samples", fUsesMixedSamples);
+ writer->appendBool("Mixed Samples Support", fMixedSamplesSupport);
writer->appendBool("Use primitive restart", fUsePrimitiveRestart);
writer->appendBool("Prefer client-side dynamic buffers", fPreferClientSideDynamicBuffers);
writer->appendBool("Prefer fullscreen clears", fPreferFullscreenClears);
diff --git a/src/gpu/GrCaps.h b/src/gpu/GrCaps.h
index c4c0379..1bc0c56 100644
--- a/src/gpu/GrCaps.h
+++ b/src/gpu/GrCaps.h
@@ -58,7 +58,7 @@
bool sampleLocationsSupport() const { return fSampleLocationsSupport; }
bool multisampleDisableSupport() const { return fMultisampleDisableSupport; }
bool instanceAttribSupport() const { return fInstanceAttribSupport; }
- bool usesMixedSamples() const { return fUsesMixedSamples; }
+ bool mixedSamplesSupport() const { return fMixedSamplesSupport; }
bool halfFloatVertexAttributeSupport() const { return fHalfFloatVertexAttributeSupport; }
// Primitive restart functionality is core in ES 3.0, but using it will cause slowdowns on some
@@ -391,7 +391,7 @@
bool fSampleLocationsSupport : 1;
bool fMultisampleDisableSupport : 1;
bool fInstanceAttribSupport : 1;
- bool fUsesMixedSamples : 1;
+ bool fMixedSamplesSupport : 1;
bool fUsePrimitiveRestart : 1;
bool fPreferClientSideDynamicBuffers : 1;
bool fPreferFullscreenClears : 1;
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;
diff --git a/src/gpu/GrContextThreadSafeProxy.cpp b/src/gpu/GrContextThreadSafeProxy.cpp
index 428fcde..89c3a47 100644
--- a/src/gpu/GrContextThreadSafeProxy.cpp
+++ b/src/gpu/GrContextThreadSafeProxy.cpp
@@ -61,12 +61,6 @@
return SkSurfaceCharacterization(); // return an invalid characterization
}
- GrFSAAType FSAAType = GrFSAAType::kNone;
- if (sampleCnt > 1) {
- FSAAType = this->caps()->usesMixedSamples() ? GrFSAAType::kMixedSamples
- : GrFSAAType::kUnifiedMSAA;
- }
-
if (willUseGLFBO0 && isTextureable) {
return SkSurfaceCharacterization(); // return an invalid characterization
}
@@ -78,7 +72,7 @@
return SkSurfaceCharacterization(sk_ref_sp<GrContextThreadSafeProxy>(this),
cacheMaxResourceBytes, ii,
- origin, config, FSAAType, sampleCnt,
+ origin, config, sampleCnt,
SkSurfaceCharacterization::Textureable(isTextureable),
SkSurfaceCharacterization::MipMapped(isMipMapped),
SkSurfaceCharacterization::UsesGLFBO0(willUseGLFBO0),
diff --git a/src/gpu/GrDrawOpTest.h b/src/gpu/GrDrawOpTest.h
index 9780278..fe8047c 100644
--- a/src/gpu/GrDrawOpTest.h
+++ b/src/gpu/GrDrawOpTest.h
@@ -27,10 +27,10 @@
/** GrDrawOp subclasses should define test factory functions using this macro. */
#define GR_DRAW_OP_TEST_DEFINE(Op) \
std::unique_ptr<GrDrawOp> Op##__Test(GrPaint&& paint, SkRandom* random, \
- GrRecordingContext* context, GrFSAAType fsaaType)
+ GrRecordingContext* context, int numSamples)
#define GR_DRAW_OP_TEST_FRIEND(Op) \
friend std::unique_ptr<GrDrawOp> Op##__Test(GrPaint&& paint, SkRandom* random, \
- GrRecordingContext* context, GrFSAAType fsaaType)
+ GrRecordingContext* context, int numSamples)
/** Helper for op test factories to pick a random stencil state. */
const GrUserStencilSettings* GrGetRandomStencil(SkRandom* random, GrContext_Base*);
diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index 1b737d4..1f38b77 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -399,7 +399,7 @@
int GrGpu::findOrAssignSamplePatternKey(GrRenderTarget* renderTarget) {
SkASSERT(this->caps()->sampleLocationsSupport());
- SkASSERT(renderTarget->numStencilSamples() > 1);
+ SkASSERT(renderTarget->numSamples() > 1);
SkSTArray<16, SkPoint> sampleLocations;
this->querySampleLocations(renderTarget, &sampleLocations);
diff --git a/src/gpu/GrPathRenderer.cpp b/src/gpu/GrPathRenderer.cpp
index 176b100..93a4d55 100644
--- a/src/gpu/GrPathRenderer.cpp
+++ b/src/gpu/GrPathRenderer.cpp
@@ -48,14 +48,11 @@
canArgs.fClipConservativeBounds = args.fClipConservativeBounds;
canArgs.fViewMatrix = args.fViewMatrix;
canArgs.fShape = args.fShape;
- canArgs.fAATypeFlags = args.fAATypeFlags;
+ canArgs.fAAType = args.fAAType;
canArgs.fTargetIsWrappedVkSecondaryCB = args.fRenderTargetContext->wrapsVkSecondaryCB();
canArgs.validate();
canArgs.fHasUserStencilSettings = !args.fUserStencilSettings->isUnused();
- if (AATypeFlags::kMixedSampledStencilThenCover & canArgs.fAATypeFlags) {
- SkASSERT(GrFSAAType::kMixedSamples == args.fRenderTargetContext->fsaaType());
- }
SkASSERT(CanDrawPath::kNo != this->canDrawPath(canArgs));
if (!args.fUserStencilSettings->isUnused()) {
SkPath path;
@@ -116,9 +113,7 @@
args.fClipConservativeBounds,
args.fViewMatrix,
args.fShape,
- (GrAA::kYes == args.fDoStencilMSAA)
- ? AATypeFlags::kMSAA
- : AATypeFlags::kNone,
+ (GrAA::kYes == args.fDoStencilMSAA) ? GrAAType::kMSAA : GrAAType::kNone,
false};
this->drawPath(drawArgs);
}
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
diff --git a/src/gpu/GrProcessorSet.cpp b/src/gpu/GrProcessorSet.cpp
index 0a120dd..cd30a88 100644
--- a/src/gpu/GrProcessorSet.cpp
+++ b/src/gpu/GrProcessorSet.cpp
@@ -162,8 +162,9 @@
GrProcessorSet::Analysis GrProcessorSet::finalize(
const GrProcessorAnalysisColor& colorInput, const GrProcessorAnalysisCoverage coverageInput,
- const GrAppliedClip* clip, const GrUserStencilSettings* userStencil, GrFSAAType fsaaType,
- const GrCaps& caps, GrClampType clampType, SkPMColor4f* overrideInputColor) {
+ const GrAppliedClip* clip, const GrUserStencilSettings* userStencil,
+ bool hasMixedSampledCoverage, const GrCaps& caps, GrClampType clampType,
+ SkPMColor4f* overrideInputColor) {
SkASSERT(!this->isFinalized());
SkASSERT(!fFragmentProcessorOffset);
@@ -234,8 +235,6 @@
fColorFragmentProcessorCnt -= colorFPsToEliminate;
analysis.fHasColorFragmentProcessor = (fColorFragmentProcessorCnt != 0);
- bool hasMixedSampledCoverage = (GrFSAAType::kMixedSamples == fsaaType)
- && !userStencil->testAlwaysPasses((clip) ? clip->hasStencilClip() : false);
auto xp = GrXPFactory::MakeXferProcessor(this->xpFactory(), colorAnalysis.outputColor(),
outputCoverage, hasMixedSampledCoverage, caps,
clampType);
diff --git a/src/gpu/GrProcessorSet.h b/src/gpu/GrProcessorSet.h
index cd67fd3..9583864 100644
--- a/src/gpu/GrProcessorSet.h
+++ b/src/gpu/GrProcessorSet.h
@@ -137,9 +137,10 @@
* that owns a processor set is recorded to ensure pending and writes are propagated to
* resources referred to by the processors. Otherwise, data hazards may occur.
*/
- Analysis finalize(const GrProcessorAnalysisColor&, const GrProcessorAnalysisCoverage,
- const GrAppliedClip*, const GrUserStencilSettings*, GrFSAAType, const GrCaps&,
- GrClampType, SkPMColor4f* inputColorOverride);
+ Analysis finalize(
+ const GrProcessorAnalysisColor&, const GrProcessorAnalysisCoverage,
+ const GrAppliedClip*, const GrUserStencilSettings*, bool hasMixedSampledCoverage,
+ const GrCaps&, GrClampType, SkPMColor4f* inputColorOverride);
bool isFinalized() const { return SkToBool(kFinalized_Flag & fFlags); }
diff --git a/src/gpu/GrProxyProvider.cpp b/src/gpu/GrProxyProvider.cpp
index 7a3c966..d19871f 100644
--- a/src/gpu/GrProxyProvider.cpp
+++ b/src/gpu/GrProxyProvider.cpp
@@ -241,12 +241,6 @@
}
}
- if (SkToBool(descFlags & kRenderTarget_GrSurfaceFlag)) {
- if (this->caps()->usesMixedSamples() && sampleCnt > 1) {
- surfaceFlags |= GrInternalSurfaceFlags::kMixedSampled;
- }
- }
-
GrSurfaceDesc desc;
desc.fWidth = srcImage->width();
desc.fHeight = srcImage->height();
@@ -751,14 +745,6 @@
SkASSERT(validate_backend_format_and_config(this->caps(), format, desc.fConfig));
-#ifdef SK_DEBUG
- if (SkToBool(kRenderTarget_GrSurfaceFlag & desc.fFlags)) {
- if (SkToBool(surfaceFlags & GrInternalSurfaceFlags::kMixedSampled)) {
- SkASSERT(this->caps()->usesMixedSamples() && desc.fSampleCnt > 1);
- }
- }
-#endif
-
GrColorType colorType = GrPixelConfigToColorType(desc.fConfig);
GrSwizzle texSwizzle = this->caps()->getTextureSwizzle(format, colorType);
GrSwizzle outSwizzle = this->caps()->getOutputSwizzle(format, colorType);
@@ -788,12 +774,6 @@
SkASSERT(SkToBool(kRenderTarget_GrSurfaceFlag & desc.fFlags));
SkASSERT(validate_backend_format_and_config(this->caps(), format, desc.fConfig));
-#ifdef SK_DEBUG
- if (SkToBool(surfaceFlags & GrInternalSurfaceFlags::kMixedSampled)) {
- SkASSERT(this->caps()->usesMixedSamples() && desc.fSampleCnt > 1);
- }
-#endif
-
using LazyInstantiationType = GrSurfaceProxy::LazyInstantiationType;
// For non-ddl draws always make lazy proxy's single use.
LazyInstantiationType lazyType = this->renderingDirectly() ? LazyInstantiationType::kSingleUse
@@ -829,9 +809,6 @@
GrInternalSurfaceFlags surfaceFlags = GrInternalSurfaceFlags::kNone;
if (Renderable::kYes == renderable) {
desc.fFlags = kRenderTarget_GrSurfaceFlag;
- if (sampleCnt > 1 && caps.usesMixedSamples()) {
- surfaceFlags |= GrInternalSurfaceFlags::kMixedSampled;
- }
}
desc.fWidth = -1;
desc.fHeight = -1;
diff --git a/src/gpu/GrReducedClip.cpp b/src/gpu/GrReducedClip.cpp
index c22eeaa..8f297d8 100644
--- a/src/gpu/GrReducedClip.cpp
+++ b/src/gpu/GrReducedClip.cpp
@@ -837,13 +837,12 @@
// walk through each clip element and perform its set op with the existing clip.
for (ElementList::Iter iter(fMaskElements); iter.get(); iter.next()) {
- using AATypeFlags = GrPathRenderer::AATypeFlags;
const Element* element = iter.get();
- bool doStencilMSAA =
- element->isAA() && GrFSAAType::kNone != renderTargetContext->fsaaType();
+ // MIXED SAMPLES TODO: We can use stencil with mixed samples as well.
+ bool doStencilMSAA = element->isAA() && renderTargetContext->numSamples() > 1;
// Since we are only drawing to the stencil buffer, we can use kMSAA even if the render
// target is mixed sampled.
- auto pathAATypeFlags = (doStencilMSAA) ? AATypeFlags::kMSAA : AATypeFlags::kNone;
+ auto pathAAType = (doStencilMSAA) ? GrAAType::kMSAA : GrAAType::kNone;
bool fillInverted = false;
// This will be used to determine whether the clip shape can be rendered into the
@@ -870,7 +869,7 @@
canDrawArgs.fClipConservativeBounds = &stencilClip.fixedClip().scissorRect();
canDrawArgs.fViewMatrix = &SkMatrix::I();
canDrawArgs.fShape = &shape;
- canDrawArgs.fAATypeFlags = pathAATypeFlags;
+ canDrawArgs.fAAType = pathAAType;
canDrawArgs.fHasUserStencilSettings = false;
canDrawArgs.fTargetIsWrappedVkSecondaryCB = renderTargetContext->wrapsVkSecondaryCB();
@@ -921,7 +920,7 @@
&stencilClip.fixedClip().scissorRect(),
&SkMatrix::I(),
&shape,
- pathAATypeFlags,
+ pathAAType,
false};
pr->drawPath(args);
} else {
@@ -958,7 +957,7 @@
&stencilClip.fixedClip().scissorRect(),
&SkMatrix::I(),
&shape,
- pathAATypeFlags,
+ pathAAType,
false};
pr->drawPath(args);
}
diff --git a/src/gpu/GrRenderTarget.cpp b/src/gpu/GrRenderTarget.cpp
index 4d4cff4..3642ec3 100644
--- a/src/gpu/GrRenderTarget.cpp
+++ b/src/gpu/GrRenderTarget.cpp
@@ -26,7 +26,6 @@
, fSamplePatternKey(GrSamplePatternDictionary::kInvalidSamplePatternKey)
, fStencilAttachment(stencil) {
SkASSERT(desc.fFlags & kRenderTarget_GrSurfaceFlag);
- SkASSERT(!this->hasMixedSamples() || fSampleCnt > 1);
fResolveRect = SkRectPriv::MakeILargestInverted();
}
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
index 02ba6d9..d67db2a 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -171,47 +171,15 @@
}
inline GrAAType GrRenderTargetContext::chooseAAType(GrAA aa) {
- auto fsaaType = this->fsaaType();
if (GrAA::kNo == aa) {
// On some devices we cannot disable MSAA if it is enabled so we make the AA type reflect
// that.
- if (fsaaType == GrFSAAType::kUnifiedMSAA && !this->caps()->multisampleDisableSupport()) {
+ if (this->numSamples() > 1 && !this->caps()->multisampleDisableSupport()) {
return GrAAType::kMSAA;
}
return GrAAType::kNone;
}
- switch (fsaaType) {
- case GrFSAAType::kNone:
- case GrFSAAType::kMixedSamples:
- return GrAAType::kCoverage;
- case GrFSAAType::kUnifiedMSAA:
- return GrAAType::kMSAA;
- }
- SK_ABORT("Unexpected fsaa type");
- return GrAAType::kNone;
-}
-
-static inline GrPathRenderer::AATypeFlags choose_path_aa_type_flags(
- GrAA aa, GrFSAAType fsaaType, const GrCaps& caps) {
- using AATypeFlags = GrPathRenderer::AATypeFlags;
- if (GrAA::kNo == aa) {
- // On some devices we cannot disable MSAA if it is enabled so we make the AA type flags
- // reflect that.
- if (fsaaType == GrFSAAType::kUnifiedMSAA && !caps.multisampleDisableSupport()) {
- return AATypeFlags::kMSAA;
- }
- return AATypeFlags::kNone;
- }
- switch (fsaaType) {
- case GrFSAAType::kNone:
- return AATypeFlags::kCoverage;
- case GrFSAAType::kMixedSamples:
- return AATypeFlags::kCoverage | AATypeFlags::kMixedSampledStencilThenCover;
- case GrFSAAType::kUnifiedMSAA:
- return AATypeFlags::kMSAA;
- }
- SK_ABORT("Invalid GrFSAAType.");
- return AATypeFlags::kNone;
+ return (this->numSamples() > 1) ? GrAAType::kMSAA : GrAAType::kCoverage;
}
GrTextureProxy* GrRenderTargetContext::asTextureProxy() {
@@ -2450,8 +2418,7 @@
// the src color (either the input alpha or in the frag shader) to implement
// aa. If we have some future driver-mojo path AA that can do the right
// thing WRT to the blend then we'll need some query on the PR.
- auto aaTypeFlags = choose_path_aa_type_flags(
- aa, fRenderTargetContext->fsaaType(), *fRenderTargetContext->caps());
+ GrAAType aaType = fRenderTargetContext->chooseAAType(aa);
bool hasUserStencilSettings = !ss->isUnused();
SkIRect clipConservativeBounds;
@@ -2464,7 +2431,7 @@
canDrawArgs.fViewMatrix = &viewMatrix;
canDrawArgs.fShape = &shape;
canDrawArgs.fClipConservativeBounds = &clipConservativeBounds;
- canDrawArgs.fAATypeFlags = aaTypeFlags;
+ canDrawArgs.fAAType = aaType;
SkASSERT(!fRenderTargetContext->wrapsVkSecondaryCB());
canDrawArgs.fTargetIsWrappedVkSecondaryCB = false;
canDrawArgs.fHasUserStencilSettings = hasUserStencilSettings;
@@ -2487,7 +2454,7 @@
&clipConservativeBounds,
&viewMatrix,
&shape,
- aaTypeFlags,
+ aaType,
fRenderTargetContext->colorSpaceInfo().isLinearlyBlended()};
pr->drawPath(args);
return true;
@@ -2522,7 +2489,7 @@
clip.getConservativeBounds(this->width(), this->height(), &clipConservativeBounds, nullptr);
GrShape tempShape;
- auto aaTypeFlags = choose_path_aa_type_flags(aa, this->fsaaType(), *this->caps());
+ GrAAType aaType = this->chooseAAType(aa);
GrPathRenderer::CanDrawPathArgs canDrawArgs;
canDrawArgs.fCaps = this->caps();
@@ -2538,7 +2505,7 @@
return;
}
- canDrawArgs.fAATypeFlags = aaTypeFlags;
+ canDrawArgs.fAAType = aaType;
// Try a 1st time without applying any of the style to the geometry (and barring sw)
pr = this->drawingManager()->getPathRenderer(canDrawArgs, false, kType);
@@ -2583,7 +2550,7 @@
&clipConservativeBounds,
&viewMatrix,
canDrawArgs.fShape,
- aaTypeFlags,
+ aaType,
this->colorSpaceInfo().isLinearlyBlended()};
pr->drawPath(args);
}
@@ -2657,9 +2624,13 @@
}
GrClampType clampType = GrPixelConfigClampType(this->colorSpaceInfo().config());
- GrXferProcessor::DstProxy dstProxy;
+ // MIXED SAMPLES TODO: check stencil buffer is MSAA and make sure stencil test is actually doing
+ // something (either in the clip or in the op).
+ bool hasMixedSampledCoverage = false;
GrProcessorSet::Analysis analysis = op->finalize(
- *this->caps(), &appliedClip, this->fsaaType(), clampType);
+ *this->caps(), &appliedClip, hasMixedSampledCoverage, clampType);
+
+ GrXferProcessor::DstProxy dstProxy;
if (analysis.requiresDstTexture()) {
if (!this->setupDstProxy(this->asRenderTargetProxy(), clip, *op, &dstProxy)) {
fContext->priv().opMemoryPool()->release(std::move(op));
diff --git a/src/gpu/GrRenderTargetContext.h b/src/gpu/GrRenderTargetContext.h
index 11ba4cc..c6869a6 100644
--- a/src/gpu/GrRenderTargetContext.h
+++ b/src/gpu/GrRenderTargetContext.h
@@ -455,12 +455,10 @@
void insertEventMarker(const SkString&);
- GrFSAAType fsaaType() const { return fRenderTargetProxy->fsaaType(); }
const GrCaps* caps() const;
int width() const { return fRenderTargetProxy->width(); }
int height() const { return fRenderTargetProxy->height(); }
- int numColorSamples() const { return fRenderTargetProxy->numColorSamples(); }
- int numStencilSamples() const { return fRenderTargetProxy->numStencilSamples(); }
+ int numSamples() const { return fRenderTargetProxy->numSamples(); }
const SkSurfaceProps& surfaceProps() const { return fSurfaceProps; }
GrSurfaceOrigin origin() const { return fRenderTargetProxy->origin(); }
bool wrapsVkSecondaryCB() const { return fRenderTargetProxy->wrapsVkSecondaryCB(); }
diff --git a/src/gpu/GrRenderTargetProxy.cpp b/src/gpu/GrRenderTargetProxy.cpp
index c385d26..fc41221 100644
--- a/src/gpu/GrRenderTargetProxy.cpp
+++ b/src/gpu/GrRenderTargetProxy.cpp
@@ -29,11 +29,6 @@
, fOutputSwizzle(outputSwizzle)
, fNeedsStencil(false)
, fWrapsVkSecondaryCB(WrapsVkSecondaryCB::kNo) {
- // Since we know the newly created render target will be internal, we are able to precompute
- // what the flags will ultimately end up being.
- if (caps.usesMixedSamples() && fSampleCnt > 1) {
- this->setHasMixedSamples();
- }
}
// Lazy-callback version
@@ -59,7 +54,7 @@
const GrSwizzle& outputSwizzle,
WrapsVkSecondaryCB wrapsVkSecondaryCB)
: INHERITED(std::move(surf), origin, textureSwizzle, SkBackingFit::kExact)
- , fSampleCnt(fTarget->asRenderTarget()->numStencilSamples())
+ , fSampleCnt(fTarget->asRenderTarget()->numSamples())
, fOutputSwizzle(outputSwizzle)
, fNeedsStencil(false)
, fWrapsVkSecondaryCB(wrapsVkSecondaryCB) {
@@ -99,7 +94,7 @@
}
size_t GrRenderTargetProxy::onUninstantiatedGpuMemorySize() const {
- int colorSamplesPerPixel = this->numColorSamples();
+ int colorSamplesPerPixel = this->numSamples();
if (colorSamplesPerPixel > 1) {
// Add one for the resolve buffer.
++colorSamplesPerPixel;
@@ -126,7 +121,7 @@
// Anything that is checked here should be duplicated in GrTextureRenderTargetProxy's version
SkASSERT(surface->asRenderTarget());
- SkASSERT(surface->asRenderTarget()->numStencilSamples() == this->numStencilSamples());
+ SkASSERT(surface->asRenderTarget()->numSamples() == this->numSamples());
GrInternalSurfaceFlags proxyFlags = fSurfaceFlags;
GrInternalSurfaceFlags surfaceFlags = surface->surfacePriv().flags();
diff --git a/src/gpu/GrRenderTargetProxy.h b/src/gpu/GrRenderTargetProxy.h
index cbc4f68..77ad84d 100644
--- a/src/gpu/GrRenderTargetProxy.h
+++ b/src/gpu/GrRenderTargetProxy.h
@@ -27,14 +27,6 @@
// Actually instantiate the backing rendertarget, if necessary.
bool instantiate(GrResourceProvider*) override;
- GrFSAAType fsaaType() const {
- if (fSampleCnt <= 1) {
- SkASSERT(!this->hasMixedSamples());
- return GrFSAAType::kNone;
- }
- return this->hasMixedSamples() ? GrFSAAType::kMixedSamples : GrFSAAType::kUnifiedMSAA;
- }
-
/*
* When instantiated does this proxy require a stencil buffer?
*/
@@ -42,16 +34,9 @@
bool needsStencil() const { return fNeedsStencil; }
/**
- * Returns the number of samples/pixel in the stencil buffer (One if non-MSAA).
+ * Returns the number of samples/pixel in the color buffer (One if non-MSAA).
*/
- int numStencilSamples() const { return fSampleCnt; }
-
- /**
- * Returns the number of samples/pixel in the color buffer (One if non-MSAA or mixed sampled).
- */
- int numColorSamples() const {
- return GrFSAAType::kMixedSamples == this->fsaaType() ? 1 : fSampleCnt;
- }
+ int numSamples() const { return fSampleCnt; }
int maxWindowRectangles(const GrCaps& caps) const;
@@ -102,11 +87,6 @@
sk_sp<GrSurface> createSurface(GrResourceProvider*) const override;
private:
- void setHasMixedSamples() {
- fSurfaceFlags |= GrInternalSurfaceFlags::kMixedSampled;
- }
- bool hasMixedSamples() const { return fSurfaceFlags & GrInternalSurfaceFlags::kMixedSampled; }
-
void setGLRTFBOIDIs0() {
fSurfaceFlags |= GrInternalSurfaceFlags::kGLRTFBOIDIs0;
}
diff --git a/src/gpu/GrResourceProvider.cpp b/src/gpu/GrResourceProvider.cpp
index 77f5759..2adca06 100644
--- a/src/gpu/GrResourceProvider.cpp
+++ b/src/gpu/GrResourceProvider.cpp
@@ -389,7 +389,7 @@
}
#endif
GrStencilAttachment::ComputeSharedStencilAttachmentKey(width, height,
- rt->numStencilSamples(), &sbKey);
+ rt->numSamples(), &sbKey);
auto stencil = this->findByUniqueKey<GrStencilAttachment>(sbKey);
if (!stencil) {
// Need to try and create a new stencil
diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index 6ab0dbe..b8ae251 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -32,7 +32,7 @@
// Pass on any style that applies. The caller will apply the style if a suitable renderer is
// not found and try again with the new GrShape.
if (!args.fShape->style().applies() && SkToBool(fProxyProvider) &&
- ((args.fAATypeFlags & AATypeFlags::kCoverage) || args.fAATypeFlags == AATypeFlags::kNone)) {
+ (args.fAAType == GrAAType::kCoverage || args.fAAType == GrAAType::kNone)) {
// This is the fallback renderer for when a path is too complicated for the GPU ones.
return CanDrawPath::kAsBackup;
}
@@ -252,7 +252,7 @@
// To prevent overloading the cache with entries during animations we limit the cache of masks
// to cases where the matrix preserves axis alignment.
bool useCache = fAllowCaching && !inverseFilled && args.fViewMatrix->preservesAxisAlignment() &&
- args.fShape->hasUnstyledKey() && (AATypeFlags::kCoverage & args.fAATypeFlags);
+ args.fShape->hasUnstyledKey() && (GrAAType::kCoverage == args.fAAType);
if (!GetShapeAndClipBounds(args.fRenderTargetContext,
*args.fClip, *args.fShape,
@@ -327,7 +327,7 @@
}
if (!proxy) {
SkBackingFit fit = useCache ? SkBackingFit::kExact : SkBackingFit::kApprox;
- GrAA aa = GrAA(SkToBool(AATypeFlags::kCoverage & args.fAATypeFlags));
+ GrAA aa = GrAA(GrAAType::kCoverage == args.fAAType);
SkTaskGroup* taskGroup = nullptr;
if (auto direct = args.fContext->priv().asDirectContext()) {
diff --git a/src/gpu/GrSurfaceProxy.cpp b/src/gpu/GrSurfaceProxy.cpp
index 407a005..0370263 100644
--- a/src/gpu/GrSurfaceProxy.cpp
+++ b/src/gpu/GrSurfaceProxy.cpp
@@ -266,7 +266,7 @@
const GrRenderTargetProxy* rtp = this->asRenderTargetProxy();
int sampleCount = 1;
if (rtp) {
- sampleCount = rtp->numStencilSamples();
+ sampleCount = rtp->numSamples();
}
const GrTextureProxy* tp = this->asTextureProxy();
diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp
index ec3b08c..a3761aa 100644
--- a/src/gpu/GrTexture.cpp
+++ b/src/gpu/GrTexture.cpp
@@ -81,7 +81,7 @@
const GrRenderTarget* rt = this->asRenderTarget();
int sampleCount = 1;
if (rt) {
- sampleCount = rt->numStencilSamples();
+ sampleCount = rt->numSamples();
}
GrTexturePriv::ComputeScratchKey(this->config(), this->width(), this->height(),
SkToBool(rt), sampleCount,
diff --git a/src/gpu/GrTextureRenderTargetProxy.cpp b/src/gpu/GrTextureRenderTargetProxy.cpp
index 8c6e0fa..1803324 100644
--- a/src/gpu/GrTextureRenderTargetProxy.cpp
+++ b/src/gpu/GrTextureRenderTargetProxy.cpp
@@ -71,7 +71,7 @@
}
size_t GrTextureRenderTargetProxy::onUninstantiatedGpuMemorySize() const {
- int colorSamplesPerPixel = this->numColorSamples();
+ int colorSamplesPerPixel = this->numSamples();
if (colorSamplesPerPixel > 1) {
// Add one to account for the resolve buffer.
++colorSamplesPerPixel;
@@ -91,7 +91,7 @@
const GrUniqueKey& key = this->getUniqueKey();
- if (!this->instantiateImpl(resourceProvider, this->numStencilSamples(), this->needsStencil(),
+ if (!this->instantiateImpl(resourceProvider, this->numSamples(), this->needsStencil(),
kDescFlags, this->mipMapped(), key.isValid() ? &key : nullptr)) {
return false;
}
@@ -109,7 +109,7 @@
GrResourceProvider* resourceProvider) const {
static constexpr GrSurfaceDescFlags kDescFlags = kRenderTarget_GrSurfaceFlag;
- sk_sp<GrSurface> surface = this->createSurfaceImpl(resourceProvider, this->numStencilSamples(),
+ sk_sp<GrSurface> surface = this->createSurfaceImpl(resourceProvider, this->numSamples(),
this->needsStencil(), kDescFlags,
this->mipMapped());
if (!surface) {
@@ -130,7 +130,7 @@
// Anything checked here should also be checking the GrRenderTargetProxy version
SkASSERT(surface->asRenderTarget());
- SkASSERT(surface->asRenderTarget()->numStencilSamples() == this->numStencilSamples());
+ SkASSERT(surface->asRenderTarget()->numSamples() == this->numSamples());
SkASSERT(surface->asTexture()->texturePriv().textureType() == this->textureType());
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 2a95e4a..b8e82b5 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -250,8 +250,7 @@
bool shouldRetainContent) {
SkASSERT(rtc->width() == this->width());
SkASSERT(rtc->height() == this->height());
- SkASSERT(rtc->numColorSamples() == fRenderTargetContext->numColorSamples());
- SkASSERT(rtc->numStencilSamples() == fRenderTargetContext->numStencilSamples());
+ SkASSERT(rtc->numSamples() == fRenderTargetContext->numSamples());
SkASSERT(rtc->asSurfaceProxy()->priv().isExact());
if (shouldRetainContent) {
if (this->context()->abandoned()) {
@@ -278,7 +277,7 @@
this->context(),
budgeted,
this->imageInfo(),
- fRenderTargetContext->numColorSamples(),
+ fRenderTargetContext->numSamples(),
fRenderTargetContext->origin(),
&this->surfaceProps(),
fRenderTargetContext->mipMapped()));
@@ -869,7 +868,7 @@
const SkPaint* paint = &origPaint;
SkPaint tempPaint;
- if (origPaint.isAntiAlias() && GrFSAAType::kUnifiedMSAA != fRenderTargetContext->fsaaType()) {
+ if (origPaint.isAntiAlias() && fRenderTargetContext->numSamples() <= 1) {
// Drop antialiasing to avoid seams at tile boundaries.
tempPaint = origPaint;
tempPaint.setAntiAlias(false);
@@ -1012,8 +1011,7 @@
}
// Coverage-based AA would cause seams between tiles.
- GrAA aa = GrAA(paint.isAntiAlias() &&
- GrFSAAType::kNone != fRenderTargetContext->fsaaType());
+ GrAA aa = GrAA(paint.isAntiAlias() && fRenderTargetContext->numSamples() > 1);
fRenderTargetContext->drawRect(this->clip(), std::move(grPaint), aa, viewMatrix, dstRect);
}
@@ -1182,7 +1180,7 @@
// The tile code path doesn't currently support AA, so if the paint asked for aa and we could
// draw untiled, then we bypass checking for tiling purely for optimization reasons.
- bool useCoverageAA = GrFSAAType::kUnifiedMSAA != fRenderTargetContext->fsaaType() &&
+ bool useCoverageAA = fRenderTargetContext->numSamples() <= 1 &&
paint.isAntiAlias() && bitmap.width() <= maxTileSize &&
bitmap.height() <= maxTileSize;
@@ -1694,7 +1692,7 @@
sk_sp<GrRenderTargetContext> rtc(fContext->priv().makeDeferredRenderTargetContext(
format, fit, cinfo.fInfo.width(), cinfo.fInfo.height(), config,
fRenderTargetContext->colorSpaceInfo().refColorSpace(),
- fRenderTargetContext->numStencilSamples(), GrMipMapped::kNo,
+ fRenderTargetContext->numSamples(), GrMipMapped::kNo,
kBottomLeft_GrSurfaceOrigin, &props));
if (!rtc) {
return nullptr;
@@ -1712,7 +1710,7 @@
// TODO: Change the signature of newSurface to take a budgeted parameter.
static const SkBudgeted kBudgeted = SkBudgeted::kNo;
return SkSurface::MakeRenderTarget(fContext.get(), kBudgeted, info,
- fRenderTargetContext->numStencilSamples(),
+ fRenderTargetContext->numSamples(),
fRenderTargetContext->origin(), &props);
}
diff --git a/src/gpu/SkGpuDevice_drawTexture.cpp b/src/gpu/SkGpuDevice_drawTexture.cpp
index de4f4d7..94a7d44 100644
--- a/src/gpu/SkGpuDevice_drawTexture.cpp
+++ b/src/gpu/SkGpuDevice_drawTexture.cpp
@@ -51,12 +51,12 @@
static bool may_color_bleed(const SkRect& srcRect,
const SkRect& transformedRect,
const SkMatrix& m,
- GrFSAAType fsaaType) {
+ int numSamples) {
// Only gets called if has_aligned_samples returned false.
// So we can assume that sampling is axis aligned but not texel aligned.
SkASSERT(!has_aligned_samples(srcRect, transformedRect));
SkRect innerSrcRect(srcRect), innerTransformedRect, outerTransformedRect(transformedRect);
- if (GrFSAAType::kUnifiedMSAA == fsaaType) {
+ if (numSamples > 1) {
innerSrcRect.inset(SK_Scalar1, SK_Scalar1);
} else {
innerSrcRect.inset(SK_ScalarHalf, SK_ScalarHalf);
@@ -80,14 +80,14 @@
static bool can_ignore_bilerp_constraint(const GrTextureProducer& producer,
const SkRect& srcRect,
const SkMatrix& srcRectToDeviceSpace,
- GrFSAAType fsaaType) {
+ int numSamples) {
if (srcRectToDeviceSpace.rectStaysRect()) {
// sampling is axis-aligned
SkRect transformedRect;
srcRectToDeviceSpace.mapRect(&transformedRect, srcRect);
if (has_aligned_samples(srcRect, transformedRect) ||
- !may_color_bleed(srcRect, transformedRect, srcRectToDeviceSpace, fsaaType)) {
+ !may_color_bleed(srcRect, transformedRect, srcRectToDeviceSpace, numSamples)) {
return true;
}
}
@@ -288,7 +288,7 @@
!producer->hasMixedResolutions()) {
SkMatrix combinedMatrix;
combinedMatrix.setConcat(ctm, srcToDst);
- if (can_ignore_bilerp_constraint(*producer, src, combinedMatrix, rtc->fsaaType())) {
+ if (can_ignore_bilerp_constraint(*producer, src, combinedMatrix, rtc->numSamples())) {
constraintMode = GrTextureAdjuster::kNo_FilterConstraint;
}
}
diff --git a/src/gpu/ccpr/GrCCDrawPathsOp.cpp b/src/gpu/ccpr/GrCCDrawPathsOp.cpp
index b8c5a01..b1e5ab8 100644
--- a/src/gpu/ccpr/GrCCDrawPathsOp.cpp
+++ b/src/gpu/ccpr/GrCCDrawPathsOp.cpp
@@ -146,18 +146,19 @@
#endif
}
-GrProcessorSet::Analysis GrCCDrawPathsOp::finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) {
+GrProcessorSet::Analysis GrCCDrawPathsOp::finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) {
SkASSERT(1 == fNumDraws); // There should only be one single path draw in this Op right now.
- return fDraws.head().finalize(caps, clip, fsaaType, clampType, &fProcessors);
+ return fDraws.head().finalize(caps, clip, hasMixedSampledCoverage, clampType, &fProcessors);
}
GrProcessorSet::Analysis GrCCDrawPathsOp::SingleDraw::finalize(
- const GrCaps& caps, const GrAppliedClip* clip, GrFSAAType fsaaType, GrClampType clampType,
- GrProcessorSet* processors) {
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage, GrClampType
+ clampType, GrProcessorSet* processors) {
const GrProcessorSet::Analysis& analysis = processors->finalize(
fColor, GrProcessorAnalysisCoverage::kSingleChannel, clip,
- &GrUserStencilSettings::kUnused, fsaaType, caps, clampType, &fColor);
+ &GrUserStencilSettings::kUnused, hasMixedSampledCoverage, caps, clampType, &fColor);
// Lines start looking jagged when they get thinner than 1px. For thin strokes it looks better
// if we can convert them to hairline (i.e., inflate the stroke width to 1px), and instead
diff --git a/src/gpu/ccpr/GrCCDrawPathsOp.h b/src/gpu/ccpr/GrCCDrawPathsOp.h
index f401001..1f95138 100644
--- a/src/gpu/ccpr/GrCCDrawPathsOp.h
+++ b/src/gpu/ccpr/GrCCDrawPathsOp.h
@@ -35,8 +35,8 @@
const char* name() const override { return "GrCCDrawPathsOp"; }
FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; }
- GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*, GrFSAAType,
- GrClampType) override;
+ GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*,
+ bool hasMixedSampledCoverage, GrClampType) override;
CombineResult onCombineIfPossible(GrOp*, const GrCaps&) override;
void visitProxies(const VisitProxyFunc& fn) const override {
for (const auto& range : fInstanceRanges) {
@@ -96,7 +96,8 @@
// See the corresponding methods in GrCCDrawPathsOp.
GrProcessorSet::Analysis finalize(
- const GrCaps&, const GrAppliedClip*, GrFSAAType, GrClampType, GrProcessorSet*);
+ const GrCaps&, const GrAppliedClip*, bool hasMixedSampledCoverage, GrClampType,
+ GrProcessorSet*);
void accountForOwnPath(GrCCPathCache*, GrOnFlushResourceProvider*,
GrCCPerFlushResourceSpecs*);
void setupResources(GrCCPathCache*, GrOnFlushResourceProvider*, GrCCPerFlushResources*,
diff --git a/src/gpu/ccpr/GrCCPerFlushResources.cpp b/src/gpu/ccpr/GrCCPerFlushResources.cpp
index a4ed663..33ac61b 100644
--- a/src/gpu/ccpr/GrCCPerFlushResources.cpp
+++ b/src/gpu/ccpr/GrCCPerFlushResources.cpp
@@ -33,8 +33,8 @@
class AtlasOp : public GrDrawOp {
public:
FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; }
- GrProcessorSet::Analysis finalize(
- const GrCaps&, const GrAppliedClip*, GrFSAAType, GrClampType) override {
+ GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*,
+ bool hasMixedSampledCoverage, GrClampType) override {
return GrProcessorSet::EmptySetAnalysis();
}
CombineResult onCombineIfPossible(GrOp* other, const GrCaps&) override {
diff --git a/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp b/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp
index 95d27c6..55d8a18 100644
--- a/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp
+++ b/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp
@@ -59,7 +59,7 @@
GrPathRenderer::CanDrawPath GrCoverageCountingPathRenderer::onCanDrawPath(
const CanDrawPathArgs& args) const {
const GrShape& shape = *args.fShape;
- if (!(AATypeFlags::kCoverage & args.fAATypeFlags) || shape.style().hasPathEffect() ||
+ if (GrAAType::kCoverage != args.fAAType || shape.style().hasPathEffect() ||
args.fViewMatrix->hasPerspective() || shape.inverseFilled()) {
return CanDrawPath::kNo;
}
diff --git a/src/gpu/effects/GrCoverageSetOpXP.cpp b/src/gpu/effects/GrCoverageSetOpXP.cpp
index 13e1c8f..85e6bfe 100644
--- a/src/gpu/effects/GrCoverageSetOpXP.cpp
+++ b/src/gpu/effects/GrCoverageSetOpXP.cpp
@@ -229,8 +229,7 @@
#if GR_TEST_UTILS
const GrXPFactory* GrCoverageSetOpXPFactory::TestGet(GrProcessorTestData* d) {
SkRegion::Op regionOp = SkRegion::Op(d->fRandom->nextULessThan(SkRegion::kLastOp + 1));
- bool isMixedSamples = GrFSAAType::kMixedSamples == d->fRenderTargetContext->fsaaType();
- bool invertCoverage = !isMixedSamples && d->fRandom->nextBool();
+ bool invertCoverage = d->fRandom->nextBool();
return GrCoverageSetOpXPFactory::Get(regionOp, invertCoverage);
}
#endif
diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
index 71c0689..81b1f9e 100644
--- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp
+++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
@@ -831,7 +831,7 @@
// Mixed samples implicity computes a fractional coverage from sample coverage. This
// could affect the formula used. However, we don't expect to have mixed samples without
// dual source blending.
- SkASSERT(!caps.usesMixedSamples());
+ SkASSERT(!caps.mixedSamplesSupport());
if (formula.hasSecondaryOutput()) {
props |= AnalysisProperties::kReadsDstInShader;
}
diff --git a/src/gpu/geometry/GrQuadUtils.cpp b/src/gpu/geometry/GrQuadUtils.cpp
index c4e86d7..4c7a983 100644
--- a/src/gpu/geometry/GrQuadUtils.cpp
+++ b/src/gpu/geometry/GrQuadUtils.cpp
@@ -190,9 +190,6 @@
case GrAAType::kMSAA:
*outEdgeFlags = GrQuadAAFlags::kAll;
break;
- case GrAAType::kMixedSamples:
- SK_ABORT("Should not use mixed sample AA with edge AA flags");
- break;
}
}
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index cd26eab..eb8f061 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -418,8 +418,7 @@
// Setup blit framebuffer
if (GR_IS_GR_GL(standard)) {
- if (fUsesMixedSamples ||
- version >= GR_GL_VER(3,0) ||
+ if (version >= GR_GL_VER(3,0) ||
ctxInfo.hasExtension("GL_ARB_framebuffer_object") ||
ctxInfo.hasExtension("GL_EXT_framebuffer_blit")) {
fBlitFramebufferFlags = 0;
@@ -1013,25 +1012,15 @@
void GrGLCaps::initFSAASupport(const GrContextOptions& contextOptions, const GrGLContextInfo& ctxInfo,
const GrGLInterface* gli) {
// We need dual source blending and the ability to disable multisample in order to support mixed
- // samples in every corner case. We only use mixed samples if the stencil-and-cover path
- // renderer is available and enabled; no other path renderers support this feature.
- if (fMultisampleDisableSupport &&
- this->shaderCaps()->dualSourceBlendingSupport() &&
- this->shaderCaps()->pathRenderingSupport()
-#if GR_TEST_UTILS
- && (contextOptions.fGpuPathRenderers & GpuPathRenderers::kStencilAndCover)
-#endif
- ) {
- fUsesMixedSamples = ctxInfo.hasExtension("GL_NV_framebuffer_mixed_samples") ||
- ctxInfo.hasExtension("GL_CHROMIUM_framebuffer_mixed_samples");
+ // samples in every corner case.
+ if (fMultisampleDisableSupport && this->shaderCaps()->dualSourceBlendingSupport()) {
+ fMixedSamplesSupport = ctxInfo.hasExtension("GL_NV_framebuffer_mixed_samples") ||
+ ctxInfo.hasExtension("GL_CHROMIUM_framebuffer_mixed_samples");
}
if (GR_IS_GR_GL(ctxInfo.standard())) {
- if (fUsesMixedSamples) {
- fMSFBOType = kMixedSamples_MSFBOType;
- } else if (ctxInfo.version() >= GR_GL_VER(3,0) ||
- ctxInfo.hasExtension("GL_ARB_framebuffer_object")) {
-
+ if (ctxInfo.version() >= GR_GL_VER(3,0) ||
+ ctxInfo.hasExtension("GL_ARB_framebuffer_object")) {
fMSFBOType = kStandard_MSFBOType;
if (!fIsCoreProfile && ctxInfo.renderer() != kOSMesa_GrGLRenderer) {
// Core profile removes ALPHA8 support.
@@ -1052,11 +1041,8 @@
fAlpha8IsRenderable = true;
}
// We prefer multisampled-render-to-texture extensions over ES3 MSAA because we've observed
- // ES3 driver bugs on at least one device with a tiled GPU (N10). However, if we're using
- // mixed samples we can't use multisampled-render-to-texture.
- if (fUsesMixedSamples) {
- fMSFBOType = kMixedSamples_MSFBOType;
- } else if (ctxInfo.hasExtension("GL_EXT_multisampled_render_to_texture")) {
+ // ES3 driver bugs on at least one device with a tiled GPU (N10).
+ if (ctxInfo.hasExtension("GL_EXT_multisampled_render_to_texture")) {
fMSFBOType = kES_EXT_MsToTexture_MSFBOType;
} else if (ctxInfo.hasExtension("GL_IMG_multisampled_render_to_texture")) {
fMSFBOType = kES_IMG_MsToTexture_MSFBOType;
@@ -1194,14 +1180,12 @@
"Apple",
"IMG MS To Texture",
"EXT MS To Texture",
- "MixedSamples",
};
GR_STATIC_ASSERT(0 == kNone_MSFBOType);
GR_STATIC_ASSERT(1 == kStandard_MSFBOType);
GR_STATIC_ASSERT(2 == kES_Apple_MSFBOType);
GR_STATIC_ASSERT(3 == kES_IMG_MsToTexture_MSFBOType);
GR_STATIC_ASSERT(4 == kES_EXT_MsToTexture_MSFBOType);
- GR_STATIC_ASSERT(5 == kMixedSamples_MSFBOType);
GR_STATIC_ASSERT(SK_ARRAY_COUNT(kMSFBOExtStr) == kLast_MSFBOType + 1);
static const char* kInvalidateFBTypeStr[] = {
@@ -1675,7 +1659,7 @@
supportsBGRATexStorage = true;
}
if (ctxInfo.hasExtension("GL_CHROMIUM_renderbuffer_format_BGRA8888") &&
- (this->usesMSAARenderBuffers() || this->fMSFBOType == kMixedSamples_MSFBOType)) {
+ this->usesMSAARenderBuffers()) {
fConfigTable[kBGRA_8888_GrPixelConfig].fFlags |=
ConfigInfo::kRenderableWithMSAA_Flag;
}
@@ -2516,7 +2500,7 @@
// 1) It's multisampled
// 2) We're using an extension with separate MSAA renderbuffers
// 3) It's not FBO 0, which is special and always auto-resolves
- return rt->numColorSamples() > 1 &&
+ return rt->numSamples() > 1 &&
glCaps.usesMSAARenderBuffers() &&
!rt->rtPriv().glRTFBOIDIs0();
}
@@ -2529,10 +2513,10 @@
int dstSampleCnt = 0;
int srcSampleCnt = 0;
if (const GrRenderTargetProxy* rtProxy = dst->asRenderTargetProxy()) {
- dstSampleCnt = rtProxy->numColorSamples();
+ dstSampleCnt = rtProxy->numSamples();
}
if (const GrRenderTargetProxy* rtProxy = src->asRenderTargetProxy()) {
- srcSampleCnt = rtProxy->numColorSamples();
+ srcSampleCnt = rtProxy->numSamples();
}
SkASSERT((dstSampleCnt > 0) == SkToBool(dst->asRenderTargetProxy()));
SkASSERT((srcSampleCnt > 0) == SkToBool(src->asRenderTargetProxy()));
@@ -2594,13 +2578,13 @@
// creation. It isn't clear that avoiding temporary fbo creation is actually optimal.
bool rectsMustMatchForBlitFramebuffer = false;
bool disallowSubrectForBlitFramebuffer = false;
- if (src->numColorSamples() > 1 &&
+ if (src->numSamples() > 1 &&
(this->blitFramebufferSupportFlags() & kResolveMustBeFull_BlitFrambufferFlag)) {
rectsMustMatchForBlitFramebuffer = true;
disallowSubrectForBlitFramebuffer = true;
// Mirroring causes rects to mismatch later, don't allow it.
- } else if (src->numColorSamples() > 1 && (this->blitFramebufferSupportFlags() &
- kRectsMustMatchForMSAASrc_BlitFramebufferFlag)) {
+ } else if (src->numSamples() > 1 && (this->blitFramebufferSupportFlags() &
+ kRectsMustMatchForMSAASrc_BlitFramebufferFlag)) {
rectsMustMatchForBlitFramebuffer = true;
}
@@ -2618,7 +2602,7 @@
}
{
- bool srcIsMSAARenderbuffer = GrFSAAType::kUnifiedMSAA == src->fsaaType() &&
+ bool srcIsMSAARenderbuffer = src->numSamples() > 1 &&
this->usesMSAARenderBuffers();
if (srcIsMSAARenderbuffer) {
// It's illegal to call CopyTexSubImage2D on a MSAA renderbuffer. Set up for FBO
@@ -2991,7 +2975,7 @@
if (fMultisampleDisableSupport &&
this->shaderCaps()->dualSourceBlendingSupport() &&
this->shaderCaps()->pathRenderingSupport() &&
- fUsesMixedSamples &&
+ fMixedSamplesSupport &&
#if GR_TEST_UTILS
(contextOptions.fGpuPathRenderers & GpuPathRenderers::kStencilAndCover) &&
#endif
@@ -3073,7 +3057,7 @@
if (fUseDrawInsteadOfAllRenderTargetWrites) {
return false;
}
- if (rt->numColorSamples() > 1 && this->usesMSAARenderBuffers()) {
+ if (rt->numSamples() > 1 && this->usesMSAARenderBuffers()) {
return false;
}
return SkToBool(surface->asTexture());
diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h
index 3d5bda7..ef883f2 100644
--- a/src/gpu/gl/GrGLCaps.h
+++ b/src/gpu/gl/GrGLCaps.h
@@ -60,12 +60,8 @@
* GL_MAX_SAMPLES value.
*/
kES_EXT_MsToTexture_MSFBOType,
- /**
- * GL_NV_framebuffer_mixed_samples.
- */
- kMixedSamples_MSFBOType,
- kLast_MSFBOType = kMixedSamples_MSFBOType
+ kLast_MSFBOType = kES_EXT_MsToTexture_MSFBOType
};
enum BlitFramebufferFlags {
@@ -223,8 +219,7 @@
bool usesMSAARenderBuffers() const {
return kNone_MSFBOType != fMSFBOType &&
kES_IMG_MsToTexture_MSFBOType != fMSFBOType &&
- kES_EXT_MsToTexture_MSFBOType != fMSFBOType &&
- kMixedSamples_MSFBOType != fMSFBOType;
+ kES_EXT_MsToTexture_MSFBOType != fMSFBOType;
}
/**
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
index 0f365d9..52e59b7 100644
--- a/src/gpu/gl/GrGLGpu.cpp
+++ b/src/gpu/gl/GrGLGpu.cpp
@@ -586,7 +586,7 @@
if (resetBits & kMSAAEnable_GrGLBackendState) {
fMSAAEnabled = kUnknown_TriState;
- if (this->caps()->usesMixedSamples()) {
+ if (this->caps()->mixedSamplesSupport()) {
// The skia blend modes all use premultiplied alpha and therefore expect RGBA coverage
// modulation. This state has no effect when not rendering to a mixed sampled target.
GL_CALL(CoverageModulation(GR_GL_RGBA));
@@ -775,7 +775,6 @@
idDesc.fMSColorRenderbufferID = 0;
idDesc.fTexFBOID = GrGLRenderTarget::kUnresolvableFBOID;
idDesc.fRTFBOOwnership = GrBackendObjectOwnership::kBorrowed;
- idDesc.fIsMixedSampled = false;
GrSurfaceDesc desc;
desc.fFlags = kRenderTarget_GrSurfaceFlag;
@@ -1439,7 +1438,6 @@
SkASSERT(GrGLCaps::kNone_MSFBOType != ctx.caps()->msFBOType());
switch (ctx.caps()->msFBOType()) {
case GrGLCaps::kStandard_MSFBOType:
- case GrGLCaps::kMixedSamples_MSFBOType:
GL_ALLOC_CALL(ctx.interface(),
RenderbufferStorageMultisample(GR_GL_RENDERBUFFER,
sampleCount,
@@ -1475,9 +1473,6 @@
idDesc->fRTFBOID = 0;
idDesc->fRTFBOOwnership = GrBackendObjectOwnership::kOwned;
idDesc->fTexFBOID = 0;
- SkASSERT((GrGLCaps::kMixedSamples_MSFBOType == this->glCaps().msFBOType()) ==
- this->caps()->usesMixedSamples());
- idDesc->fIsMixedSampled = desc.fSampleCnt > 1 && this->caps()->usesMixedSamples();
GrGLenum status;
@@ -1862,7 +1857,7 @@
SkASSERT(width >= rt->width());
SkASSERT(height >= rt->height());
- int samples = rt->numStencilSamples();
+ int samples = rt->numSamples();
GrGLStencilAttachment::IDDesc sbDesc;
int sIdx = this->getCompatibleStencilIndex(rt->config());
@@ -2422,7 +2417,7 @@
if (this->glCaps().detachStencilFromMSAABuffersBeforeReadPixels() &&
renderTarget &&
renderTarget->renderTargetPriv().getStencilAttachment() &&
- renderTarget->numColorSamples() > 1) {
+ renderTarget->numSamples() > 1) {
// Fix Adreno devices that won't read from MSAA framebuffers with stencil attached
reattachStencil = true;
GL_CALL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER, GR_GL_STENCIL_ATTACHMENT,
@@ -2884,7 +2879,7 @@
void GrGLGpu::flushHWAAState(GrRenderTarget* rt, bool useHWAA) {
// rt is only optional if useHWAA is false.
SkASSERT(rt || !useHWAA);
- SkASSERT(!useHWAA || rt->isStencilBufferMultisampled());
+ SkASSERT(!useHWAA || rt->numSamples() > 1);
if (this->caps()->multisampleDisableSupport()) {
if (useHWAA) {
@@ -3195,10 +3190,10 @@
int dstSampleCnt = 0;
int srcSampleCnt = 0;
if (const GrRenderTarget* rt = dst->asRenderTarget()) {
- dstSampleCnt = rt->numColorSamples();
+ dstSampleCnt = rt->numSamples();
}
if (const GrRenderTarget* rt = src->asRenderTarget()) {
- srcSampleCnt = rt->numColorSamples();
+ srcSampleCnt = rt->numSamples();
}
SkASSERT((dstSampleCnt > 0) == SkToBool(dst->asRenderTarget()));
SkASSERT((srcSampleCnt > 0) == SkToBool(src->asRenderTarget()));
@@ -3229,7 +3224,7 @@
// 1) It's multisampled
// 2) We're using an extension with separate MSAA renderbuffers
// 3) It's not FBO 0, which is special and always auto-resolves
- return rt->numColorSamples() > 1 && glCaps.usesMSAARenderBuffers() && rt->renderFBOID() != 0;
+ return rt->numSamples() > 1 && glCaps.usesMSAARenderBuffers() && rt->renderFBOID() != 0;
}
static inline bool can_copy_texsubimage(const GrSurface* dst, const GrSurface* src,
@@ -3898,7 +3893,7 @@
int effectiveSampleCnt;
GR_GL_GetIntegerv(this->glInterface(), GR_GL_SAMPLES, &effectiveSampleCnt);
- SkASSERT(effectiveSampleCnt >= renderTarget->numStencilSamples());
+ SkASSERT(effectiveSampleCnt >= renderTarget->numSamples());
sampleLocations->reset(effectiveSampleCnt);
for (int i = 0; i < effectiveSampleCnt; ++i) {
diff --git a/src/gpu/gl/GrGLRenderTarget.cpp b/src/gpu/gl/GrGLRenderTarget.cpp
index f89d5be..9c56b60 100644
--- a/src/gpu/gl/GrGLRenderTarget.cpp
+++ b/src/gpu/gl/GrGLRenderTarget.cpp
@@ -40,10 +40,6 @@
}
inline void GrGLRenderTarget::setFlags(const GrGLCaps& glCaps, const IDDesc& idDesc) {
- if (idDesc.fIsMixedSampled) {
- SkASSERT(glCaps.usesMixedSamples() && idDesc.fRTFBOID); // FBO 0 can't be mixed sampled.
- this->setHasMixedSamples();
- }
if (!idDesc.fRTFBOID) {
this->setGLRTFBOIDIs0();
}
@@ -89,8 +85,8 @@
numStencilBits = stencil->bits();
}
- return GrBackendRenderTarget(this->width(), this->height(), this->numColorSamples(),
- numStencilBits, fbi);
+ return GrBackendRenderTarget(
+ this->width(), this->height(), this->numSamples(), numStencilBits, fbi);
}
GrBackendFormat GrGLRenderTarget::backendFormat() const {
@@ -238,7 +234,7 @@
if (fTexFBOID == kUnresolvableFBOID || fTexFBOID != fRTFBOID) {
// If the render target's FBO is external (fTexFBOID == kUnresolvableFBOID), or if we own
// the render target's FBO (fTexFBOID == fRTFBOID) then we use the provided sample count.
- return this->numStencilSamples();
+ return this->numSamples();
}
// When fTexFBOID == fRTFBOID, we either are not using MSAA, or MSAA is auto resolving, so use
diff --git a/src/gpu/gl/GrGLRenderTarget.h b/src/gpu/gl/GrGLRenderTarget.h
index aa9ed76..e34065b 100644
--- a/src/gpu/gl/GrGLRenderTarget.h
+++ b/src/gpu/gl/GrGLRenderTarget.h
@@ -31,7 +31,6 @@
GrBackendObjectOwnership fRTFBOOwnership;
GrGLuint fTexFBOID;
GrGLuint fMSColorRenderbufferID;
- bool fIsMixedSampled;
};
static sk_sp<GrGLRenderTarget> MakeWrapped(GrGLGpu*,
@@ -49,8 +48,7 @@
// override of GrRenderTarget
ResolveType getResolveType() const override {
- if (GrFSAAType::kUnifiedMSAA != this->fsaaType() || fRTFBOID == fTexFBOID) {
- // catches FBO 0 and non unified-MSAA case
+ if (this->numSamples() <= 1 || fRTFBOID == fTexFBOID) { // Also catches FBO 0.
return kAutoResolves_ResolveType;
} else if (kUnresolvableFBOID == fTexFBOID) {
return kCantResolve_ResolveType;
diff --git a/src/gpu/mock/GrMockGpu.cpp b/src/gpu/mock/GrMockGpu.cpp
index 17ec170..b873269 100644
--- a/src/gpu/mock/GrMockGpu.cpp
+++ b/src/gpu/mock/GrMockGpu.cpp
@@ -193,7 +193,7 @@
int height) {
static constexpr int kBits = 8;
fStats.incStencilAttachmentCreates();
- return new GrMockStencilAttachment(this, width, height, kBits, rt->numColorSamples());
+ return new GrMockStencilAttachment(this, width, height, kBits, rt->numSamples());
}
GrBackendTexture GrMockGpu::createBackendTexture(int w, int h,
diff --git a/src/gpu/mock/GrMockTexture.h b/src/gpu/mock/GrMockTexture.h
index b6a2a6e..d7aa866 100644
--- a/src/gpu/mock/GrMockTexture.h
+++ b/src/gpu/mock/GrMockTexture.h
@@ -90,7 +90,7 @@
bool completeStencilAttachment() override { return true; }
size_t onGpuMemorySize() const override {
- int numColorSamples = this->numColorSamples();
+ int numColorSamples = this->numSamples();
if (numColorSamples > 1) {
// Add one to account for the resolve buffer.
++numColorSamples;
@@ -104,7 +104,7 @@
if (GrStencilAttachment* stencil = this->renderTargetPriv().getStencilAttachment()) {
numStencilBits = stencil->bits();
}
- return {this->width(), this->height(), this->numColorSamples(), numStencilBits, fInfo};
+ return {this->width(), this->height(), this->numSamples(), numStencilBits, fInfo};
}
GrBackendFormat backendFormat() const override {
@@ -170,7 +170,7 @@
}
size_t onGpuMemorySize() const override {
- int numColorSamples = this->numColorSamples();
+ int numColorSamples = this->numSamples();
if (numColorSamples > 1) {
// Add one to account for the resolve buffer.
++numColorSamples;
@@ -182,7 +182,7 @@
void computeScratchKey(GrScratchKey* key) const override {
GrTexturePriv::ComputeScratchKey(this->config(), this->width(), this->height(),
- true, this->numStencilSamples(),
+ true, this->numSamples(),
this->texturePriv().mipMapped(), key);
}
};
diff --git a/src/gpu/mtl/GrMtlCaps.mm b/src/gpu/mtl/GrMtlCaps.mm
index 89460f8..f303c85 100644
--- a/src/gpu/mtl/GrMtlCaps.mm
+++ b/src/gpu/mtl/GrMtlCaps.mm
@@ -143,10 +143,10 @@
int dstSampleCnt = 0;
int srcSampleCnt = 0;
if (const GrRenderTargetProxy* rtProxy = dst->asRenderTargetProxy()) {
- dstSampleCnt = rtProxy->numColorSamples();
+ dstSampleCnt = rtProxy->numSamples();
}
if (const GrRenderTargetProxy* rtProxy = src->asRenderTargetProxy()) {
- srcSampleCnt = rtProxy->numColorSamples();
+ srcSampleCnt = rtProxy->numSamples();
}
SkASSERT((dstSampleCnt > 0) == SkToBool(dst->asRenderTargetProxy()));
SkASSERT((srcSampleCnt > 0) == SkToBool(src->asRenderTargetProxy()));
@@ -223,7 +223,7 @@
fInstanceAttribSupport = true;
}
- fUsesMixedSamples = false;
+ fMixedSamplesSupport = false;
fGpuTracingSupport = false;
fFenceSyncSupport = true; // always available in Metal
@@ -431,7 +431,7 @@
bool GrMtlCaps::onSurfaceSupportsWritePixels(const GrSurface* surface) const {
if (auto rt = surface->asRenderTarget()) {
- return rt->numColorSamples() <= 1 && SkToBool(surface->asTexture());
+ return rt->numSamples() <= 1 && SkToBool(surface->asTexture());
}
return true;
}
diff --git a/src/gpu/mtl/GrMtlGpu.mm b/src/gpu/mtl/GrMtlGpu.mm
index 8495157..27c2b7d 100644
--- a/src/gpu/mtl/GrMtlGpu.mm
+++ b/src/gpu/mtl/GrMtlGpu.mm
@@ -402,7 +402,7 @@
SkASSERT(width >= rt->width());
SkASSERT(height >= rt->height());
- int samples = rt->numStencilSamples();
+ int samples = rt->numSamples();
const GrMtlCaps::StencilFormat& sFmt = this->mtlCaps().preferredStencilFormat();
@@ -871,7 +871,7 @@
static int get_surface_sample_cnt(GrSurface* surf) {
if (const GrRenderTarget* rt = surf->asRenderTarget()) {
- return rt->numColorSamples();
+ return rt->numSamples();
}
return 0;
}
diff --git a/src/gpu/mtl/GrMtlPipelineStateBuilder.mm b/src/gpu/mtl/GrMtlPipelineStateBuilder.mm
index 6ad4ae7..d4f58a9 100644
--- a/src/gpu/mtl/GrMtlPipelineStateBuilder.mm
+++ b/src/gpu/mtl/GrMtlPipelineStateBuilder.mm
@@ -427,7 +427,7 @@
desc->fShaderKeyLength = SkToU32(keyLength);
b.add32(renderTarget->config());
- b.add32(renderTarget->numColorSamples());
+ b.add32(renderTarget->numSamples());
bool hasStencilAttachment = SkToBool(renderTarget->renderTargetPriv().getStencilAttachment());
b.add32(hasStencilAttachment ? gpu->mtlCaps().preferredStencilFormat().fInternalFormat
: MTLPixelFormatInvalid);
diff --git a/src/gpu/mtl/GrMtlRenderTarget.h b/src/gpu/mtl/GrMtlRenderTarget.h
index 315abcd..7b2c31b 100644
--- a/src/gpu/mtl/GrMtlRenderTarget.h
+++ b/src/gpu/mtl/GrMtlRenderTarget.h
@@ -28,7 +28,7 @@
ResolveType getResolveType() const override {
return kCantResolve_ResolveType;
#if 0 // TODO figure this once we support msaa
- if (this->numColorSamples() > 1) {
+ if (this->numSamples() > 1) {
return kCanResolve_ResolveType;
}
return kAutoResolves_ResolveType;
@@ -57,7 +57,7 @@
// This accounts for the texture's memory and any MSAA renderbuffer's memory.
size_t onGpuMemorySize() const override {
- int numColorSamples = this->numColorSamples();
+ int numColorSamples = this->numSamples();
// TODO: When used as render targets certain formats may actually have a larger size than
// the base format size. Check to make sure we are reporting the correct value here.
// The plus 1 is to account for the resolve texture or if not using msaa the RT itself
diff --git a/src/gpu/mtl/GrMtlTextureRenderTarget.h b/src/gpu/mtl/GrMtlTextureRenderTarget.h
index b4a02d7..a358909 100644
--- a/src/gpu/mtl/GrMtlTextureRenderTarget.h
+++ b/src/gpu/mtl/GrMtlTextureRenderTarget.h
@@ -68,7 +68,7 @@
// TODO: When used as render targets certain formats may actually have a larger size than
// the base format size. Check to make sure we are reporting the correct value here.
// The plus 1 is to account for the resolve texture or if not using msaa the RT itself
- int numColorSamples = this->numColorSamples();
+ int numColorSamples = this->numSamples();
if (numColorSamples > 1) {
++numColorSamples;
}
diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp
index 85ea734..5944aef 100644
--- a/src/gpu/ops/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp
@@ -654,7 +654,7 @@
GrPathRenderer::CanDrawPath
GrAAConvexPathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
if (args.fCaps->shaderCaps()->shaderDerivativeSupport() &&
- (AATypeFlags::kCoverage & args.fAATypeFlags) && args.fShape->style().isSimpleFill() &&
+ (GrAAType::kCoverage == args.fAAType) && args.fShape->style().isSimpleFill() &&
!args.fShape->inverseFilled() && args.fShape->knownToBeConvex()) {
return CanDrawPath::kYes;
}
@@ -705,11 +705,12 @@
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
return fHelper.finalizeProcessors(
- caps, clip, fsaaType, clampType, GrProcessorAnalysisCoverage::kSingleChannel,
- &fPaths.back().fColor, &fWideColor);
+ caps, clip, hasMixedSampledCoverage, clampType,
+ GrProcessorAnalysisCoverage::kSingleChannel, &fPaths.back().fColor, &fWideColor);
}
private:
@@ -835,7 +836,7 @@
bool GrAAConvexPathRenderer::onDrawPath(const DrawPathArgs& args) {
GR_AUDIT_TRAIL_AUTO_FRAME(args.fRenderTargetContext->auditTrail(),
"GrAAConvexPathRenderer::onDrawPath");
- SkASSERT(GrFSAAType::kUnifiedMSAA != args.fRenderTargetContext->fsaaType());
+ SkASSERT(args.fRenderTargetContext->numSamples() <= 1);
SkASSERT(!args.fShape->isEmpty());
SkPath path;
diff --git a/src/gpu/ops/GrAAHairLinePathRenderer.cpp b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
index 1aa1638..6b054f8 100644
--- a/src/gpu/ops/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
@@ -714,7 +714,7 @@
GrPathRenderer::CanDrawPath
GrAAHairLinePathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
- if (!(AATypeFlags::kCoverage & args.fAATypeFlags)) {
+ if (GrAAType::kCoverage != args.fAAType) {
return CanDrawPath::kNo;
}
@@ -839,10 +839,11 @@
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
// This Op uses uniform (not vertex) color, so doesn't need to track wide color.
- return fHelper.finalizeProcessors(caps, clip, fsaaType, clampType,
+ return fHelper.finalizeProcessors(caps, clip, hasMixedSampledCoverage, clampType,
GrProcessorAnalysisCoverage::kSingleChannel, &fColor,
nullptr);
}
@@ -1073,7 +1074,7 @@
bool GrAAHairLinePathRenderer::onDrawPath(const DrawPathArgs& args) {
GR_AUDIT_TRAIL_AUTO_FRAME(args.fRenderTargetContext->auditTrail(),
"GrAAHairlinePathRenderer::onDrawPath");
- SkASSERT(GrFSAAType::kUnifiedMSAA != args.fRenderTargetContext->fsaaType());
+ SkASSERT(args.fRenderTargetContext->numSamples() <= 1);
SkIRect devClipBounds;
args.fClip->getConservativeBounds(args.fRenderTargetContext->width(),
diff --git a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
index 5cbb89a..a66a9ae 100644
--- a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
@@ -40,7 +40,7 @@
GrPathRenderer::CanDrawPath
GrAALinearizingConvexPathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
- if (!(AATypeFlags::kCoverage & args.fAATypeFlags)) {
+ if (GrAAType::kCoverage != args.fAAType) {
return CanDrawPath::kNo;
}
if (!args.fShape->knownToBeConvex()) {
@@ -187,11 +187,12 @@
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
return fHelper.finalizeProcessors(
- caps, clip, fsaaType, clampType, GrProcessorAnalysisCoverage::kSingleChannel,
- &fPaths.back().fColor, &fWideColor);
+ caps, clip, hasMixedSampledCoverage, clampType,
+ GrProcessorAnalysisCoverage::kSingleChannel, &fPaths.back().fColor, &fWideColor);
}
private:
@@ -337,7 +338,7 @@
bool GrAALinearizingConvexPathRenderer::onDrawPath(const DrawPathArgs& args) {
GR_AUDIT_TRAIL_AUTO_FRAME(args.fRenderTargetContext->auditTrail(),
"GrAALinearizingConvexPathRenderer::onDrawPath");
- SkASSERT(GrFSAAType::kUnifiedMSAA != args.fRenderTargetContext->fsaaType());
+ SkASSERT(args.fRenderTargetContext->numSamples() <= 1);
SkASSERT(!args.fShape->isEmpty());
SkASSERT(!args.fShape->style().pathEffect());
diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index 998847d..1761acc 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -140,8 +140,9 @@
return FixedFunctionFlags::kNone;
}
-GrProcessorSet::Analysis GrAtlasTextOp::finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) {
+GrProcessorSet::Analysis GrAtlasTextOp::finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) {
GrProcessorAnalysisCoverage coverage;
GrProcessorAnalysisColor color;
if (kColorBitmapMask_MaskType == fMaskType) {
@@ -165,8 +166,8 @@
break;
}
auto analysis = fProcessors.finalize(
- color, coverage, clip, &GrUserStencilSettings::kUnused, fsaaType, caps, clampType,
- &fGeoData[0].fColor);
+ color, coverage, clip, &GrUserStencilSettings::kUnused, hasMixedSampledCoverage, caps,
+ clampType, &fGeoData[0].fColor);
fUsesLocalCoords = analysis.usesLocalCoords();
return analysis;
}
diff --git a/src/gpu/ops/GrAtlasTextOp.h b/src/gpu/ops/GrAtlasTextOp.h
index 2e42389..6b821e6 100644
--- a/src/gpu/ops/GrAtlasTextOp.h
+++ b/src/gpu/ops/GrAtlasTextOp.h
@@ -75,8 +75,8 @@
FixedFunctionFlags fixedFunctionFlags() const override;
- GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*, GrFSAAType,
- GrClampType) override;
+ GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*,
+ bool hasMixedSampledCoverage, GrClampType) override;
enum MaskType {
kGrayscaleCoverageMask_MaskType,
diff --git a/src/gpu/ops/GrDashLinePathRenderer.cpp b/src/gpu/ops/GrDashLinePathRenderer.cpp
index 5c06cfd..f15309c 100644
--- a/src/gpu/ops/GrDashLinePathRenderer.cpp
+++ b/src/gpu/ops/GrDashLinePathRenderer.cpp
@@ -18,9 +18,6 @@
SkPoint pts[2];
bool inverted;
if (args.fShape->style().isDashed() && args.fShape->asLine(pts, &inverted)) {
- if (args.fAATypeFlags == AATypeFlags::kMixedSampledStencilThenCover) {
- return CanDrawPath::kNo;
- }
// We should never have an inverse dashed case.
SkASSERT(!inverted);
if (!GrDashOp::CanDrawDashLine(pts, args.fShape->style(), *args.fViewMatrix)) {
@@ -34,16 +31,19 @@
bool GrDashLinePathRenderer::onDrawPath(const DrawPathArgs& args) {
GR_AUDIT_TRAIL_AUTO_FRAME(args.fRenderTargetContext->auditTrail(),
"GrDashLinePathRenderer::onDrawPath");
- GrDashOp::AAMode aaMode = GrDashOp::AAMode::kNone;
- if (AATypeFlags::kNone != args.fAATypeFlags) {
- if (AATypeFlags::kMSAA & args.fAATypeFlags) {
+ GrDashOp::AAMode aaMode;
+ switch (args.fAAType) {
+ case GrAAType::kNone:
+ aaMode = GrDashOp::AAMode::kNone;
+ break;
+ case GrAAType::kMSAA:
// In this mode we will use aa between dashes but the outer border uses MSAA. Otherwise,
// we can wind up with external edges antialiased and internal edges unantialiased.
aaMode = GrDashOp::AAMode::kCoverageWithMSAA;
- } else {
- SkASSERT(AATypeFlags::kCoverage & args.fAATypeFlags);
+ break;
+ case GrAAType::kCoverage:
aaMode = GrDashOp::AAMode::kCoverage;
- }
+ break;
}
SkPoint pts[2];
SkAssertResult(args.fShape->asLine(pts, nullptr));
diff --git a/src/gpu/ops/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp
index 4fcce84..89a7db6 100644
--- a/src/gpu/ops/GrDashOp.cpp
+++ b/src/gpu/ops/GrDashOp.cpp
@@ -258,7 +258,7 @@
}
GrProcessorSet::Analysis finalize(
- const GrCaps& caps, const GrAppliedClip* clip, GrFSAAType fsaaType,
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
GrClampType clampType) override {
GrProcessorAnalysisCoverage coverage;
if (AAMode::kNone == fAAMode && !clip->numClipCoverageFragmentProcessors()) {
@@ -267,7 +267,8 @@
coverage = GrProcessorAnalysisCoverage::kSingleChannel;
}
auto analysis = fProcessorSet.finalize(
- fColor, coverage, clip, fStencilSettings, fsaaType, caps, clampType, &fColor);
+ fColor, coverage, clip, fStencilSettings, hasMixedSampledCoverage, caps, clampType,
+ &fColor);
fUsesLocalCoords = analysis.usesLocalCoords();
return analysis;
}
@@ -1205,7 +1206,7 @@
AAMode aaMode;
do {
aaMode = static_cast<AAMode>(random->nextULessThan(GrDashOp::kAAModeCnt));
- } while (AAMode::kCoverageWithMSAA == aaMode && GrFSAAType::kUnifiedMSAA != fsaaType);
+ } while (AAMode::kCoverageWithMSAA == aaMode && numSamples <= 1);
// We can only dash either horizontal or vertical lines
SkPoint pts[2];
diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp
index 2e3af82..2c4db58 100644
--- a/src/gpu/ops/GrDefaultPathRenderer.cpp
+++ b/src/gpu/ops/GrDefaultPathRenderer.cpp
@@ -388,14 +388,15 @@
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
GrProcessorAnalysisCoverage gpCoverage =
this->coverage() == 0xFF ? GrProcessorAnalysisCoverage::kNone
: GrProcessorAnalysisCoverage::kSingleChannel;
// This Op uses uniform (not vertex) color, so doesn't need to track wide color.
return fHelper.finalizeProcessors(
- caps, clip, fsaaType, clampType, gpCoverage, &fColor, nullptr);
+ caps, clip, hasMixedSampledCoverage, clampType, gpCoverage, &fColor, nullptr);
}
private:
@@ -646,7 +647,7 @@
return CanDrawPath::kNo;
}
// If antialiasing is required, we only support MSAA.
- if (AATypeFlags::kNone != args.fAATypeFlags && !(AATypeFlags::kMSAA & args.fAATypeFlags)) {
+ if (GrAAType::kNone != args.fAAType && GrAAType::kMSAA != args.fAAType) {
return CanDrawPath::kNo;
}
// This can draw any path with any simple fill style.
@@ -660,9 +661,7 @@
bool GrDefaultPathRenderer::onDrawPath(const DrawPathArgs& args) {
GR_AUDIT_TRAIL_AUTO_FRAME(args.fRenderTargetContext->auditTrail(),
"GrDefaultPathRenderer::onDrawPath");
- GrAAType aaType = (AATypeFlags::kNone != args.fAATypeFlags)
- ? GrAAType::kMSAA
- : GrAAType::kNone;
+ GrAAType aaType = (GrAAType::kNone != args.fAAType) ? GrAAType::kMSAA : GrAAType::kNone;
return this->internalDrawPath(
args.fRenderTargetContext, std::move(args.fPaint), aaType, *args.fUserStencilSettings,
@@ -704,7 +703,7 @@
viewMatrix.mapRect(&bounds);
uint8_t coverage = GrRandomCoverage(random);
GrAAType aaType = GrAAType::kNone;
- if (GrFSAAType::kUnifiedMSAA == fsaaType && random->nextBool()) {
+ if (numSamples > 1 && random->nextBool()) {
aaType = GrAAType::kMSAA;
}
return DefaultPathOp::Make(context, std::move(paint), path, srcSpaceTol, coverage, viewMatrix,
diff --git a/src/gpu/ops/GrDrawAtlasOp.cpp b/src/gpu/ops/GrDrawAtlasOp.cpp
index 34bea07..978e904 100644
--- a/src/gpu/ops/GrDrawAtlasOp.cpp
+++ b/src/gpu/ops/GrDrawAtlasOp.cpp
@@ -44,8 +44,8 @@
FixedFunctionFlags fixedFunctionFlags() const override;
- GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*, GrFSAAType,
- GrClampType) override;
+ GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*,
+ bool hasMixedSampledCoverage, GrClampType) override;
private:
void onPrepareDraws(Target*) override;
@@ -245,16 +245,17 @@
return fHelper.fixedFunctionFlags();
}
-GrProcessorSet::Analysis DrawAtlasOp::finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) {
+GrProcessorSet::Analysis DrawAtlasOp::finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) {
GrProcessorAnalysisColor gpColor;
if (this->hasColors()) {
gpColor.setToUnknown();
} else {
gpColor.setToConstant(fColor);
}
- auto result = fHelper.finalizeProcessors(
- caps, clip, fsaaType, clampType, GrProcessorAnalysisCoverage::kNone, &gpColor);
+ auto result = fHelper.finalizeProcessors(caps, clip, hasMixedSampledCoverage, clampType,
+ GrProcessorAnalysisCoverage::kNone, &gpColor);
if (gpColor.isConstant(&fColor)) {
fHasColors = false;
}
@@ -333,7 +334,7 @@
SkMatrix viewMatrix = GrTest::TestMatrix(random);
GrAAType aaType = GrAAType::kNone;
- if (GrFSAAType::kUnifiedMSAA == fsaaType && random->nextBool()) {
+ if (numSamples > 1 && random->nextBool()) {
aaType = GrAAType::kMSAA;
}
diff --git a/src/gpu/ops/GrDrawOp.h b/src/gpu/ops/GrDrawOp.h
index 5627ed3..a9e9752 100644
--- a/src/gpu/ops/GrDrawOp.h
+++ b/src/gpu/ops/GrDrawOp.h
@@ -43,8 +43,8 @@
* at this time the op must report whether a copy of the destination (or destination texture
* itself) needs to be provided to the GrXferProcessor when this op executes.
*/
- virtual GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*, GrFSAAType,
- GrClampType) = 0;
+ virtual GrProcessorSet::Analysis finalize(
+ const GrCaps&, const GrAppliedClip*, bool hasMixedSampledCoverage, GrClampType) = 0;
#ifdef SK_DEBUG
bool fAddDrawOpCalled = false;
diff --git a/src/gpu/ops/GrDrawPathOp.cpp b/src/gpu/ops/GrDrawPathOp.cpp
index 613b8a1..4388524 100644
--- a/src/gpu/ops/GrDrawPathOp.cpp
+++ b/src/gpu/ops/GrDrawPathOp.cpp
@@ -55,11 +55,11 @@
}
const GrProcessorSet::Analysis& GrDrawPathOpBase::doProcessorAnalysis(
- const GrCaps& caps, const GrAppliedClip* clip, GrFSAAType fsaaType,
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
GrClampType clampType) {
fAnalysis = fProcessorSet.finalize(
- fInputColor, GrProcessorAnalysisCoverage::kNone, clip, &kCoverPass, fsaaType, caps,
- clampType, &fInputColor);
+ fInputColor, GrProcessorAnalysisCoverage::kNone, clip, &kCoverPass,
+ hasMixedSampledCoverage, caps, clampType, &fInputColor);
return fAnalysis;
}
diff --git a/src/gpu/ops/GrDrawPathOp.h b/src/gpu/ops/GrDrawPathOp.h
index 95d266c..cd4ecc30 100644
--- a/src/gpu/ops/GrDrawPathOp.h
+++ b/src/gpu/ops/GrDrawPathOp.h
@@ -29,9 +29,10 @@
? FixedFunctionFlags::kUsesHWAA | FixedFunctionFlags::kUsesStencil
: FixedFunctionFlags::kUsesStencil;
}
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
- return this->doProcessorAnalysis(caps, clip, fsaaType, clampType);
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
+ return this->doProcessorAnalysis(caps, clip, hasMixedSampledCoverage, clampType);
}
void visitProxies(const VisitProxyFunc& func) const override {
@@ -46,7 +47,7 @@
GrProcessorSet detachProcessors() { return std::move(fProcessorSet); }
inline GrPipeline::InitArgs pipelineInitArgs(const GrOpFlushState&);
const GrProcessorSet::Analysis& doProcessorAnalysis(
- const GrCaps&, const GrAppliedClip*, GrFSAAType, GrClampType);
+ const GrCaps&, const GrAppliedClip*, bool hasMixedSampledCoverage, GrClampType);
const GrProcessorSet::Analysis& processorAnalysis() const {
SkASSERT(fAnalysis.isInitialized());
return fAnalysis;
diff --git a/src/gpu/ops/GrDrawVerticesOp.cpp b/src/gpu/ops/GrDrawVerticesOp.cpp
index 580edd6..272668e 100644
--- a/src/gpu/ops/GrDrawVerticesOp.cpp
+++ b/src/gpu/ops/GrDrawVerticesOp.cpp
@@ -38,8 +38,8 @@
FixedFunctionFlags fixedFunctionFlags() const override;
- GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*, GrFSAAType,
- GrClampType) override;
+ GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*,
+ bool hasMixedSampledCoverage, GrClampType) override;
private:
enum class ColorArrayType {
@@ -206,16 +206,17 @@
return fHelper.fixedFunctionFlags();
}
-GrProcessorSet::Analysis DrawVerticesOp::finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) {
+GrProcessorSet::Analysis DrawVerticesOp::finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) {
GrProcessorAnalysisColor gpColor;
if (this->requiresPerVertexColors()) {
gpColor.setToUnknown();
} else {
gpColor.setToConstant(fMeshes.front().fColor);
}
- auto result = fHelper.finalizeProcessors(
- caps, clip, fsaaType, clampType, GrProcessorAnalysisCoverage::kNone, &gpColor);
+ auto result = fHelper.finalizeProcessors(caps, clip, hasMixedSampledCoverage, clampType,
+ GrProcessorAnalysisCoverage::kNone, &gpColor);
if (gpColor.isConstant(&fMeshes.front().fColor)) {
fMeshes.front().fIgnoreColors = true;
fFlags &= ~kRequiresPerVertexColors_Flag;
@@ -698,7 +699,7 @@
hasIndices ? indices.count() : 0,
indices.begin());
GrAAType aaType = GrAAType::kNone;
- if (GrFSAAType::kUnifiedMSAA == fsaaType && random->nextBool()) {
+ if (numSamples > 1 && random->nextBool()) {
aaType = GrAAType::kMSAA;
}
return GrDrawVerticesOp::Make(context, std::move(paint), std::move(vertices), nullptr, 0,
diff --git a/src/gpu/ops/GrFillRRectOp.cpp b/src/gpu/ops/GrFillRRectOp.cpp
index d3f810e..e5e18b9 100644
--- a/src/gpu/ops/GrFillRRectOp.cpp
+++ b/src/gpu/ops/GrFillRRectOp.cpp
@@ -126,15 +126,17 @@
// We will write the color and local rect attribs during finalize().
}
-GrProcessorSet::Analysis GrFillRRectOp::finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) {
+GrProcessorSet::Analysis GrFillRRectOp::finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) {
SkASSERT(1 == fInstanceCount);
SkPMColor4f overrideColor;
const GrProcessorSet::Analysis& analysis = fProcessors.finalize(
fOriginalColor, GrProcessorAnalysisCoverage::kSingleChannel, clip,
- &GrUserStencilSettings::kUnused, fsaaType, caps, clampType, &overrideColor);
+ &GrUserStencilSettings::kUnused, hasMixedSampledCoverage, caps, clampType,
+ &overrideColor);
// Finish writing the instance attribs.
SkPMColor4f finalColor = analysis.inputColorIsOverridden() ? overrideColor : fOriginalColor;
diff --git a/src/gpu/ops/GrFillRRectOp.h b/src/gpu/ops/GrFillRRectOp.h
index 4bd2a23..a7678a1 100644
--- a/src/gpu/ops/GrFillRRectOp.h
+++ b/src/gpu/ops/GrFillRRectOp.h
@@ -26,8 +26,8 @@
? FixedFunctionFlags::kUsesHWAA
: FixedFunctionFlags::kNone;
}
- GrProcessorSet::Analysis finalize(
- const GrCaps&, const GrAppliedClip*, GrFSAAType, GrClampType) override;
+ GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*,
+ bool hasMixedSampledCoverage, GrClampType) override;
CombineResult onCombineIfPossible(GrOp*, const GrCaps&) override;
void visitProxies(const VisitProxyFunc& fn) const override {
fProcessors.visitProxies(fn);
diff --git a/src/gpu/ops/GrFillRectOp.cpp b/src/gpu/ops/GrFillRectOp.cpp
index 9935d51..f5f7c7c 100644
--- a/src/gpu/ops/GrFillRectOp.cpp
+++ b/src/gpu/ops/GrFillRectOp.cpp
@@ -121,8 +121,9 @@
}
#endif
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
// Initialize aggregate color analysis with the first quad's color (which always exists)
SkASSERT(this->quadCount() > 0);
GrProcessorAnalysisColor quadColors(fDeviceQuads.metadata(0).fColor);
@@ -143,7 +144,7 @@
GrProcessorAnalysisCoverage::kSingleChannel :
GrProcessorAnalysisCoverage::kNone;
auto result = fHelper.finalizeProcessors(
- caps, clip, fsaaType, clampType, coverage, &quadColors);
+ caps, clip, hasMixedSampledCoverage, clampType, coverage, &quadColors);
// If there is a constant color after analysis, that means all of the quads should be set
// to the same color (even if they started out with different colors).
SkPMColor4f colorOverride;
@@ -414,7 +415,7 @@
GrAAType aaType = GrAAType::kNone;
if (random->nextBool()) {
- aaType = (fsaaType == GrFSAAType::kUnifiedMSAA) ? GrAAType::kMSAA : GrAAType::kCoverage;
+ aaType = (numSamples > 1) ? GrAAType::kMSAA : GrAAType::kCoverage;
}
const GrUserStencilSettings* stencil = random->nextBool() ? nullptr
: GrGetRandomStencil(random, context);
diff --git a/src/gpu/ops/GrLatticeOp.cpp b/src/gpu/ops/GrLatticeOp.cpp
index 923fd98..96c9a72 100644
--- a/src/gpu/ops/GrLatticeOp.cpp
+++ b/src/gpu/ops/GrLatticeOp.cpp
@@ -194,15 +194,16 @@
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
auto opaque = fPatches[0].fColor.isOpaque() && GrPixelConfigIsOpaque(fProxy->config())
? GrProcessorAnalysisColor::Opaque::kYes
: GrProcessorAnalysisColor::Opaque::kNo;
auto analysisColor = GrProcessorAnalysisColor(opaque);
- auto result = fHelper.finalizeProcessors(caps, clip, fsaaType, clampType,
- GrProcessorAnalysisCoverage::kNone,
- &analysisColor);
+ auto result = fHelper.finalizeProcessors(
+ caps, clip, hasMixedSampledCoverage, clampType, GrProcessorAnalysisCoverage::kNone,
+ &analysisColor);
analysisColor.isConstant(&fPatches[0].fColor);
fWideColor = SkPMColor4fNeedsWideColor(fPatches[0].fColor, clampType, caps);
return result;
diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp
index 5afd1d1..f6dfc8e 100644
--- a/src/gpu/ops/GrOvalOpFactory.cpp
+++ b/src/gpu/ops/GrOvalOpFactory.cpp
@@ -1221,10 +1221,11 @@
}
#endif
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
SkPMColor4f* color = &fCircles.front().fColor;
- return fHelper.finalizeProcessors(caps, clip, fsaaType, clampType,
+ return fHelper.finalizeProcessors(caps, clip, hasMixedSampledCoverage, clampType,
GrProcessorAnalysisCoverage::kSingleChannel, color,
&fWideColor);
}
@@ -1552,10 +1553,11 @@
}
#endif
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
SkPMColor4f* color = &fCircles.front().fColor;
- return fHelper.finalizeProcessors(caps, clip, fsaaType, clampType,
+ return fHelper.finalizeProcessors(caps, clip, hasMixedSampledCoverage, clampType,
GrProcessorAnalysisCoverage::kSingleChannel, color,
&fWideColor);
}
@@ -1848,12 +1850,13 @@
}
#endif
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
fUseScale = !caps.shaderCaps()->floatIs32Bits() &&
!caps.shaderCaps()->hasLowFragmentPrecision();
SkPMColor4f* color = &fEllipses.front().fColor;
- return fHelper.finalizeProcessors(caps, clip, fsaaType, clampType,
+ return fHelper.finalizeProcessors(caps, clip, hasMixedSampledCoverage, clampType,
GrProcessorAnalysisCoverage::kSingleChannel, color,
&fWideColor);
}
@@ -2090,12 +2093,13 @@
}
#endif
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
fUseScale = !caps.shaderCaps()->floatIs32Bits() &&
!caps.shaderCaps()->hasLowFragmentPrecision();
SkPMColor4f* color = &fEllipses.front().fColor;
- return fHelper.finalizeProcessors(caps, clip, fsaaType, clampType,
+ return fHelper.finalizeProcessors(caps, clip, hasMixedSampledCoverage, clampType,
GrProcessorAnalysisCoverage::kSingleChannel, color,
&fWideColor);
}
@@ -2414,10 +2418,11 @@
}
#endif
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
SkPMColor4f* color = &fRRects.front().fColor;
- return fHelper.finalizeProcessors(caps, clip, fsaaType, clampType,
+ return fHelper.finalizeProcessors(caps, clip, hasMixedSampledCoverage, clampType,
GrProcessorAnalysisCoverage::kSingleChannel, color,
&fWideColor);
}
@@ -2755,11 +2760,12 @@
}
#endif
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
fUseScale = !caps.shaderCaps()->floatIs32Bits();
SkPMColor4f* color = &fRRects.front().fColor;
- return fHelper.finalizeProcessors(caps, clip, fsaaType, clampType,
+ return fHelper.finalizeProcessors(caps, clip, hasMixedSampledCoverage, clampType,
GrProcessorAnalysisCoverage::kSingleChannel, color,
&fWideColor);
}
diff --git a/src/gpu/ops/GrRegionOp.cpp b/src/gpu/ops/GrRegionOp.cpp
index b1556fd..ba902ec 100644
--- a/src/gpu/ops/GrRegionOp.cpp
+++ b/src/gpu/ops/GrRegionOp.cpp
@@ -87,11 +87,12 @@
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
- return fHelper.finalizeProcessors(caps, clip, fsaaType, clampType,
- GrProcessorAnalysisCoverage::kNone, &fRegions[0].fColor,
- &fWideColor);
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
+ return fHelper.finalizeProcessors(
+ caps, clip, hasMixedSampledCoverage, clampType, GrProcessorAnalysisCoverage::kNone,
+ &fRegions[0].fColor, &fWideColor);
}
private:
@@ -211,7 +212,7 @@
}
SkMatrix viewMatrix = GrTest::TestMatrix(random);
GrAAType aaType = GrAAType::kNone;
- if (GrFSAAType::kUnifiedMSAA == fsaaType && random->nextBool()) {
+ if (numSamples > 1 && random->nextBool()) {
aaType = GrAAType::kMSAA;
}
return RegionOp::Make(context, std::move(paint), viewMatrix, region, aaType,
diff --git a/src/gpu/ops/GrShadowRRectOp.cpp b/src/gpu/ops/GrShadowRRectOp.cpp
index 20b8e09..34b6f94 100644
--- a/src/gpu/ops/GrShadowRRectOp.cpp
+++ b/src/gpu/ops/GrShadowRRectOp.cpp
@@ -255,8 +255,8 @@
FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; }
- GrProcessorSet::Analysis finalize(
- const GrCaps&, const GrAppliedClip*, GrFSAAType, GrClampType) override {
+ GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*,
+ bool hasMixedSampledCoverage, GrClampType) override {
return GrProcessorSet::EmptySetAnalysis();
}
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp b/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
index c255365..3c10b8b 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
@@ -61,11 +61,12 @@
}
GrProcessorSet::Analysis GrSimpleMeshDrawOpHelper::finalizeProcessors(
- const GrCaps& caps, const GrAppliedClip* clip, GrFSAAType fsaaType, GrClampType clampType,
- GrProcessorAnalysisCoverage geometryCoverage, SkPMColor4f* geometryColor, bool* wideColor) {
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType, GrProcessorAnalysisCoverage geometryCoverage,
+ SkPMColor4f* geometryColor, bool* wideColor) {
GrProcessorAnalysisColor color = *geometryColor;
auto result = this->finalizeProcessors(
- caps, clip, fsaaType, clampType, geometryCoverage, &color);
+ caps, clip, hasMixedSampledCoverage, clampType, geometryCoverage, &color);
color.isConstant(geometryColor);
if (wideColor) {
*wideColor = SkPMColor4fNeedsWideColor(*geometryColor, clampType, caps);
@@ -75,8 +76,8 @@
GrProcessorSet::Analysis GrSimpleMeshDrawOpHelper::finalizeProcessors(
const GrCaps& caps, const GrAppliedClip* clip, const GrUserStencilSettings* userStencil,
- GrFSAAType fsaaType, GrClampType clampType, GrProcessorAnalysisCoverage geometryCoverage,
- GrProcessorAnalysisColor* geometryColor) {
+ bool hasMixedSampledCoverage, GrClampType clampType,
+ GrProcessorAnalysisCoverage geometryCoverage, GrProcessorAnalysisColor* geometryColor) {
SkDEBUGCODE(fDidAnalysis = true);
GrProcessorSet::Analysis analysis;
if (fProcessors) {
@@ -87,8 +88,8 @@
: GrProcessorAnalysisCoverage::kNone;
}
SkPMColor4f overrideColor;
- analysis = fProcessors->finalize(*geometryColor, coverage, clip, userStencil, fsaaType,
- caps, clampType, &overrideColor);
+ analysis = fProcessors->finalize(*geometryColor, coverage, clip, userStencil,
+ hasMixedSampledCoverage, caps, clampType, &overrideColor);
if (analysis.inputColorIsOverridden()) {
*geometryColor = overrideColor;
}
@@ -139,9 +140,6 @@
case GrAAType::kMSAA:
result.append(" msaa\n");
break;
- case GrAAType::kMixedSamples:
- result.append(" mixed samples\n");
- break;
}
dump_pipeline_flags(fPipelineFlags, &result);
return result;
@@ -163,11 +161,12 @@
}
GrProcessorSet::Analysis GrSimpleMeshDrawOpHelperWithStencil::finalizeProcessors(
- const GrCaps& caps, const GrAppliedClip* clip, GrFSAAType fsaaType, GrClampType clampType,
- GrProcessorAnalysisCoverage geometryCoverage, SkPMColor4f* geometryColor, bool* wideColor) {
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType, GrProcessorAnalysisCoverage geometryCoverage,
+ SkPMColor4f* geometryColor, bool* wideColor) {
GrProcessorAnalysisColor color = *geometryColor;
auto result = this->finalizeProcessors(
- caps, clip, fsaaType, clampType, geometryCoverage, &color);
+ caps, clip, hasMixedSampledCoverage, clampType, geometryCoverage, &color);
color.isConstant(geometryColor);
if (wideColor) {
*wideColor = SkPMColor4fNeedsWideColor(*geometryColor, clampType, caps);
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
index 3650fc5..35bf3cc 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
@@ -70,11 +70,12 @@
* color from its geometry processor instead.
*/
GrProcessorSet::Analysis finalizeProcessors(
- const GrCaps& caps, const GrAppliedClip* clip, GrFSAAType fsaaType,
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
GrClampType clampType, GrProcessorAnalysisCoverage geometryCoverage,
GrProcessorAnalysisColor* geometryColor) {
- return this->finalizeProcessors(caps, clip, &GrUserStencilSettings::kUnused, fsaaType,
- clampType, geometryCoverage, geometryColor);
+ return this->finalizeProcessors(
+ caps, clip, &GrUserStencilSettings::kUnused, hasMixedSampledCoverage, clampType,
+ geometryCoverage, geometryColor);
}
/**
@@ -83,7 +84,7 @@
* changed the op must override its geometry processor color output with the new color.
*/
GrProcessorSet::Analysis finalizeProcessors(
- const GrCaps&, const GrAppliedClip*, GrFSAAType, GrClampType,
+ const GrCaps&, const GrAppliedClip*, bool hasMixedSampledCoverage, GrClampType,
GrProcessorAnalysisCoverage geometryCoverage, SkPMColor4f* geometryColor,
bool* wideColor);
@@ -128,8 +129,8 @@
GrPipeline::InputFlags pipelineFlags() const { return fPipelineFlags; }
GrProcessorSet::Analysis finalizeProcessors(
- const GrCaps& caps, const GrAppliedClip*, const GrUserStencilSettings*, GrFSAAType,
- GrClampType, GrProcessorAnalysisCoverage geometryCoverage,
+ const GrCaps& caps, const GrAppliedClip*, const GrUserStencilSettings*,
+ bool hasMixedSampledCoverage, GrClampType, GrProcessorAnalysisCoverage geometryCoverage,
GrProcessorAnalysisColor* geometryColor);
GrProcessorSet* fProcessors;
@@ -167,17 +168,18 @@
GrDrawOp::FixedFunctionFlags fixedFunctionFlags() const;
GrProcessorSet::Analysis finalizeProcessors(
- const GrCaps& caps, const GrAppliedClip* clip, GrFSAAType fsaaType,
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
GrClampType clampType, GrProcessorAnalysisCoverage geometryCoverage,
GrProcessorAnalysisColor* geometryColor) {
return this->INHERITED::finalizeProcessors(
- caps, clip, fStencilSettings, fsaaType, clampType, geometryCoverage, geometryColor);
+ caps, clip, fStencilSettings, hasMixedSampledCoverage, clampType, geometryCoverage,
+ geometryColor);
}
GrProcessorSet::Analysis finalizeProcessors(
- const GrCaps&, const GrAppliedClip*, GrFSAAType, GrClampType,
- GrProcessorAnalysisCoverage geometryCoverage, SkPMColor4f* geometryColor,
- bool* wideColor);
+ const GrCaps&, const GrAppliedClip*, bool hasMixedSampledCoverage, GrClampType,
+ GrProcessorAnalysisCoverage geometryCoverage, SkPMColor4f* geometryColor, bool*
+ wideColor);
using GrSimpleMeshDrawOpHelper::aaType;
using GrSimpleMeshDrawOpHelper::setAAType;
diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp
index 95d6f7c..f148ce0 100644
--- a/src/gpu/ops/GrSmallPathRenderer.cpp
+++ b/src/gpu/ops/GrSmallPathRenderer.cpp
@@ -189,7 +189,7 @@
return CanDrawPath::kNo;
}
// This does non-inverse coverage-based antialiased fills.
- if (!(AATypeFlags::kCoverage & args.fAATypeFlags)) {
+ if (GrAAType::kCoverage != args.fAAType) {
return CanDrawPath::kNo;
}
// TODO: Support inverse fill
@@ -297,11 +297,12 @@
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
return fHelper.finalizeProcessors(
- caps, clip, fsaaType, clampType, GrProcessorAnalysisCoverage::kSingleChannel,
- &fShapes.front().fColor, &fWideColor);
+ caps, clip, hasMixedSampledCoverage, clampType,
+ GrProcessorAnalysisCoverage::kSingleChannel, &fShapes.front().fColor, &fWideColor);
}
private:
diff --git a/src/gpu/ops/GrStencilAndCoverPathRenderer.cpp b/src/gpu/ops/GrStencilAndCoverPathRenderer.cpp
index 511599c..58f1037 100644
--- a/src/gpu/ops/GrStencilAndCoverPathRenderer.cpp
+++ b/src/gpu/ops/GrStencilAndCoverPathRenderer.cpp
@@ -44,8 +44,8 @@
if (args.fHasUserStencilSettings) {
return CanDrawPath::kNo;
}
- // doesn't do per-path AA, relies on the target having MSAA.
- if (AATypeFlags::kCoverage == args.fAATypeFlags) {
+ // We rely on a mixed sampled stencil buffer to implement coverage AA.
+ if (GrAAType::kCoverage == args.fAAType) { // MIXED SAMPLES TODO: "&& !mixedSamplesSupport"
return CanDrawPath::kNo;
}
return CanDrawPath::kYes;
@@ -91,12 +91,14 @@
const SkMatrix& viewMatrix = *args.fViewMatrix;
- bool doStencilMSAA = AATypeFlags::kNone != args.fAATypeFlags;
- SkASSERT(!doStencilMSAA ||
- (AATypeFlags::kMSAA | AATypeFlags::kMixedSampledStencilThenCover) & args.fAATypeFlags);
+ bool doStencilMSAA = GrAAType::kNone != args.fAAType;
sk_sp<GrPath> path(get_gr_path(fResourceProvider, *args.fShape));
+ if (GrAAType::kCoverage == args.fAAType) {
+ // MIXED SAMPLES TODO: Indicate that we need a mixed sampled stencil buffer.
+ }
+
if (args.fShape->inverseFilled()) {
SkMatrix vmi;
if (!viewMatrix.invert(&vmi)) {
@@ -157,12 +159,12 @@
// We have to suppress enabling MSAA for mixed samples or we will get seams due to
// coverage modulation along the edge where two triangles making up the rect meet.
GrAA doStencilMSAA = GrAA::kNo;
- if (AATypeFlags::kMSAA & args.fAATypeFlags) {
- SkASSERT(!(AATypeFlags::kMixedSampledStencilThenCover & args.fAATypeFlags));
+ if (GrAAType::kMSAA == args.fAAType) {
doStencilMSAA = GrAA::kYes;
}
- args.fRenderTargetContext->priv().stencilRect(*args.fClip, &kInvertedCoverPass,
- std::move(args.fPaint), doStencilMSAA, coverMatrix, coverBounds, &localMatrix);
+ args.fRenderTargetContext->priv().stencilRect(
+ *args.fClip, &kInvertedCoverPass, std::move(args.fPaint), doStencilMSAA,
+ coverMatrix, coverBounds, &localMatrix);
}
} else {
std::unique_ptr<GrDrawOp> op = GrDrawPathOp::Make(
diff --git a/src/gpu/ops/GrStrokeRectOp.cpp b/src/gpu/ops/GrStrokeRectOp.cpp
index a016c77..a435832 100644
--- a/src/gpu/ops/GrStrokeRectOp.cpp
+++ b/src/gpu/ops/GrStrokeRectOp.cpp
@@ -163,10 +163,11 @@
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
// This Op uses uniform (not vertex) color, so doesn't need to track wide color.
- return fHelper.finalizeProcessors(caps, clip, fsaaType, clampType,
+ return fHelper.finalizeProcessors(caps, clip, hasMixedSampledCoverage, clampType,
GrProcessorAnalysisCoverage::kNone, &fColor, nullptr);
}
@@ -409,11 +410,12 @@
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
return fHelper.finalizeProcessors(
- caps, clip, fsaaType, clampType, GrProcessorAnalysisCoverage::kSingleChannel,
- &fRects.back().fColor, &fWideColor);
+ caps, clip, hasMixedSampledCoverage, clampType,
+ GrProcessorAnalysisCoverage::kSingleChannel, &fRects.back().fColor, &fWideColor);
}
private:
@@ -799,7 +801,7 @@
strokePaint.setStrokeJoin(SkPaint::kMiter_Join);
SkStrokeRec strokeRec(strokePaint);
GrAAType aaType = GrAAType::kNone;
- if (fsaaType == GrFSAAType::kUnifiedMSAA) {
+ if (numSamples > 1) {
aaType = random->nextBool() ? GrAAType::kMSAA : GrAAType::kNone;
}
return NonAAStrokeRectOp::Make(context, std::move(paint), viewMatrix, rect, strokeRec, aaType);
diff --git a/src/gpu/ops/GrTessellatingPathRenderer.cpp b/src/gpu/ops/GrTessellatingPathRenderer.cpp
index b8f4cfb..f156449 100644
--- a/src/gpu/ops/GrTessellatingPathRenderer.cpp
+++ b/src/gpu/ops/GrTessellatingPathRenderer.cpp
@@ -150,21 +150,25 @@
if (!args.fShape->style().isSimpleFill() || args.fShape->knownToBeConvex()) {
return CanDrawPath::kNo;
}
- if (AATypeFlags::kNone == args.fAATypeFlags || (AATypeFlags::kMSAA & args.fAATypeFlags)) {
- // Prefer MSAA, if any antialiasing. In the non-analytic-AA case, We skip paths that don't
- // have a key since the real advantage of this path renderer comes from caching the
- // tessellated geometry.
- if (!args.fShape->hasUnstyledKey()) {
- return CanDrawPath::kNo;
- }
- } else if (AATypeFlags::kCoverage & args.fAATypeFlags) {
- // Use analytic AA if we don't have MSAA. In this case, we do not cache, so we accept paths
- // without keys.
- SkPath path;
- args.fShape->asPath(&path);
- if (path.countVerbs() > fMaxVerbCount) {
- return CanDrawPath::kNo;
- }
+ switch (args.fAAType) {
+ case GrAAType::kNone:
+ case GrAAType::kMSAA:
+ // Prefer MSAA, if any antialiasing. In the non-analytic-AA case, We skip paths that
+ // don't have a key since the real advantage of this path renderer comes from caching
+ // the tessellated geometry.
+ if (!args.fShape->hasUnstyledKey()) {
+ return CanDrawPath::kNo;
+ }
+ break;
+ case GrAAType::kCoverage:
+ // Use analytic AA if we don't have MSAA. In this case, we do not cache, so we accept
+ // paths without keys.
+ SkPath path;
+ args.fShape->asPath(&path);
+ if (path.countVerbs() > fMaxVerbCount) {
+ return CanDrawPath::kNo;
+ }
+ break;
}
return CanDrawPath::kYes;
}
@@ -232,14 +236,15 @@
FixedFunctionFlags fixedFunctionFlags() const override { return fHelper.fixedFunctionFlags(); }
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
GrProcessorAnalysisCoverage coverage = fAntiAlias
? GrProcessorAnalysisCoverage::kSingleChannel
: GrProcessorAnalysisCoverage::kNone;
// This Op uses uniform (not vertex) color, so doesn't need to track wide color.
return fHelper.finalizeProcessors(
- caps, clip, fsaaType, clampType, coverage, &fColor, nullptr);
+ caps, clip, hasMixedSampledCoverage, clampType, coverage, &fColor, nullptr);
}
private:
@@ -397,15 +402,9 @@
args.fClip->getConservativeBounds(args.fRenderTargetContext->width(),
args.fRenderTargetContext->height(),
&clipBoundsI);
- GrAAType aaType = GrAAType::kNone;
- if (AATypeFlags::kMSAA & args.fAATypeFlags) {
- aaType = GrAAType::kMSAA;
- } else if (AATypeFlags::kCoverage & args.fAATypeFlags) {
- aaType = GrAAType::kCoverage;
- }
std::unique_ptr<GrDrawOp> op = TessellatingPathOp::Make(
args.fContext, std::move(args.fPaint), *args.fShape, *args.fViewMatrix, clipBoundsI,
- aaType, args.fUserStencilSettings);
+ args.fAAType, args.fUserStencilSettings);
args.fRenderTargetContext->addDrawOp(*args.fClip, std::move(op));
return true;
}
@@ -424,7 +423,7 @@
GrAAType aaType;
do {
aaType = kAATypes[random->nextULessThan(SK_ARRAY_COUNT(kAATypes))];
- } while(GrAAType::kMSAA == aaType && GrFSAAType::kUnifiedMSAA != fsaaType);
+ } while(GrAAType::kMSAA == aaType && numSamples <= 1);
GrStyle style;
do {
GrTest::TestStyle(random, &style);
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index f583777..d77e88b 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -223,7 +223,8 @@
#endif
GrProcessorSet::Analysis finalize(
- const GrCaps& caps, const GrAppliedClip*, GrFSAAType, GrClampType clampType) override {
+ const GrCaps& caps, const GrAppliedClip*, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
fColorType = static_cast<unsigned>(ColorType::kNone);
for (int q = 0; q < fQuads.count(); ++q) {
const ColorDomainAndAA& info = fQuads.metadata(q);
@@ -766,7 +767,7 @@
auto texXform = GrTest::TestColorXform(random);
GrAAType aaType = GrAAType::kNone;
if (random->nextBool()) {
- aaType = (fsaaType == GrFSAAType::kUnifiedMSAA) ? GrAAType::kMSAA : GrAAType::kCoverage;
+ aaType = (numSamples > 1) ? GrAAType::kMSAA : GrAAType::kCoverage;
}
GrQuadAAFlags aaFlags = GrQuadAAFlags::kNone;
aaFlags |= random->nextBool() ? GrQuadAAFlags::kLeft : GrQuadAAFlags::kNone;
diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp
index 39ee6e1..6ef4b5d 100644
--- a/src/gpu/vk/GrVkCaps.cpp
+++ b/src/gpu/vk/GrVkCaps.cpp
@@ -63,7 +63,7 @@
// For CopyImage we can make a simple texture, for ResolveImage we require the dst to be a
// render target as well.
desc->fConfig = src->config();
- if (src->numColorSamples() > 1 || src->asTextureProxy()) {
+ if (src->numSamples() > 1 || src->asTextureProxy()) {
desc->fFlags = kRenderTarget_GrSurfaceFlag;
} else {
// Just going to use CopyImage here
@@ -213,7 +213,7 @@
if (rtProxy->wrapsVkSecondaryCB()) {
return false;
}
- dstSampleCnt = rtProxy->numColorSamples();
+ dstSampleCnt = rtProxy->numSamples();
}
if (const GrRenderTargetProxy* rtProxy = src->asRenderTargetProxy()) {
// Copying to or from render targets that wrap a secondary command buffer is not allowed
@@ -222,7 +222,7 @@
if (rtProxy->wrapsVkSecondaryCB()) {
return false;
}
- srcSampleCnt = rtProxy->numColorSamples();
+ srcSampleCnt = rtProxy->numSamples();
}
SkASSERT((dstSampleCnt > 0) == SkToBool(dst->asRenderTargetProxy()));
SkASSERT((srcSampleCnt > 0) == SkToBool(src->asRenderTargetProxy()));
@@ -873,7 +873,7 @@
bool GrVkCaps::onSurfaceSupportsWritePixels(const GrSurface* surface) const {
if (auto rt = surface->asRenderTarget()) {
- return rt->numColorSamples() <= 1 && SkToBool(surface->asTexture());
+ return rt->numSamples() <= 1 && SkToBool(surface->asTexture());
}
// We can't write to a texture that has a ycbcr sampler.
if (auto tex = static_cast<const GrVkTexture*>(surface->asTexture())) {
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index de6573f..375db6b 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -577,7 +577,7 @@
void GrVkGpu::resolveImage(GrSurface* dst, GrVkRenderTarget* src, const SkIRect& srcRect,
const SkIPoint& dstPoint) {
SkASSERT(dst);
- SkASSERT(src && src->numColorSamples() > 1 && src->msaaImage());
+ SkASSERT(src && src->numSamples() > 1 && src->msaaImage());
VkImageResolve resolveInfo;
resolveInfo.srcSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1};
@@ -612,7 +612,7 @@
void GrVkGpu::internalResolveRenderTarget(GrRenderTarget* target, bool requiresSubmit) {
if (target->needsResolve()) {
- SkASSERT(target->numColorSamples() > 1);
+ SkASSERT(target->numSamples() > 1);
GrVkRenderTarget* rt = static_cast<GrVkRenderTarget*>(target);
SkASSERT(rt->msaaImage());
@@ -1428,7 +1428,7 @@
SkASSERT(width >= rt->width());
SkASSERT(height >= rt->height());
- int samples = rt->numStencilSamples();
+ int samples = rt->numSamples();
const GrVkCaps::StencilFormat& sFmt = this->vkCaps().preferredStencilFormat();
@@ -2069,7 +2069,7 @@
static int get_surface_sample_cnt(GrSurface* surf) {
if (const GrRenderTarget* rt = surf->asRenderTarget()) {
- return rt->numColorSamples();
+ return rt->numSamples();
}
return 0;
}
@@ -2207,7 +2207,7 @@
if (vkRT->wrapsSecondaryCommandBuffer()) {
return false;
}
- dstImage = vkRT->numColorSamples() > 1 ? vkRT->msaaImage() : vkRT;
+ dstImage = vkRT->numSamples() > 1 ? vkRT->msaaImage() : vkRT;
} else {
SkASSERT(dst->asTexture());
dstImage = static_cast<GrVkTexture*>(dst->asTexture());
@@ -2215,7 +2215,7 @@
GrRenderTarget* srcRT = src->asRenderTarget();
if (srcRT) {
GrVkRenderTarget* vkRT = static_cast<GrVkRenderTarget*>(srcRT);
- srcImage = vkRT->numColorSamples() > 1 ? vkRT->msaaImage() : vkRT;
+ srcImage = vkRT->numSamples() > 1 ? vkRT->msaaImage() : vkRT;
} else {
SkASSERT(src->asTexture());
srcImage = static_cast<GrVkTexture*>(src->asTexture());
@@ -2291,7 +2291,7 @@
int srcSampleCount = 0;
if (rt) {
- srcSampleCount = rt->numColorSamples();
+ srcSampleCount = rt->numSamples();
}
bool srcHasYcbcr = image->ycbcrConversionInfo().isValid();
if (!this->vkCaps().canCopyAsBlit(kRGBA_8888_GrPixelConfig, 1, false, false,
diff --git a/src/gpu/vk/GrVkPipelineStateBuilder.cpp b/src/gpu/vk/GrVkPipelineStateBuilder.cpp
index 58516e8..f01b395 100644
--- a/src/gpu/vk/GrVkPipelineStateBuilder.cpp
+++ b/src/gpu/vk/GrVkPipelineStateBuilder.cpp
@@ -300,7 +300,7 @@
}
}
GrVkPipeline* pipeline = resourceProvider.createPipeline(
- this->renderTarget()->numColorSamples(), fPrimProc, fPipeline, stencil, this->origin(),
+ this->renderTarget()->numSamples(), fPrimProc, fPipeline, stencil, this->origin(),
shaderStageInfo, numShaderStages, primitiveType, compatibleRenderPass, pipelineLayout);
for (int i = 0; i < kGrShaderTypeCount; ++i) {
// This if check should not be needed since calling destroy on a VK_NULL_HANDLE is allowed.
diff --git a/src/gpu/vk/GrVkRenderTarget.cpp b/src/gpu/vk/GrVkRenderTarget.cpp
index 4f6ffe6..786f502 100644
--- a/src/gpu/vk/GrVkRenderTarget.cpp
+++ b/src/gpu/vk/GrVkRenderTarget.cpp
@@ -265,7 +265,7 @@
VkFormat colorFormat;
GrPixelConfigToVkFormat(this->config(), &colorFormat);
desc->fColor.fFormat = colorFormat;
- desc->fColor.fSamples = this->numColorSamples();
+ desc->fColor.fSamples = this->numSamples();
*attachmentFlags = GrVkRenderPass::kColor_AttachmentFlag;
uint32_t attachmentCount = 1;
@@ -376,7 +376,7 @@
GrBackendRenderTarget GrVkRenderTarget::getBackendRenderTarget() const {
SkASSERT(!this->wrapsSecondaryCommandBuffer());
- return GrBackendRenderTarget(this->width(), this->height(), this->numColorSamples(),
+ return GrBackendRenderTarget(this->width(), this->height(), this->numSamples(),
fInfo, this->grVkImageLayout());
}
diff --git a/src/gpu/vk/GrVkRenderTarget.h b/src/gpu/vk/GrVkRenderTarget.h
index 0c2b897..fa45e91 100644
--- a/src/gpu/vk/GrVkRenderTarget.h
+++ b/src/gpu/vk/GrVkRenderTarget.h
@@ -75,7 +75,7 @@
// override of GrRenderTarget
ResolveType getResolveType() const override {
- if (this->numColorSamples() > 1) {
+ if (this->numSamples() > 1) {
return kCanResolve_ResolveType;
}
return kAutoResolves_ResolveType;
@@ -119,7 +119,7 @@
// This accounts for the texture's memory and any MSAA renderbuffer's memory.
size_t onGpuMemorySize() const override {
- int numColorSamples = this->numColorSamples();
+ int numColorSamples = this->numSamples();
if (numColorSamples > 1) {
// Add one to account for the resolved VkImage.
numColorSamples += 1;
diff --git a/src/gpu/vk/GrVkSecondaryCBDrawContext.cpp b/src/gpu/vk/GrVkSecondaryCBDrawContext.cpp
index f137be4..c526848 100644
--- a/src/gpu/vk/GrVkSecondaryCBDrawContext.cpp
+++ b/src/gpu/vk/GrVkSecondaryCBDrawContext.cpp
@@ -98,7 +98,7 @@
rtc->colorSpaceInfo().refColorSpace());
characterization->set(ctx->threadSafeProxy(), maxResourceBytes, ii, rtc->origin(),
- rtc->colorSpaceInfo().config(), rtc->fsaaType(), rtc->numStencilSamples(),
+ rtc->colorSpaceInfo().config(), rtc->numSamples(),
SkSurfaceCharacterization::Textureable(false),
SkSurfaceCharacterization::MipMapped(false),
SkSurfaceCharacterization::UsesGLFBO0(false),
@@ -150,8 +150,7 @@
characterization.width() == rtc->width() &&
characterization.height() == rtc->height() &&
characterization.colorType() == rtcColorType &&
- characterization.fsaaType() == rtc->fsaaType() &&
- characterization.stencilCount() == rtc->numStencilSamples() &&
+ characterization.sampleCount() == rtc->numSamples() &&
SkColorSpace::Equals(characterization.colorSpace(),
rtc->colorSpaceInfo().colorSpace()) &&
characterization.surfaceProps() == rtc->surfaceProps();
diff --git a/src/gpu/vk/GrVkTextureRenderTarget.cpp b/src/gpu/vk/GrVkTextureRenderTarget.cpp
index 08d9711..4b47481 100644
--- a/src/gpu/vk/GrVkTextureRenderTarget.cpp
+++ b/src/gpu/vk/GrVkTextureRenderTarget.cpp
@@ -232,7 +232,7 @@
}
size_t GrVkTextureRenderTarget::onGpuMemorySize() const {
- int numColorSamples = this->numColorSamples();
+ int numColorSamples = this->numSamples();
if (numColorSamples > 1) {
// Add one to account for the resolve VkImage.
++numColorSamples;
diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp
index 1ad4f14..e70bc56 100644
--- a/src/image/SkSurface_Gpu.cpp
+++ b/src/image/SkSurface_Gpu.cpp
@@ -79,7 +79,7 @@
SkCanvas* SkSurface_Gpu::onNewCanvas() { return new SkCanvas(fDevice); }
sk_sp<SkSurface> SkSurface_Gpu::onNewSurface(const SkImageInfo& info) {
- int sampleCount = fDevice->accessRenderTargetContext()->numColorSamples();
+ int sampleCount = fDevice->accessRenderTargetContext()->numSamples();
GrSurfaceOrigin origin = fDevice->accessRenderTargetContext()->origin();
// TODO: Make caller specify this (change virtual signature of onNewSurface).
static const SkBudgeted kBudgeted = SkBudgeted::kNo;
@@ -210,7 +210,7 @@
rtc->colorSpaceInfo().refColorSpace());
characterization->set(ctx->threadSafeProxy(), maxResourceBytes, ii, rtc->origin(),
- rtc->colorSpaceInfo().config(), rtc->fsaaType(), rtc->numStencilSamples(),
+ rtc->colorSpaceInfo().config(), rtc->numSamples(),
SkSurfaceCharacterization::Textureable(SkToBool(rtc->asTextureProxy())),
SkSurfaceCharacterization::MipMapped(mipmapped),
SkSurfaceCharacterization::UsesGLFBO0(usesGLFBO0),
@@ -308,8 +308,7 @@
characterization.width() == rtc->width() &&
characterization.height() == rtc->height() &&
characterization.colorType() == rtcColorType &&
- characterization.fsaaType() == rtc->fsaaType() &&
- characterization.stencilCount() == rtc->numStencilSamples() &&
+ characterization.sampleCount() == rtc->numSamples() &&
SkColorSpace::Equals(characterization.colorSpace(),
rtc->colorSpaceInfo().colorSpace()) &&
characterization.surfaceProps() == rtc->surfaceProps();
@@ -367,7 +366,7 @@
desc.fWidth = c.width();
desc.fHeight = c.height();
desc.fConfig = c.config();
- desc.fSampleCnt = c.stencilCount();
+ desc.fSampleCnt = c.sampleCount();
const GrBackendFormat format =
context->priv().caps()->getBackendFormatFromColorType(c.colorType());
@@ -559,7 +558,7 @@
return false;
}
SkASSERT(oldTexture->asRenderTarget());
- int sampleCnt = oldTexture->asRenderTarget()->numStencilSamples();
+ int sampleCnt = oldTexture->asRenderTarget()->numSamples();
GrBackendTexture texCopy = backendTexture;
auto colorSpace = sk_ref_sp(oldRTC->colorSpaceInfo().colorSpace());
if (!validate_backend_texture(context, texCopy, &texCopy.fConfig, sampleCnt,
diff --git a/tests/AdvancedBlendTest.cpp b/tests/AdvancedBlendTest.cpp
index e278cca..8af145c 100644
--- a/tests/AdvancedBlendTest.cpp
+++ b/tests/AdvancedBlendTest.cpp
@@ -40,11 +40,11 @@
GrPaint paint;
paint.setXPFactory(xpf);
GrProcessorSet procs(std::move(paint));
+ bool hasMixedSampledCoverage = false;
SkPMColor4f overrideColor;
- GrProcessorSet::Analysis processorAnalysis =
- procs.finalize(
- opaque, coverage, nullptr, &GrUserStencilSettings::kUnused,
- GrFSAAType::kNone, caps, GrClampType::kAuto, &overrideColor);
+ GrProcessorSet::Analysis processorAnalysis = procs.finalize(
+ opaque, coverage, nullptr, &GrUserStencilSettings::kUnused, hasMixedSampledCoverage,
+ caps, GrClampType::kAuto, &overrideColor);
if (caps.advancedBlendEquationSupport() &&
!caps.isAdvancedBlendEquationBlacklisted(blendEquation)) {
diff --git a/tests/DrawOpAtlasTest.cpp b/tests/DrawOpAtlasTest.cpp
index f688dbd..32641c6 100644
--- a/tests/DrawOpAtlasTest.cpp
+++ b/tests/DrawOpAtlasTest.cpp
@@ -210,7 +210,8 @@
std::unique_ptr<GrDrawOp> op = textContext->createOp_TestingOnly(
context, textContext, rtc.get(), paint, font, SkMatrix::I(), text, 16, 16);
- op->finalize(*context->priv().caps(), nullptr, GrFSAAType::kNone, GrClampType::kAuto);
+ bool hasMixedSampledCoverage = false;
+ op->finalize(*context->priv().caps(), nullptr, hasMixedSampledCoverage, GrClampType::kAuto);
TestingUploadTarget uploadTarget;
diff --git a/tests/GrCCPRTest.cpp b/tests/GrCCPRTest.cpp
index f077725..e76826b 100644
--- a/tests/GrCCPRTest.cpp
+++ b/tests/GrCCPRTest.cpp
@@ -112,7 +112,7 @@
fCCPR->testingOnly_drawPathDirectly({
fCtx.get(), std::move(paint), &GrUserStencilSettings::kUnused, fRTC.get(), &noClip,
- &clipBounds, &matrix, &shape, GrPathRenderer::AATypeFlags::kCoverage, false});
+ &clipBounds, &matrix, &shape, GrAAType::kCoverage, false});
}
void clipFullscreenRect(SkPath clipPath, SkPMColor4f color = { 0, 1, 0, 1 }) {
diff --git a/tests/GrMeshTest.cpp b/tests/GrMeshTest.cpp
index 440dc34..f2d90f3 100644
--- a/tests/GrMeshTest.cpp
+++ b/tests/GrMeshTest.cpp
@@ -277,8 +277,8 @@
const char* name() const override { return "GrMeshTestOp"; }
FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; }
- GrProcessorSet::Analysis finalize(
- const GrCaps&, const GrAppliedClip*, GrFSAAType, GrClampType) override {
+ GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*,
+ bool hasMixedSampledCoverage, GrClampType) override {
return GrProcessorSet::EmptySetAnalysis();
}
void onPrepare(GrOpFlushState*) override {}
diff --git a/tests/GrPipelineDynamicStateTest.cpp b/tests/GrPipelineDynamicStateTest.cpp
index fb892b7..ad62139 100644
--- a/tests/GrPipelineDynamicStateTest.cpp
+++ b/tests/GrPipelineDynamicStateTest.cpp
@@ -134,8 +134,8 @@
const char* name() const override { return "GrPipelineDynamicStateTestOp"; }
FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; }
- GrProcessorSet::Analysis finalize(
- const GrCaps&, const GrAppliedClip*, GrFSAAType, GrClampType) override {
+ GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*,
+ bool hasMixedSampledCoverage, GrClampType) override {
return GrProcessorSet::EmptySetAnalysis();
}
void onPrepare(GrOpFlushState*) override {}
diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp
index 79b36e6..08f50b4 100644
--- a/tests/GrPorterDuffTest.cpp
+++ b/tests/GrPorterDuffTest.cpp
@@ -67,10 +67,11 @@
GrPaint paint;
paint.setXPFactory(xpf);
GrProcessorSet procs(std::move(paint));
+ bool hasMixedSampledCoverage = false;
SkPMColor4f overrideColor;
GrProcessorSet::Analysis analysis = procs.finalize(
- colorInput, coverageInput, nullptr, &GrUserStencilSettings::kUnused, GrFSAAType::kNone,
- caps, GrClampType::kAuto, &overrideColor);
+ colorInput, coverageInput, nullptr, &GrUserStencilSettings::kUnused,
+ hasMixedSampledCoverage, caps, GrClampType::kAuto, &overrideColor);
return analysis;
}
diff --git a/tests/LazyProxyTest.cpp b/tests/LazyProxyTest.cpp
index e42e79d..76f85d0 100644
--- a/tests/LazyProxyTest.cpp
+++ b/tests/LazyProxyTest.cpp
@@ -110,8 +110,8 @@
const char* name() const override { return "LazyProxyTest::Op"; }
FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; }
- GrProcessorSet::Analysis finalize(
- const GrCaps&, const GrAppliedClip* clip, GrFSAAType, GrClampType) override {
+ GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip* clip,
+ bool hasMixedSampledCoverage, GrClampType) override {
return GrProcessorSet::EmptySetAnalysis();
}
void onPrepare(GrOpFlushState*) override {}
@@ -353,8 +353,8 @@
const char* name() const override { return "LazyFailedInstantiationTestOp"; }
FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; }
- GrProcessorSet::Analysis finalize(
- const GrCaps&, const GrAppliedClip*, GrFSAAType, GrClampType) override {
+ GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*,
+ bool hasMixedSampledCoverage, GrClampType) override {
return GrProcessorSet::EmptySetAnalysis();
}
void onPrepare(GrOpFlushState*) override {}
@@ -422,8 +422,8 @@
const char* name() const override { return "LazyDeinstantiateTestOp"; }
FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; }
- GrProcessorSet::Analysis finalize(
- const GrCaps&, const GrAppliedClip*, GrFSAAType, GrClampType) override {
+ GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*,
+ bool hasMixedSampledCoverage, GrClampType) override {
return GrProcessorSet::EmptySetAnalysis();
}
void onPrepare(GrOpFlushState*) override {}
diff --git a/tests/OnFlushCallbackTest.cpp b/tests/OnFlushCallbackTest.cpp
index b078054..2240721 100644
--- a/tests/OnFlushCallbackTest.cpp
+++ b/tests/OnFlushCallbackTest.cpp
@@ -71,15 +71,16 @@
FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; }
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip*,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip*, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
// Set the color to unknown because the subclass may change the color later.
GrProcessorAnalysisColor gpColor;
gpColor.setToUnknown();
// We ignore the clip so pass this rather than the GrAppliedClip param.
static GrAppliedClip kNoClip;
- return fHelper.finalizeProcessors(
- caps, &kNoClip, fsaaType, clampType, GrProcessorAnalysisCoverage::kNone, &gpColor);
+ return fHelper.finalizeProcessors(caps, &kNoClip, hasMixedSampledCoverage, clampType,
+ GrProcessorAnalysisCoverage::kNone, &gpColor);
}
protected:
diff --git a/tests/PathRendererCacheTests.cpp b/tests/PathRendererCacheTests.cpp
index 29e0e50..f085020 100644
--- a/tests/PathRendererCacheTests.cpp
+++ b/tests/PathRendererCacheTests.cpp
@@ -28,13 +28,11 @@
return path;
}
-using AATypeFlags = GrPathRenderer::AATypeFlags;
-
static void draw_path(GrContext* ctx,
GrRenderTargetContext* renderTargetContext,
const SkPath& path,
GrPathRenderer* pr,
- AATypeFlags aaTypeFlags,
+ GrAAType aaType,
const GrStyle& style) {
GrPaint paint;
paint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc));
@@ -55,7 +53,7 @@
&clipConservativeBounds,
&matrix,
&shape,
- aaTypeFlags,
+ aaType,
false};
pr->drawPath(args);
}
@@ -74,7 +72,7 @@
std::function<SkPath(void)> createPath,
std::function<GrPathRenderer*(GrContext*)> createPathRenderer,
int expected,
- AATypeFlags aaTypeFlags = AATypeFlags::kNone,
+ GrAAType aaType = GrAAType::kNone,
GrStyle style = GrStyle(SkStrokeRec::kFill_InitStyle)) {
sk_sp<GrContext> ctx = GrContext::MakeMock(nullptr);
// The cache needs to be big enough that nothing gets flushed, or our expectations can be wrong
@@ -98,7 +96,7 @@
REPORTER_ASSERT(reporter, cache_non_scratch_resources_equals(cache, 0));
// Draw the path, check that new resource count matches expectations
- draw_path(ctx.get(), rtc.get(), path, pathRenderer.get(), aaTypeFlags, style);
+ draw_path(ctx.get(), rtc.get(), path, pathRenderer.get(), aaType, style);
ctx->flush();
REPORTER_ASSERT(reporter, cache_non_scratch_resources_equals(cache, expected));
@@ -132,7 +130,7 @@
paint.setStrokeWidth(1);
GrStyle style(paint);
test_path(
- reporter, create_concave_path, createPR, kExpectedResources, AATypeFlags::kNone, style);
+ reporter, create_concave_path, createPR, kExpectedResources, GrAAType::kNone, style);
}
// Test that deleting the original path invalidates the textures cached by the SW path renderer
@@ -145,7 +143,7 @@
// only contains a single quad so GrFillRectOp doesn't need to use the shared index buffer.
const int kExpectedResources = 1;
- test_path(reporter, create_concave_path, createPR, kExpectedResources, AATypeFlags::kCoverage);
+ test_path(reporter, create_concave_path, createPR, kExpectedResources, GrAAType::kCoverage);
// Test with a style that alters the path geometry. This needs to attach the invalidation logic
// to the original path, not the modified path produced by the style.
@@ -153,6 +151,6 @@
paint.setStyle(SkPaint::kStroke_Style);
paint.setStrokeWidth(1);
GrStyle style(paint);
- test_path(reporter, create_concave_path, createPR, kExpectedResources, AATypeFlags::kCoverage,
+ test_path(reporter, create_concave_path, createPR, kExpectedResources, GrAAType::kCoverage,
style);
}
diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp
index ef4d102..3625dbe 100644
--- a/tests/PrimitiveProcessorTest.cpp
+++ b/tests/PrimitiveProcessorTest.cpp
@@ -42,8 +42,8 @@
return FixedFunctionFlags::kNone;
}
- GrProcessorSet::Analysis finalize(
- const GrCaps&, const GrAppliedClip*, GrFSAAType, GrClampType) override {
+ GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*,
+ bool hasMixedSampledCoverage, GrClampType) override {
return GrProcessorSet::EmptySetAnalysis();
}
diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp
index 2909928..b5b5356 100644
--- a/tests/ProcessorTest.cpp
+++ b/tests/ProcessorTest.cpp
@@ -45,13 +45,15 @@
FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; }
- GrProcessorSet::Analysis finalize(const GrCaps& caps, const GrAppliedClip* clip,
- GrFSAAType fsaaType, GrClampType clampType) override {
+ GrProcessorSet::Analysis finalize(
+ const GrCaps& caps, const GrAppliedClip* clip, bool hasMixedSampledCoverage,
+ GrClampType clampType) override {
static constexpr GrProcessorAnalysisColor kUnknownColor;
SkPMColor4f overrideColor;
return fProcessors.finalize(
kUnknownColor, GrProcessorAnalysisCoverage::kNone, clip,
- &GrUserStencilSettings::kUnused, fsaaType, caps, clampType, &overrideColor);
+ &GrUserStencilSettings::kUnused, hasMixedSampledCoverage, caps, clampType,
+ &overrideColor);
}
private:
diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp
index 4c7dc4a..b6fe580 100644
--- a/tests/ProxyTest.cpp
+++ b/tests/ProxyTest.cpp
@@ -45,7 +45,7 @@
SkBackingFit fit,
int expectedMaxWindowRects) {
REPORTER_ASSERT(reporter, rtProxy->maxWindowRectangles(caps) == expectedMaxWindowRects);
- REPORTER_ASSERT(reporter, rtProxy->numStencilSamples() == numSamples);
+ REPORTER_ASSERT(reporter, rtProxy->numSamples() == numSamples);
GrSurfaceProxy::UniqueID idBefore = rtProxy->uniqueID();
bool preinstantiated = rtProxy->isInstantiated();
@@ -69,9 +69,7 @@
}
REPORTER_ASSERT(reporter, rt->config() == rtProxy->config());
- REPORTER_ASSERT(reporter, rt->fsaaType() == rtProxy->fsaaType());
- REPORTER_ASSERT(reporter, rt->numColorSamples() == rtProxy->numColorSamples());
- REPORTER_ASSERT(reporter, rt->numStencilSamples() == rtProxy->numStencilSamples());
+ REPORTER_ASSERT(reporter, rt->numSamples() == rtProxy->numSamples());
REPORTER_ASSERT(reporter, rt->surfacePriv().flags() == rtProxy->testingOnly_getFlags());
}
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index fa9fe79..e1a4056 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -140,7 +140,7 @@
// Ensure that the sample count stored on the resulting SkSurface is a valid value.
if (surf) {
auto* rtc = ((SkSurface_Gpu*)(surf.get()))->getDevice()->accessRenderTargetContext();
- int storedCnt = rtc->numStencilSamples();
+ int storedCnt = rtc->numSamples();
int allowedCnt = context->priv().caps()->getSampleCount(
storedCnt, rtc->asSurfaceProxy()->config());
REPORTER_ASSERT(reporter, storedCnt == allowedCnt,
@@ -156,7 +156,7 @@
colorType);
if (surf) {
auto* rtc = ((SkSurface_Gpu*)(surf.get()))->getDevice()->accessRenderTargetContext();
- int storedCnt = rtc->numStencilSamples();
+ int storedCnt = rtc->numSamples();
int allowedCnt = context->priv().caps()->getSampleCount(
storedCnt, rtc->asSurfaceProxy()->config());
REPORTER_ASSERT(reporter, storedCnt == allowedCnt,
@@ -218,7 +218,7 @@
int sampleCnt = ((SkSurface_Gpu*)(surf.get()))
->getDevice()
->accessRenderTargetContext()
- ->numStencilSamples();
+ ->numSamples();
REPORTER_ASSERT(reporter, sampleCnt == max, "Exected: %d, actual: %d", max, sampleCnt);
}
}
diff --git a/tests/TessellatingPathRendererTests.cpp b/tests/TessellatingPathRendererTests.cpp
index d40e9c0..440049e 100644
--- a/tests/TessellatingPathRendererTests.cpp
+++ b/tests/TessellatingPathRendererTests.cpp
@@ -698,13 +698,11 @@
return as_SB(shader)->asFragmentProcessor(args);
}
-using AATypeFlags = GrPathRenderer::AATypeFlags;
-
static void test_path(GrContext* ctx,
GrRenderTargetContext* renderTargetContext,
const SkPath& path,
const SkMatrix& matrix = SkMatrix::I(),
- AATypeFlags aaTypeFlags = AATypeFlags::kNone,
+ GrAAType aaType = GrAAType::kNone,
std::unique_ptr<GrFragmentProcessor> fp = nullptr) {
GrTessellatingPathRenderer tess;
tess.setMaxVerbCount(100);
@@ -728,7 +726,7 @@
&clipConservativeBounds,
&matrix,
&shape,
- aaTypeFlags,
+ aaType,
false};
tess.drawPath(args);
}
@@ -767,34 +765,34 @@
test_path(ctx, rtc.get(), create_path_16());
SkMatrix nonInvertibleMatrix = SkMatrix::MakeScale(0, 0);
std::unique_ptr<GrFragmentProcessor> fp(create_linear_gradient_processor(ctx));
- test_path(ctx, rtc.get(), create_path_17(), nonInvertibleMatrix, AATypeFlags::kCoverage,
+ test_path(ctx, rtc.get(), create_path_17(), nonInvertibleMatrix, GrAAType::kCoverage,
std::move(fp));
test_path(ctx, rtc.get(), create_path_18());
test_path(ctx, rtc.get(), create_path_19());
- test_path(ctx, rtc.get(), create_path_20(), SkMatrix(), AATypeFlags::kCoverage);
- test_path(ctx, rtc.get(), create_path_21(), SkMatrix(), AATypeFlags::kCoverage);
+ test_path(ctx, rtc.get(), create_path_20(), SkMatrix(), GrAAType::kCoverage);
+ test_path(ctx, rtc.get(), create_path_21(), SkMatrix(), GrAAType::kCoverage);
test_path(ctx, rtc.get(), create_path_23());
test_path(ctx, rtc.get(), create_path_24());
- test_path(ctx, rtc.get(), create_path_25(), SkMatrix(), AATypeFlags::kCoverage);
- test_path(ctx, rtc.get(), create_path_26(), SkMatrix(), AATypeFlags::kCoverage);
- test_path(ctx, rtc.get(), create_path_27(), SkMatrix(), AATypeFlags::kCoverage);
- test_path(ctx, rtc.get(), create_path_28(), SkMatrix(), AATypeFlags::kCoverage);
+ test_path(ctx, rtc.get(), create_path_25(), SkMatrix(), GrAAType::kCoverage);
+ test_path(ctx, rtc.get(), create_path_26(), SkMatrix(), GrAAType::kCoverage);
+ test_path(ctx, rtc.get(), create_path_27(), SkMatrix(), GrAAType::kCoverage);
+ test_path(ctx, rtc.get(), create_path_28(), SkMatrix(), GrAAType::kCoverage);
test_path(ctx, rtc.get(), create_path_29());
test_path(ctx, rtc.get(), create_path_30());
- test_path(ctx, rtc.get(), create_path_31(), SkMatrix(), AATypeFlags::kCoverage);
+ test_path(ctx, rtc.get(), create_path_31(), SkMatrix(), GrAAType::kCoverage);
test_path(ctx, rtc.get(), create_path_32());
test_path(ctx, rtc.get(), create_path_33());
test_path(ctx, rtc.get(), create_path_34());
test_path(ctx, rtc.get(), create_path_35());
test_path(ctx, rtc.get(), create_path_36());
test_path(ctx, rtc.get(), create_path_37());
- test_path(ctx, rtc.get(), create_path_38(), SkMatrix(), AATypeFlags::kCoverage);
+ test_path(ctx, rtc.get(), create_path_38(), SkMatrix(), GrAAType::kCoverage);
test_path(ctx, rtc.get(), create_path_39());
test_path(ctx, rtc.get(), create_path_40());
- test_path(ctx, rtc.get(), create_path_41(), SkMatrix(), AATypeFlags::kCoverage);
+ test_path(ctx, rtc.get(), create_path_41(), SkMatrix(), GrAAType::kCoverage);
test_path(ctx, rtc.get(), create_path_42());
- test_path(ctx, rtc.get(), create_path_43(), SkMatrix(), AATypeFlags::kCoverage);
- test_path(ctx, rtc.get(), create_path_44(), SkMatrix(), AATypeFlags::kCoverage);
- test_path(ctx, rtc.get(), create_path_45(), SkMatrix(), AATypeFlags::kCoverage);
- test_path(ctx, rtc.get(), create_path_46(), SkMatrix(), AATypeFlags::kCoverage);
+ test_path(ctx, rtc.get(), create_path_43(), SkMatrix(), GrAAType::kCoverage);
+ test_path(ctx, rtc.get(), create_path_44(), SkMatrix(), GrAAType::kCoverage);
+ test_path(ctx, rtc.get(), create_path_45(), SkMatrix(), GrAAType::kCoverage);
+ test_path(ctx, rtc.get(), create_path_46(), SkMatrix(), GrAAType::kCoverage);
}
diff --git a/tests/TraceMemoryDumpTest.cpp b/tests/TraceMemoryDumpTest.cpp
index d4f996f..5422bc4 100644
--- a/tests/TraceMemoryDumpTest.cpp
+++ b/tests/TraceMemoryDumpTest.cpp
@@ -151,7 +151,6 @@
iddesc.fRTFBOOwnership = GrBackendObjectOwnership::kOwned;
iddesc.fTexFBOID = GrGLRenderTarget::kUnresolvableFBOID;
iddesc.fMSColorRenderbufferID = 22;
- iddesc.fIsMixedSampled = false;
sk_sp<GrGLRenderTarget> rt = GrGLRenderTarget::MakeWrapped(gpu, sd, GR_GL_RGBA8, iddesc, 0);
@@ -173,7 +172,6 @@
iddesc.fRTFBOOwnership = GrBackendObjectOwnership::kBorrowed;
iddesc.fTexFBOID = GrGLRenderTarget::kUnresolvableFBOID;
iddesc.fMSColorRenderbufferID = 22;
- iddesc.fIsMixedSampled = false;
sk_sp<GrGLRenderTarget> rt = GrGLRenderTarget::MakeWrapped(gpu, sd, GR_GL_RGBA8, iddesc, 0);
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp
index 7d63332..465acf1 100644
--- a/tools/gpu/GrTest.cpp
+++ b/tools/gpu/GrTest.cpp
@@ -147,7 +147,7 @@
#define DRAW_OP_TEST_EXTERN(Op) \
extern std::unique_ptr<GrDrawOp> Op##__Test(GrPaint&&, SkRandom*, \
- GrRecordingContext*, GrFSAAType)
+ GrRecordingContext*, int numSamples)
#define DRAW_OP_TEST_ENTRY(Op) Op##__Test
DRAW_OP_TEST_EXTERN(AAConvexPathOp);
@@ -175,7 +175,7 @@
void GrDrawRandomOp(SkRandom* random, GrRenderTargetContext* renderTargetContext, GrPaint&& paint) {
auto context = renderTargetContext->surfPriv().getContext();
using MakeDrawOpFn = std::unique_ptr<GrDrawOp>(GrPaint&&, SkRandom*,
- GrRecordingContext*, GrFSAAType);
+ GrRecordingContext*, int numSamples);
static constexpr MakeDrawOpFn* gFactories[] = {
DRAW_OP_TEST_ENTRY(AAConvexPathOp),
DRAW_OP_TEST_ENTRY(AAFlatteningConvexPathOp),
@@ -203,7 +203,7 @@
static constexpr size_t kTotal = SK_ARRAY_COUNT(gFactories);
uint32_t index = random->nextULessThan(static_cast<uint32_t>(kTotal));
auto op = gFactories[index](
- std::move(paint), random, context, renderTargetContext->fsaaType());
+ std::move(paint), random, context, renderTargetContext->numSamples());
SkASSERT(op);
renderTargetContext->priv().testingOnly_addDrawOp(std::move(op));
}