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

diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp
index ea0f419..5bff43b 100644
--- a/src/gpu/ops/GrOvalOpFactory.cpp
+++ b/src/gpu/ops/GrOvalOpFactory.cpp
@@ -1258,6 +1258,7 @@
         fProgramInfo = fHelper.createProgramInfo(caps,
                                                  arena,
                                                  writeView,
+                                                 usesMSAASurface,
                                                  std::move(appliedClip),
                                                  dstProxyView,
                                                  gp,
@@ -1629,6 +1630,7 @@
         fProgramInfo = fHelper.createProgramInfo(caps,
                                                  arena,
                                                  writeView,
+                                                 usesMSAASurface,
                                                  std::move(appliedClip),
                                                  dstProxyView,
                                                  gp,
@@ -1964,6 +1966,7 @@
         fProgramInfo = fHelper.createProgramInfo(caps,
                                                  arena,
                                                  writeView,
+                                                 usesMSAASurface,
                                                  std::move(appliedClip),
                                                  dstProxyView,
                                                  gp,
@@ -2245,8 +2248,9 @@
                                                                    this->viewMatrix(),
                                                                    this->style());
 
-        fProgramInfo = fHelper.createProgramInfo(caps, arena, writeView, std::move(appliedClip),
-                                                 dstProxyView, gp, GrPrimitiveType::kTriangles,
+        fProgramInfo = fHelper.createProgramInfo(caps, arena, writeView, usesMSAASurface,
+                                                 std::move(appliedClip), dstProxyView, gp,
+                                                 GrPrimitiveType::kTriangles,
                                                  renderPassXferBarriers, colorLoadOp);
     }
 
@@ -2659,8 +2663,9 @@
                                                                 false, false, false, false,
                                                                 fWideColor, localMatrix);
 
-        fProgramInfo = fHelper.createProgramInfo(caps, arena, writeView, std::move(appliedClip),
-                                                 dstProxyView, gp, GrPrimitiveType::kTriangles,
+        fProgramInfo = fHelper.createProgramInfo(caps, arena, writeView, usesMSAASurface,
+                                                 std::move(appliedClip), dstProxyView, gp,
+                                                 GrPrimitiveType::kTriangles,
                                                  renderPassXferBarriers, colorLoadOp);
     }
 
@@ -2979,8 +2984,9 @@
         GrGeometryProcessor* gp = EllipseGeometryProcessor::Make(arena, fStroked, fWideColor,
                                                                  fUseScale, localMatrix);
 
-        fProgramInfo = fHelper.createProgramInfo(caps, arena, writeView, std::move(appliedClip),
-                                                 dstProxyView, gp, GrPrimitiveType::kTriangles,
+        fProgramInfo = fHelper.createProgramInfo(caps, arena, writeView, usesMSAASurface,
+                                                 std::move(appliedClip), dstProxyView, gp,
+                                                 GrPrimitiveType::kTriangles,
                                                  renderPassXferBarriers, colorLoadOp);
     }