commit d7291ba7a12a73d51ce91eb2f19d9516de603ee6
author Chris Dalton <csmartdalton@google.com> Thu Mar 07 14:17:03 2019 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Mar 07 22:00:48 2019 +0000
tree 7fa11ff350dc4792222f9ef2c8fc6872af63d65e
parent 33d346244e6680f81d488afb2015ccfac96f6b71

Restore support for multisample locations


Bug: skia:
Change-Id: I971455867e54d431cc1094fca041f773f78748ee
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/196218
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/gpu/GrPipeline.cpp

diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp
index b16f164..07dc753 100644
--- a/src/gpu/GrPipeline.cpp
+++ b/src/gpu/GrPipeline.cpp
@@ -95,16 +95,20 @@
     return this->getXferProcessor().xferBarrierType(caps);
 }
 
-GrPipeline::GrPipeline(GrScissorTest scissorTest, SkBlendMode blendmode)
+GrPipeline::GrPipeline(GrScissorTest scissorTest, SkBlendMode blendmode, uint32_t flags,
+                       const GrUserStencilSettings* userStencil)
         : fWindowRectsState()
-        , fUserStencilSettings(&GrUserStencilSettings::kUnused)
-        , fFlags()
+        , fUserStencilSettings(userStencil)
+        , fFlags(flags)
         , fXferProcessor(GrPorterDuffXPFactory::MakeNoCoverageXP(blendmode))
         , fFragmentProcessors()
         , fNumColorProcessors(0) {
     if (GrScissorTest::kEnabled == scissorTest) {
         fFlags |= kScissorEnabled_Flag;
     }
+    if (!userStencil->isDisabled(false)) {
+        fFlags |= kStencilEnabled_Flag;
+    }
 }
 
 uint32_t GrPipeline::getBlendInfoKey() const {