diff options
| author |  robertphillips <robertphillips@google.com> | 2016-05-06 07:16:18 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-06 07:16:18 -0700 |
| commit | 6b53b9daeb2137a91d8ddb8e890d66c702bfbaa3 (patch) | |
| tree | 3f9d203586289d76727e9641339722a8146a4616 /src | |
| parent | 8ca7da80fa320b4a9734bfb26932a7c7d208a0d4 (diff) | |
Revert of Disable layer hoisting for non-8888 canvases (patchset #2 id:20001 of https://codereview.chromium.org/1957433002/ )
Reason for revert:
Experimental revert to investigate perf regression
Original issue's description:
> Disable layer hoisting for non-8888 canvases
>
> This just stops the bleeding. A real fix would propagate the canvas' backing type down to the layer hoister.
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1957433002
>
> Committed: https://skia.googlesource.com/skia/+/4e30f27164179d344f0c8efa9a691d1bc9a53e3f
TBR=bsalomon@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/1961483002
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkMultiPictureDraw.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/SkGpuDevice.cpp | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/core/SkMultiPictureDraw.cpp b/src/core/SkMultiPictureDraw.cpp index 40d93b1dd7..26e446d2ad 100644 --- a/src/core/SkMultiPictureDraw.cpp +++ b/src/core/SkMultiPictureDraw.cpp @@ -124,9 +124,7 @@ void SkMultiPictureDraw::draw(bool flush) { // we only expect 1 context for all the canvases SkASSERT(data.fCanvas->getGrContext() == context); - if (!data.fPaint && - (kRGBA_8888_SkColorType == data.fCanvas->imageInfo().colorType() || - kBGRA_8888_SkColorType == data.fCanvas->imageInfo().colorType())) { + if (!data.fPaint) { SkRect clipBounds; if (!data.fCanvas->getClipBounds(&clipBounds)) { continue; diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index 6992a45dab..54ed413549 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -1784,9 +1784,7 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas* mainCanvas, const SkPicture ASSERT_SINGLE_OWNER #ifndef SK_IGNORE_GPU_LAYER_HOISTING // todo: should handle this natively - if (paint || - (kRGBA_8888_SkColorType != mainCanvas->imageInfo().colorType() && - kBGRA_8888_SkColorType != mainCanvas->imageInfo().colorType())) { + if (paint) { return false; } |