commit 2a26c50a628fbc6363bff432489c3facab4341ec
author Chris Dalton <csmartdalton@google.com> Thu Aug 26 10:05:11 2021 -0600
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Thu Aug 26 17:24:47 2021 +0000
tree 8501cb9e0dbc0292b9613994668a79bfaaee1a65
parent 82d081465e17f4ba92f724eab7759af24b72ae32

Store the correct number of samples in GrProgramInfo

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

src/gpu/ops/GrDrawAtlasPathOp.cpp

diff --git a/src/gpu/ops/GrDrawAtlasPathOp.cpp b/src/gpu/ops/GrDrawAtlasPathOp.cpp
index 0bd069d..7c63571 100644
--- a/src/gpu/ops/GrDrawAtlasPathOp.cpp
+++ b/src/gpu/ops/GrDrawAtlasPathOp.cpp
@@ -158,8 +158,9 @@
                                             std::move(appliedClip));
     auto shader = arena->make<DrawAtlasPathShader>(fUsesLocalCoords, &fAtlasHelper,
                                                    *caps.shaderCaps());
-    fProgram = arena->make<GrProgramInfo>(writeView, pipeline, &GrUserStencilSettings::kUnused,
-                                          shader, GrPrimitiveType::kTriangleStrip, 0,
+    fProgram = arena->make<GrProgramInfo>(caps, writeView, usesMSAASurface, pipeline,
+                                          &GrUserStencilSettings::kUnused, shader,
+                                          GrPrimitiveType::kTriangleStrip, 0,
                                           renderPassXferBarriers, colorLoadOp);
 }
 
@@ -168,10 +169,11 @@
                                      GrAppliedClip* appliedClip, const GrDstProxyView& dstProxyView,
                                      GrXferBarrierFlags renderPassXferBarriers,
                                      GrLoadOp colorLoadOp) {
+    // DMSAA is not supported on DDL.
+    bool usesMSAASurface = writeView.asRenderTargetProxy()->numSamples() > 1;
     this->prepareProgram(*rContext->priv().caps(), rContext->priv().recordTimeAllocator(),
-                         writeView, writeView.asRenderTargetProxy()->numSamples() > 1,
-                         std::move(*appliedClip), dstProxyView, renderPassXferBarriers,
-                         colorLoadOp);
+                         writeView, usesMSAASurface, std::move(*appliedClip), dstProxyView,
+                         renderPassXferBarriers, colorLoadOp);
     SkASSERT(fProgram);
     rContext->priv().recordProgramInfo(fProgram);
 }