commit 710e1c922614089ed8666740697fc0d986d3a841
author Chris Dalton <csmartdalton@google.com> Fri Apr 23 13:07:52 2021 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Apr 23 21:50:03 2021 +0000
tree e75b3ee65621e08c8886eff58a6fa101bb9e4565
parent b0ada77326e4c901d6ce70e1269e49e6ad0abc5b

Implement dynamic MSAA on OpenGL

This is an initial attempt. We use a few coverage ops that haven't
been updated to handle MSAA yet, and other times we trigger MSAA when
we shouldn't, but it sets the basic functionality in place.

Bug: skia:11396
Change-Id: I8acfe4283bccf5543d4b774692e39427142b3228
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/395996
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/GrOpsTask.cpp

diff --git a/src/gpu/GrOpsTask.cpp b/src/gpu/GrOpsTask.cpp
index 7faa401..b6161e4 100644
--- a/src/gpu/GrOpsTask.cpp
+++ b/src/gpu/GrOpsTask.cpp
@@ -391,8 +391,9 @@
 }
 
 void GrOpsTask::addDrawOp(GrDrawingManager* drawingMgr, GrOp::Owner op,
-                          const GrProcessorSet::Analysis& processorAnalysis,
-                          GrAppliedClip&& clip, const DstProxyView& dstProxyView,
+                          GrDrawOp::FixedFunctionFlags fixedFunctionFlags,
+                          const GrProcessorSet::Analysis& processorAnalysis, GrAppliedClip&& clip,
+                          const DstProxyView& dstProxyView,
                           GrTextureResolveManager textureResolveManager, const GrCaps& caps) {
     auto addDependency = [&](GrSurfaceProxy* p, GrMipmapped mipmapped) {
         this->addSampledTexture(p);
@@ -420,6 +421,16 @@
         fRenderPassXferBarriers |= GrXferBarrierFlags::kBlend;
     }
 
+#ifdef SK_DEBUG
+    // Ensure we can support dynamic msaa if the caller is trying to trigger it.
+    GrRenderTargetProxy* rtProxy = this->target(0)->asRenderTargetProxy();
+    if (rtProxy->numSamples() == 1 &&
+        (fixedFunctionFlags & GrDrawOp::FixedFunctionFlags::kUsesHWAA)) {
+        SkASSERT(caps.supportsDynamicMSAA(rtProxy));
+    }
+#endif
+    fUsesMSAASurface |= (fixedFunctionFlags & GrDrawOp::FixedFunctionFlags::kUsesHWAA);
+
     this->recordOp(std::move(op), processorAnalysis, clip.doesClip() ? &clip : nullptr,
                    &dstProxyView, caps);
 }
@@ -715,6 +726,7 @@
         fClippedContentBounds.join(opsTask->fClippedContentBounds);
         fTotalBounds.join(opsTask->fTotalBounds);
         fRenderPassXferBarriers |= opsTask->fRenderPassXferBarriers;
+        fUsesMSAASurface |= opsTask->fUsesMSAASurface;
         SkDEBUGCODE(fNumClips += opsTask->fNumClips);
     }