diff options
| author |  robertphillips <robertphillips@google.com> | 2016-07-13 09:18:21 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-13 09:18:21 -0700 |
| commit | 59cf61ab0384286ebc57ecfb67e2f15ab4846250 (patch) | |
| tree | 8c3b6a6a373cfe7ff25262f8a454269f6806aea9 /include/gpu | |
| parent | 0e1161d03f40fc1638481222b06fb74f6a9c734a (diff) | |
Retract PipelineBuilder from GrClip::apply
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2147443004
Review-Url: https://codereview.chromium.org/2147443004
Diffstat (limited to 'include/gpu')
| -rw-r--r-- | include/gpu/GrClip.h | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/include/gpu/GrClip.h b/include/gpu/GrClip.h index e58528114e..b177d6fda3 100644 --- a/include/gpu/GrClip.h +++ b/include/gpu/GrClip.h @@ -13,7 +13,6 @@ #include "SkClipStack.h" class GrDrawContext; -class GrPipelineBuilder; /** * Produced by GrClip. It provides a set of modifications to the drawing state that are used to @@ -105,8 +104,12 @@ public: virtual bool quickContains(const SkRect&) const = 0; virtual void getConservativeBounds(int width, int height, SkIRect* devResult, bool* isIntersectionOfRects = nullptr) const = 0; - virtual bool apply(GrContext*, const GrPipelineBuilder&, GrDrawContext*, - const SkRect* devBounds, GrAppliedClip*) const = 0; + virtual bool apply(GrContext*, + GrDrawContext*, + const SkRect* devBounds, + bool useHWAA, + bool hasUserStencilSettings, + GrAppliedClip* out) const = 0; virtual ~GrClip() {} }; @@ -119,8 +122,12 @@ private: bool quickContains(const SkRect&) const final { return true; } void getConservativeBounds(int width, int height, SkIRect* devResult, bool* isIntersectionOfRects) const final; - bool apply(GrContext*, const GrPipelineBuilder&, GrDrawContext*, - const SkRect*, GrAppliedClip*) const final { return true; } + bool apply(GrContext*, + GrDrawContext*, + const SkRect* /* devBounds */, + bool /* useHWAA */, + bool /* hasUserStencilSettings */, + GrAppliedClip* /* out */) const final { return true; } }; /** @@ -180,8 +187,12 @@ public: bool* isIntersectionOfRects) const final; private: - bool apply(GrContext*, const GrPipelineBuilder&, GrDrawContext*, - const SkRect* devBounds, GrAppliedClip* out) const final; + bool apply(GrContext*, + GrDrawContext*, + const SkRect* devBounds, + bool useHWAA, + bool hasUserStencilSettings, + GrAppliedClip* out) const final; GrScissorState fScissorState; SkRect fDeviceBounds; @@ -209,8 +220,12 @@ public: bool quickContains(const SkRect&) const final; void getConservativeBounds(int width, int height, SkIRect* devResult, bool* isIntersectionOfRects) const final; - bool apply(GrContext*, const GrPipelineBuilder&, GrDrawContext*, - const SkRect* devBounds, GrAppliedClip*) const final; + bool apply(GrContext*, + GrDrawContext*, + const SkRect* devBounds, + bool useHWAA, + bool hasUserStencilSettings, + GrAppliedClip* out) const final; private: SkIPoint fOrigin; |