diff options
author | caryclark <caryclark@google.com> | 2016-09-06 07:09:53 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-09-06 07:09:54 -0700 |
commit | c3bfcb803abb1f45658e9eae9f75b428a4476e75 (patch) | |
tree | 0de062257da2561a36d294c19e8d1f0a30c2e3a2 /src/gpu/GrReducedClip.h | |
parent | e6088c6063b60f58411936af9c48841131a5e001 (diff) |
Revert of Improve usage of window rectangles (patchset #9 id:160001 of https://codereview.chromium.org/2289363005/ )
Reason for revert:
broke build. See
https://build.chromium.org/p/client.skia/builders/Perf-Win8-MSVC-ShuttleA-GPU-GTX960-x86_64-Debug/builds/186
Original issue's description:
> 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%]
> keymobi_ftw_usatoday_com... 0.59 -> 0.34 [ 57%] 2.80 -> 1.54 [ 55%] 1.21 -> 1.20 [ 99%]
> keymobi_shop_mobileweb_e... 0.46 -> 0.32 [ 70%] 2.60 -> 1.26 [ 48%] 0.35 -> 0.34 [ 97%]
> keymobi_cnn_com.skp 0.68 -> 0.42 [ 63%] 3.40 -> 2.10 [ 62%] 0.49 -> 0.45 [ 93%]
> keymobi_plus_google_com_... 0.77 -> 0.46 [ 60%] 4.83 -> 3.56 [ 74%] 0.52 -> 0.46 [ 89%]
> keymobi_wordpress.skp 0.50 -> 0.40 [ 81%] 2.60 -> 1.31 [ 50%] 0.40 -> 0.37 [ 91%]
> keymobi_androidpolice_co... 0.84 -> 0.73 [ 87%] 4.15 -> 2.05 [ 49%] 0.77 -> 0.67 [ 87%]
> keymobi_online_wsj_com_h... 0.55 -> 0.43 [ 78%] 2.91 -> 1.66 [ 57%] 0.45 -> 0.41 [ 90%]
> keymobi_iphone_capitolvo... 1.18 -> 0.96 [ 81%] 6.26 -> 4.96 [ 79%] 0.95 -> 0.92 [ 97%]
> keymobi_wikipedia__1_tab... 0.46 -> 0.41 [ 89%] 2.51 -> 1.24 [ 49%] 0.40 -> 0.38 [ 95%]
> keymobi_wikipedia__1_tab... 0.46 -> 0.42 [ 90%] 2.52 -> 1.25 [ 50%] 0.40 -> 0.38 [ 96%]
> keymobi_boingboing_net.skp 0.62 -> 0.56 [ 90%] 3.15 -> 1.80 [ 57%] 0.61 -> 0.56 [ 92%]
> keymobi_cnn_com_2012_10_... 0.86 -> 0.82 [ 95%] 2.81 -> 1.50 [ 53%] 0.91 -> 0.83 [ 91%]
> top25desk_techcrunch_com... 0.61 -> 0.56 [ 92%] 3.03 -> 1.76 [ 58%] 0.62 -> 0.56 [ 91%]
> top25desk_ebay_com.skp 1.18 -> 1.08 [ 92%] 2.23 -> 1.24 [ 56%] 1.14 -> 1.09 [ 96%]
> desk_css3gradients.skp 0.64 -> 0.61 [ 95%] 2.99 -> 1.54 [ 52%] 0.62 -> 0.61 [ 99%]
> top25desk_blogger.skp 0.61 -> 0.59 [ 96%] 2.50 -> 1.37 [ 55%] 0.60 -> 0.57 [ 95%]
> keymobi_nytimes_com_.skp 0.65 -> 0.64 [ 98%] 2.69 -> 1.42 [ 53%] 0.62 -> 0.59 [ 96%]
> keymobi_wowwiki_com_worl... 0.99 -> 0.92 [ 92%] 3.46 -> 2.06 [ 60%] 0.98 -> 0.95 [ 96%]
> keymobi_cuteoverload_com... 1.37 -> 1.26 [ 92%] 3.24 -> 2.45 [ 76%] 1.38 -> 1.35 [ 98%]
> keymobi_mobile_news_sand... 0.88 -> 0.81 [ 93%] 3.50 -> 2.07 [ 59%] 0.82 -> 0.81 [100%]
> top25desk_linkedin.skp 0.87 -> 0.87 [100%] 2.92 -> 1.73 [ 59%] 0.94 -> 0.86 [ 91%]
> top25desk_docs___1_open_... 1.43 -> 1.36 [ 95%] 1.87 -> 1.42 [ 76%] 0.73 -> 0.66 [ 91%]
> keymobi_reddit_com_r_pro... 0.68 -> 0.66 [ 96%] 2.49 -> 1.23 [ 49%] 0.65 -> 0.66 [102%]
> ...
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2289363005
>
> Committed: https://skia.googlesource.com/skia/+/db42be9a326c747ff92ed1da8c3536c5b3e8e22b
TBR=bsalomon@google.com,egdaniel@google.com,robertphillips@google.com,csmartdalton@google.com
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=skia:
Review-Url: https://codereview.chromium.org/2312173002
Diffstat (limited to 'src/gpu/GrReducedClip.h')
-rw-r--r-- | src/gpu/GrReducedClip.h | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/src/gpu/GrReducedClip.h b/src/gpu/GrReducedClip.h index b8413e6df4..731d58f61c 100644 --- a/src/gpu/GrReducedClip.h +++ b/src/gpu/GrReducedClip.h @@ -8,7 +8,6 @@ #ifndef GrReducedClip_DEFINED #define GrReducedClip_DEFINED -#include "GrWindowRectangles.h" #include "SkClipStack.h" #include "SkTLList.h" @@ -21,11 +20,11 @@ class GrDrawContext; */ class SK_API GrReducedClip { public: - GrReducedClip(const SkClipStack&, const SkRect& queryBounds, int maxWindowRectangles = 0); + GrReducedClip(const SkClipStack& stack, const SkRect& queryBounds); /** - * 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. + * 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. */ const SkIRect& ibounds() const { SkASSERT(fHasIBounds); return fIBounds; } int left() const { return this->ibounds().left(); } @@ -39,16 +38,10 @@ 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 required to fully implement the clip. + * Populated with a minimal list of elements that implement the clip. */ const ElementList& elements() const { return fElements; } @@ -74,18 +67,15 @@ public: bool drawStencilClipMask(GrContext*, GrDrawContext*, const SkIPoint& clipOrigin) const; private: - void walkStack(const SkClipStack&, const SkRect& queryBounds, int maxWindowRectangles); - void addInteriorWindowRectangles(int maxWindowRectangles); - void addWindowRectangle(const SkRect& elementInteriorRect, bool elementIsAA); + void walkStack(const SkClipStack&, const SkRect& queryBounds); bool intersectIBounds(const SkIRect&); - SkIRect fIBounds; - bool fHasIBounds; - GrWindowRectangles fWindowRects; - ElementList fElements; - int32_t fElementsGenID; - bool fRequiresAA; - InitialState fInitialState; + SkIRect fIBounds; + bool fHasIBounds; + ElementList fElements; + int32_t fElementsGenID; + bool fRequiresAA; + InitialState fInitialState; }; #endif |