Remove stencil related flags from GrInstancedPipelineInfo.

Change-Id: Ieeb8ada92b5196473d5cea77350fd994bfff8916
Reviewed-on: https://skia-review.googlesource.com/9086
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

1 files changed, 2 insertions, 21 deletions

diff --git a/include/private/GrInstancedPipelineInfo.h b/include/private/GrInstancedPipelineInfo.h
index 6f9c779d74..196c35b96f 100644
--- a/include/private/GrInstancedPipelineInfo.h
+++ b/include/private/GrInstancedPipelineInfo.h
@@ -18,32 +18,13 @@ struct GrInstancedPipelineInfo {
     GrInstancedPipelineInfo(const GrRenderTargetProxy* rtp)
         : fIsMultisampled(rtp->isStencilBufferMultisampled())
         , fIsMixedSampled(rtp->isMixedSampled())
-        , fIsRenderingToFloat(GrPixelConfigIsFloatingPoint(rtp->desc().fConfig))
-        , fColorDisabled(false)
-        , fDrawingShapeToStencil(false)
-        , fCanDiscard(false) {
-    }
+        , fIsRenderingToFloat(GrPixelConfigIsFloatingPoint(rtp->desc().fConfig)) {}
 
-    bool canUseCoverageAA() const {
-        return !fIsMultisampled || (fIsMixedSampled && !fDrawingShapeToStencil);
-    }
+    bool canUseCoverageAA() const { return !fIsMultisampled || fIsMixedSampled; }
 
     bool fIsMultisampled         : 1;
     bool fIsMixedSampled         : 1;
     bool fIsRenderingToFloat     : 1;
-    bool fColorDisabled          : 1;
-    /**
-     * Indicates that the instanced renderer should take extra precautions to ensure the shape gets
-     * drawn correctly to the stencil buffer (e.g. no coverage AA). NOTE: this does not mean a
-     * stencil test is or is not active.
-     */
-    bool fDrawingShapeToStencil  : 1;
-    /**
-     * Indicates that the instanced renderer can use processors with discard instructions. This
-     * should not be set if the shader will use derivatives, automatic mipmap LOD, or other features
-     * that depend on neighboring pixels. Some draws will fail to create if this is not set.
-     */
-    bool fCanDiscard             : 1;
 };
 
 #endif