diff options
author | csmartdalton <csmartdalton@google.com> | 2016-09-06 10:01:06 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-09-06 10:01:07 -0700 |
commit | bf4a8f90c87dddf6290aa774536715e55e6a12f5 (patch) | |
tree | 2a849caf546c5cee53d4ae440b7e981306b5160d /src/gpu/GrReducedClip.h | |
parent | 3c3e0d7bad86b805b08a81ab09d6f7ed25f47899 (diff) |
Improve usage of window rectangles
* Skips non-AA diff rect elements and replaces them with window
rectangles.
* Places window rectangles in the interiors of antialiased diff rects.
* Arranges two overlapping window rectangles in a plus shape inside of
diff rounded rects.
* Enables window rectangles when clearing and generating clip masks.
GTX 960 perf result (with vs. without window rectangles):
glinst4 msaa16 gpu
keymobi_pinterest.skp 0.48 -> 0.17 [ 35%] 2.77 -> 1.49 [ 54%] 0.22 -> 0.16 [ 70%]
keymobi_digg_com.skp 0.42 -> 0.23 [ 55%] 2.34 -> 1.08 [ 46%] 0.25 -> 0.21 [ 83%]
desk_jsfiddlebigcar.skp 0.28 -> 0.16 [ 59%] 1.70 -> 0.96 [ 57%] 0.19 -> 0.14 [ 70%]
top25desk_wordpress.skp 0.45 -> 0.18 [ 40%] 2.78 -> 1.53 [ 55%] 0.21 -> 0.19 [ 94%]
top25desk_weather_com.skp 2.01 -> 1.93 [ 96%] 23.5 -> 2.54 [ 11%] 1.90 -> 1.68 [ 88%]
keymobi_blogger.skp 0.57 -> 0.37 [ 65%] 2.87 -> 1.54 [ 54%] 0.43 -> 0.33 [ 77%]
keymobi_linkedin.skp 0.32 -> 0.17 [ 51%] 1.93 -> 1.04 [ 54%] 0.17 -> 0.15 [ 91%]
keymobi_bing_com_search_... 0.29 -> 0.25 [ 83%] 1.85 -> 1.23 [ 66%] 0.50 -> 0.24 [ 48%]
keymobi_theverge_com_201... 1.00 -> 0.67 [ 68%] 9.46 -> 3.84 [ 41%] 0.72 -> 0.65 [ 90%]
keymobi_sfgate_com_.skp 1.56 -> 1.13 [ 72%] 4.49 -> 2.86 [ 64%] 1.54 -> 1.11 [ 72%]
...
GEOMEAN (All 79 blink skps) 1.04 -> 0.90 [ 86%] 4.22 -> 2.81 [ 67%] 0.95 -> 0.89 [ 94%]
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2289363005
Committed: https://skia.googlesource.com/skia/+/db42be9a326c747ff92ed1da8c3536c5b3e8e22b
Review-Url: https://codereview.chromium.org/2289363005
Diffstat (limited to 'src/gpu/GrReducedClip.h')
-rw-r--r-- | src/gpu/GrReducedClip.h | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/src/gpu/GrReducedClip.h b/src/gpu/GrReducedClip.h index 731d58f61c..b8413e6df4 100644 --- a/src/gpu/GrReducedClip.h +++ b/src/gpu/GrReducedClip.h @@ -8,6 +8,7 @@ #ifndef GrReducedClip_DEFINED #define GrReducedClip_DEFINED +#include "GrWindowRectangles.h" #include "SkClipStack.h" #include "SkTLList.h" @@ -20,11 +21,11 @@ class GrDrawContext; */ class SK_API GrReducedClip { public: - GrReducedClip(const SkClipStack& stack, const SkRect& queryBounds); + GrReducedClip(const SkClipStack&, const SkRect& queryBounds, int maxWindowRectangles = 0); /** - * If hasIBounds() is true, this is the bounding box within which the reduced clip is valid, and - * the caller must not modify any pixels outside this box. Undefined if hasIBounds() is false. + * If hasIBounds() is true, this is the bounding box within which the clip elements are valid. + * The caller must not modify any pixels outside this box. Undefined if hasIBounds() is false. */ const SkIRect& ibounds() const { SkASSERT(fHasIBounds); return fIBounds; } int left() const { return this->ibounds().left(); } @@ -38,10 +39,16 @@ public: */ bool hasIBounds() const { return fHasIBounds; } + /** + * If nonempty, this is a set of "exclusive" windows within which the clip elements are NOT + * valid. The caller must not modify any pixels inside these windows. + */ + const GrWindowRectangles& windowRectangles() const { return fWindowRects; } + typedef SkTLList<SkClipStack::Element, 16> ElementList; /** - * Populated with a minimal list of elements that implement the clip. + * Populated with a minimal list of elements required to fully implement the clip. */ const ElementList& elements() const { return fElements; } @@ -67,15 +74,18 @@ public: bool drawStencilClipMask(GrContext*, GrDrawContext*, const SkIPoint& clipOrigin) const; private: - void walkStack(const SkClipStack&, const SkRect& queryBounds); + void walkStack(const SkClipStack&, const SkRect& queryBounds, int maxWindowRectangles); + void addInteriorWindowRectangles(int maxWindowRectangles); + void addWindowRectangle(const SkRect& elementInteriorRect, bool elementIsAA); bool intersectIBounds(const SkIRect&); - SkIRect fIBounds; - bool fHasIBounds; - ElementList fElements; - int32_t fElementsGenID; - bool fRequiresAA; - InitialState fInitialState; + SkIRect fIBounds; + bool fHasIBounds; + GrWindowRectangles fWindowRects; + ElementList fElements; + int32_t fElementsGenID; + bool fRequiresAA; + InitialState fInitialState; }; #endif |