| commit | 74e9a4dcd3772fccfc26b148e43cfcf4e084093f | [log] [tgz] |
|---|---|---|
| author | robertphillips <robertphillips@google.com> | Mon May 09 05:12:18 2016 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Mon May 09 05:12:18 2016 -0700 |
| tree | de1957fe9c62626e3a094438b3d1a5d0f866785a | |
| parent | e20a87517043ec4a30dcc7e711ca49087e8942ff [diff] [blame] |
Reland of Disable layer hoisting for non-8888 canvases (patchset #1 id:1 of https://codereview.chromium.org/1961483002/ ) Reason for revert: This CL was not the culprit in the perf regression. Original issue's description: > 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 > > Committed: https://skia.googlesource.com/skia/+/6b53b9daeb2137a91d8ddb8e890d66c702bfbaa3 TBR=bsalomon@google.com # Not skipping CQ checks because original CL landed more than 1 days ago. Review-Url: https://codereview.chromium.org/1962603002
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index 98da472..ba5848b 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp
@@ -1782,7 +1782,9 @@ ASSERT_SINGLE_OWNER #ifndef SK_IGNORE_GPU_LAYER_HOISTING // todo: should handle this natively - if (paint) { + if (paint || + (kRGBA_8888_SkColorType != mainCanvas->imageInfo().colorType() && + kBGRA_8888_SkColorType != mainCanvas->imageInfo().colorType())) { return false; }