Clip mask manager moved to ClipTarget

src/gpu/GrClipMaskManager.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrClipMaskManager_DEFINED
 #define GrClipMaskManager_DEFINED
 
 #include "GrClipMaskCache.h"
 #include "GrContext.h"
 #include "GrDrawState.h"
 #include "GrReducedClip.h"
 #include "GrStencil.h"
 #include "GrTexture.h"
 
 #include "SkClipStack.h"
 #include "SkDeque.h"
 #include "SkPath.h"
 #include "SkRefCnt.h"
 #include "SkTLList.h"
 #include "SkTypes.h"
 
-class GrGpu;
+class GrClipTarget;
 class GrPathRenderer;
 class GrPathRendererChain;
 class GrTexture;
 class SkPath;
 
 /**
  * The clip mask creator handles the generation of the clip mask. If anti
  * aliasing is requested it will (in the future) generate a single channel
  * (8bit) mask. If no anti aliasing is requested it will generate a 1-bit
  * mask in the stencil buffer. In the non anti-aliasing case, if the clip
  * mask can be represented as a rectangle then scissoring is used. In all
  * cases scissoring is used to bound the range of the clip mask.
  */
 class GrClipMaskManager : SkNoncopyable {
 public:
     GrClipMaskManager()
-        : fGpu(NULL)
-        , fCurrClipMaskType(kNone_ClipMaskType) {
+        : fCurrClipMaskType(kNone_ClipMaskType)
+        , fClipTarget(NULL) {
     }
 
     // The state of the scissor is controlled by the clip manager, no one else should set
     // Scissor state
     struct ScissorState {
         ScissorState() : fEnabled(false) {}
         void set(const SkIRect& rect) { fRect = rect; fEnabled = true; }
         bool    fEnabled;
         SkIRect fRect;
     };
 
     /**
      * Creates a clip mask if necessary as a stencil buffer or alpha texture
      * and sets the GrGpu's scissor and stencil state. If the return is false
      * then the draw can be skipped. The AutoRestoreEffects is initialized by
      * the manager when it must install additional effects to implement the
      * clip. devBounds is optional but can help optimize clipping.
      */
     bool setupClipping(const GrClipData* clipDataIn,
                        const SkRect* devBounds,
                        GrDrawState::AutoRestoreEffects*,
                        GrDrawState::AutoRestoreStencil*,
-                       ScissorState* scissorState);
+                       ScissorState*);
 
     /**
      * Purge resources to free up memory. TODO: This class shouldn't hold any long lived refs
      * which will allow ResourceCache2 to automatically purge anything this class has created.
      */
     void purgeResources();
 
     bool isClipInStencil() const {
         return kStencil_ClipMaskType == fCurrClipMaskType;
     }
     bool isClipInAlpha() const {
         return kAlpha_ClipMaskType == fCurrClipMaskType;
     }
 
     void invalidateStencilMask() {
         if (kStencil_ClipMaskType == fCurrClipMaskType) {
             fCurrClipMaskType = kNone_ClipMaskType;
         }
     }
 
     GrContext* getContext() {
         return fAACache.getContext();
     }
 
-    void setGpu(GrGpu* gpu);
+    void setClipTarget(GrClipTarget*);
 
-    void adjustPathStencilParams(GrStencilSettings* settings);
+    void adjustPathStencilParams(GrStencilSettings*);
+
 private:
+    enum PrivateDrawStateStateBits {

[bsalomon, 2014/10/28 17:53:28]

Maybe this sbould be in ClipTarget? Or does clip target give us a better way of
specifying this?

[joshualitt, 2014/10/28 19:50:30]

I'm not sure what you mean, I thought these are only used in GrClipMaskManager?

[bsalomon, 2014/10/28 19:54:09]

Right. Since this bit provides access to setting the clip bit via ClipTarget
which is not accessible via DrawTarget. It seems a little more appropriate to me
for the class that recognizes and implements the bit to define it rather than
the client who sets it. But I was also wondering if having a ClipTarget allows
for a better way of specifying this other than a private bit that gets jammed
into draw state. Maybe not, but that mechanism is pretty dirty.

+        kFirstBit = (GrDrawState::kLastPublicStateBit << 1),
+
+        kModifyStencilClip_StateBit = kFirstBit, // allows draws to modify
+                                                 // stencil bits used for
+                                                 // clipping.
+    };
+
     /**
      * Informs the helper function adjustStencilParams() about how the stencil
      * buffer clip is being used.
      */
     enum StencilClipMode {
         // Draw to the clip bit of the stencil buffer
         kModifyClip_StencilClipMode,
         // Clip against the existing representation of the clip in the high bit
         // of the stencil buffer.
         kRespectClip_StencilClipMode,
         // Neither writing to nor clipping against the clip bit.
         kIgnoreClip_StencilClipMode,
     };
 
-    GrGpu* fGpu;
-
-    /**
-     * We may represent the clip as a mask in the stencil buffer or as an alpha
-     * texture. It may be neither because the scissor rect suffices or we
-     * haven't yet examined the clip.
-     */
-    enum ClipMaskType {
-        kNone_ClipMaskType,
-        kStencil_ClipMaskType,
-        kAlpha_ClipMaskType,
-    } fCurrClipMaskType;
-
-    GrClipMaskCache fAACache;       // cache for the AA path
-
     // Attempts to install a series of coverage effects to implement the clip. Return indicates
     // whether the element list was successfully converted to effects.
     bool installClipEffects(const GrReducedClip::ElementList&,
                             GrDrawState::AutoRestoreEffects*,
                             const SkVector& clipOffset,
                             const SkRect* devBounds);
 
     // Draws the clip into the stencil buffer
     bool createStencilClipMask(int32_t elementsGenID,
                                GrReducedClip::InitialState initialState,
@@ skipping 54 matching lines @@
     void setDrawStateStencil(GrDrawState::AutoRestoreStencil* asr);
 
     /**
      * Adjusts the stencil settings to account for interaction with stencil
      * clipping.
      */
     void adjustStencilParams(GrStencilSettings* settings,
                              StencilClipMode mode,
                              int stencilBitCnt);
 
+    /**
+     * We may represent the clip as a mask in the stencil buffer or as an alpha
+     * texture. It may be neither because the scissor rect suffices or we
+     * haven't yet examined the clip.
+     */
+    enum ClipMaskType {
+        kNone_ClipMaskType,
+        kStencil_ClipMaskType,
+        kAlpha_ClipMaskType,
+    } fCurrClipMaskType;
+
+    GrClipMaskCache fAACache;       // cache for the AA path
+    GrClipTarget* fClipTarget;
+
     typedef SkNoncopyable INHERITED;
 };
 
 #endif // GrClipMaskManager_DEFINED