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/GrFixedClip.cpp | |
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/GrFixedClip.cpp')
-rw-r--r-- | src/gpu/GrFixedClip.cpp | 44 |
1 files changed, 34 insertions, 10 deletions
diff --git a/src/gpu/GrFixedClip.cpp b/src/gpu/GrFixedClip.cpp index ebdd49bbf8..7385028baf 100644 --- a/src/gpu/GrFixedClip.cpp +++ b/src/gpu/GrFixedClip.cpp @@ -10,25 +10,45 @@ #include "GrAppliedClip.h" #include "GrDrawContext.h" -void GrFixedClip::getConservativeBounds(int width, int height, SkIRect* devResult, - bool* isIntersectionOfRects) const { - devResult->setXYWH(0, 0, width, height); +bool GrFixedClip::quickContains(const SkRect& rect) const { + if (fWindowRectsState.enabled()) { + return false; + } + return !fScissorState.enabled() || GrClip::IsInsideClip(fScissorState.rect(), rect); +} + +void GrFixedClip::getConservativeBounds(int w, int h, SkIRect* devResult, bool* iior) const { + devResult->setXYWH(0, 0, w, h); if (fScissorState.enabled()) { if (!devResult->intersect(fScissorState.rect())) { devResult->setEmpty(); } } - if (isIntersectionOfRects) { - *isIntersectionOfRects = true; + if (iior) { + *iior = true; } } -bool GrFixedClip::apply(GrContext*, GrDrawContext* drawContext, bool isHWAntiAlias, - bool hasUserStencilSettings, GrAppliedClip* out) const { +bool GrFixedClip::isRRect(const SkRect& rtBounds, SkRRect* rr, bool* aa) const { + if (fWindowRectsState.enabled()) { + return false; + } if (fScissorState.enabled()) { - SkIRect tightScissor; - if (!tightScissor.intersect(fScissorState.rect(), - SkIRect::MakeWH(drawContext->width(), drawContext->height()))) { + SkRect rect = SkRect::Make(fScissorState.rect()); + if (!rect.intersects(rtBounds)) { + return false; + } + rr->setRect(rect); + *aa = false; + return true; + } + return false; +}; + +bool GrFixedClip::apply(GrContext*, GrDrawContext* dc, bool, bool, GrAppliedClip* out) const { + if (fScissorState.enabled()) { + SkIRect tightScissor = SkIRect::MakeWH(dc->width(), dc->height()); + if (!tightScissor.intersect(fScissorState.rect())) { return false; } if (IsOutsideClip(tightScissor, out->clippedDrawBounds())) { @@ -39,6 +59,10 @@ bool GrFixedClip::apply(GrContext*, GrDrawContext* drawContext, bool isHWAntiAli } } + if (fWindowRectsState.enabled()) { + out->addWindowRectangles(fWindowRectsState); + } + return true; } |