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/GrSimpleMeshDrawOpHelper.cpp

diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp b/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
index a6fb1b2..538f305 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
@@ -166,6 +166,7 @@
             const GrCaps* caps,
             SkArenaAlloc* arena,
             const GrSurfaceProxyView& writeView,
+            bool usesMSAASurface,
             GrAppliedClip&& appliedClip,
             const GrDstProxyView& dstProxyView,
             GrGeometryProcessor* geometryProcessor,
@@ -183,19 +184,23 @@
                                    std::move(processorSet),
                                    pipelineFlags);
 
-    return CreateProgramInfo(arena, pipeline, writeView, geometryProcessor, primitiveType,
-                             renderPassXferBarriers, colorLoadOp, stencilSettings);
+    return CreateProgramInfo(caps, arena, pipeline, writeView, usesMSAASurface, geometryProcessor,
+                             primitiveType, renderPassXferBarriers, colorLoadOp, stencilSettings);
 }
 
-GrProgramInfo* GrSimpleMeshDrawOpHelper::CreateProgramInfo(SkArenaAlloc* arena,
+GrProgramInfo* GrSimpleMeshDrawOpHelper::CreateProgramInfo(const GrCaps* caps,
+                                                           SkArenaAlloc* arena,
                                                            const GrPipeline* pipeline,
                                                            const GrSurfaceProxyView& writeView,
+                                                           bool usesMSAASurface,
                                                            GrGeometryProcessor* geometryProcessor,
                                                            GrPrimitiveType primitiveType,
                                                            GrXferBarrierFlags xferBarrierFlags,
                                                            GrLoadOp colorLoadOp,
                                                            const GrUserStencilSettings* stencilSettings) {
-    auto tmp = arena->make<GrProgramInfo>(writeView,
+    auto tmp = arena->make<GrProgramInfo>(*caps,
+                                          writeView,
+                                          usesMSAASurface,
                                           pipeline,
                                           stencilSettings,
                                           geometryProcessor,
@@ -210,6 +215,7 @@
                                             const GrCaps* caps,
                                             SkArenaAlloc* arena,
                                             const GrSurfaceProxyView& writeView,
+                                            bool usesMSAASurface,
                                             GrAppliedClip&& appliedClip,
                                             const GrDstProxyView& dstProxyView,
                                             GrGeometryProcessor* gp,
@@ -219,6 +225,7 @@
     return CreateProgramInfo(caps,
                              arena,
                              writeView,
+                             usesMSAASurface,
                              std::move(appliedClip),
                              dstProxyView,
                              gp,