From f5bf3cf0257dc3d18932bde51f8eae33442e071f Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Wed, 7 May 2014 14:47:44 +0000 Subject: Add SaveLayer-Draw-Restore optimization. This is like SkPictureRecord's remove_save_layer1 but works with all draw calls. Interesting patterns removed: SaveLayer-DrawRect-Restore: Silk SKPs, desk_weather SaveLayer-DrawPath-Restore: desk_carsvg, desk_wowwiki, tabl_androidpolice SaveLayer-DrawPosTextH-Restore: tabl_android_police There may be others, but I stopped looking. BUG=skia:2378 R=robertphillips@google.com, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/269813010 git-svn-id: http://skia.googlecode.com/svn/trunk@14610 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests/RecordOptsTest.cpp | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) (limited to 'tests/RecordOptsTest.cpp') diff --git a/tests/RecordOptsTest.cpp b/tests/RecordOptsTest.cpp index 260b97b3e8..90347eda1f 100644 --- a/tests/RecordOptsTest.cpp +++ b/tests/RecordOptsTest.cpp @@ -12,6 +12,8 @@ #include "SkRecorder.h" #include "SkRecords.h" +#include "SkXfermode.h" + static const int W = 1920, H = 1080; // If the command we're reading is a U, set ptr to it, otherwise set it to NULL. @@ -151,3 +153,76 @@ DEF_TEST(RecordOpts_NoopSaveRestores, r) { assert_type(r, record, 9); assert_type(r, record, 10); } + +static void assert_savelayer_restore(skiatest::Reporter* r, + SkRecord* record, + unsigned i, + bool shouldBeNoOped) { + SkRecordNoopSaveLayerDrawRestores(record); + if (shouldBeNoOped) { + assert_type(r, *record, i); + assert_type(r, *record, i+2); + } else { + assert_type(r, *record, i); + assert_type(r, *record, i+2); + } +} + +DEF_TEST(RecordOpts_NoopSaveLayerDrawRestore, r) { + SkRecord record; + SkRecorder recorder(SkRecorder::kWriteOnly_Mode, &record, W, H); + + SkRect bounds = SkRect::MakeWH(100, 200); + SkRect draw = SkRect::MakeWH(50, 60); + + SkPaint goodLayerPaint, badLayerPaint, worseLayerPaint; + goodLayerPaint.setColor(0x03000000); // Only alpha. + badLayerPaint.setColor( 0x03040506); // Not only alpha. + worseLayerPaint.setXfermodeMode(SkXfermode::kDstIn_Mode); // Any effect will do. + + SkPaint goodDrawPaint, badDrawPaint; + goodDrawPaint.setColor(0xFF020202); // Opaque. + badDrawPaint.setColor( 0x0F020202); // Not opaque. + + // No change: optimization can't handle bounds. + recorder.saveLayer(&bounds, NULL); + recorder.drawRect(draw, goodDrawPaint); + recorder.restore(); + assert_savelayer_restore(r, &record, 0, false); + + // SaveLayer/Restore removed: no bounds + no paint = no point. + recorder.saveLayer(NULL, NULL); + recorder.drawRect(draw, goodDrawPaint); + recorder.restore(); + assert_savelayer_restore(r, &record, 3, true); + + // TODO(mtklein): test case with null draw paint + + // No change: layer paint isn't alpha-only. + recorder.saveLayer(NULL, &badLayerPaint); + recorder.drawRect(draw, goodDrawPaint); + recorder.restore(); + assert_savelayer_restore(r, &record, 6, false); + + // No change: layer paint has an effect. + recorder.saveLayer(NULL, &worseLayerPaint); + recorder.drawRect(draw, goodDrawPaint); + recorder.restore(); + assert_savelayer_restore(r, &record, 9, false); + + // No change: draw paint isn't opaque. + recorder.saveLayer(NULL, &goodLayerPaint); + recorder.drawRect(draw, badDrawPaint); + recorder.restore(); + assert_savelayer_restore(r, &record, 12, false); + + // SaveLayer/Restore removed: we can fold in the alpha! + recorder.saveLayer(NULL, &goodLayerPaint); + recorder.drawRect(draw, goodDrawPaint); + recorder.restore(); + assert_savelayer_restore(r, &record, 15, true); + + const SkRecords::DrawRect* drawRect = assert_type(r, record, 16); + REPORTER_ASSERT(r, drawRect != NULL); + REPORTER_ASSERT(r, drawRect->paint.getColor() == 0x03020202); +} -- cgit v1.2.3