| commit | 6b53b9daeb2137a91d8ddb8e890d66c702bfbaa3 | [log] [tgz] |
|---|---|---|
| author | robertphillips <robertphillips@google.com> | Fri May 06 07:16:18 2016 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Fri May 06 07:16:18 2016 -0700 |
| tree | 3f9d203586289d76727e9641339722a8146a4616 | |
| parent | 8ca7da80fa320b4a9734bfb26932a7c7d208a0d4 [diff] [blame] |
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
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index 6992a45..54ed413 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp
@@ -1784,9 +1784,7 @@ 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; }