ab244f045a
This reverts commit9d5f66d9c2. Reason for revert: Leon landed Android fixes. Original change's description: > Revert "Reland: Remove SkLights include from SkCanvas.h" > > This reverts commitfed00319c9. > > Reason for revert: breaking the Android roll. > > Original change's description: > > Reland: Remove SkLights include from SkCanvas.h > > > > SkLights.h pulls in a bunch of other headers and is not needed (fwdecl > > works fine). > > > > Change-Id: I3ed97cd7861e51dcb7cfa7950a97b420dbc6fbfb > > TBR=reed@google.com > > Reviewed-on: https://skia-review.googlesource.com/15143 > > Commit-Queue: Florin Malita <fmalita@chromium.org> > > Reviewed-by: Florin Malita <fmalita@chromium.org> > > > > TBR=fmalita@chromium.org,reed@google.com > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Change-Id: I3b0e69f1d04d160f16a5567b09982d35cc9ca84e > Reviewed-on: https://skia-review.googlesource.com/15195 > Reviewed-by: Florin Malita <fmalita@chromium.org> > Commit-Queue: Florin Malita <fmalita@chromium.org> > TBR=msarett@google.com,reviews@skia.org,fmalita@chromium.org,reed@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I0a1c2f9df61f16987ab72dfb4f3a205fbcc37667 Reviewed-on: https://skia-review.googlesource.com/15229 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
99 lines
3.2 KiB
C++
99 lines
3.2 KiB
C++
/*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "DumpRecord.h"
|
|
#include "SkBitmap.h"
|
|
#include "SkCommandLineFlags.h"
|
|
#include "SkDeferredCanvas.h"
|
|
#include "SkPicture.h"
|
|
#include "SkPictureRecorder.h"
|
|
#include "SkRecordDraw.h"
|
|
#include "SkRecordOpts.h"
|
|
#include "SkRecorder.h"
|
|
#include "SkStream.h"
|
|
#include <stdio.h>
|
|
|
|
DEFINE_string2(skps, r, "", ".SKPs to dump.");
|
|
DEFINE_string(match, "", "The usual filters on file names to dump.");
|
|
DEFINE_bool2(optimize, O, false, "Run SkRecordOptimize before dumping.");
|
|
DEFINE_bool(optimize2, false, "Run SkRecordOptimize2 before dumping.");
|
|
DEFINE_int32(tile, 1000000000, "Simulated tile size.");
|
|
DEFINE_bool(timeWithCommand, false, "If true, print time next to command, else in first column.");
|
|
DEFINE_string2(write, w, "", "Write the (optimized) picture to the named file.");
|
|
DEFINE_bool(defer, false, "Defer clips and translates");
|
|
|
|
static void dump(const char* name, int w, int h, const SkRecord& record) {
|
|
SkBitmap bitmap;
|
|
bitmap.allocN32Pixels(w, h);
|
|
SkCanvas canvas(bitmap);
|
|
canvas.clipRect(SkRect::MakeWH(SkIntToScalar(FLAGS_tile),
|
|
SkIntToScalar(FLAGS_tile)));
|
|
|
|
printf("%s %s\n", FLAGS_optimize ? "optimized" : "not-optimized", name);
|
|
|
|
DumpRecord(record, &canvas, FLAGS_timeWithCommand);
|
|
}
|
|
|
|
int main(int argc, char** argv) {
|
|
SkCommandLineFlags::Parse(argc, argv);
|
|
|
|
for (int i = 0; i < FLAGS_skps.count(); i++) {
|
|
if (SkCommandLineFlags::ShouldSkip(FLAGS_match, FLAGS_skps[i])) {
|
|
continue;
|
|
}
|
|
|
|
std::unique_ptr<SkStream> stream = SkStream::MakeFromFile(FLAGS_skps[i]);
|
|
if (!stream) {
|
|
SkDebugf("Could not read %s.\n", FLAGS_skps[i]);
|
|
return 1;
|
|
}
|
|
sk_sp<SkPicture> src(SkPicture::MakeFromStream(stream.get()));
|
|
if (!src) {
|
|
SkDebugf("Could not read %s as an SkPicture.\n", FLAGS_skps[i]);
|
|
return 1;
|
|
}
|
|
if (FLAGS_defer) {
|
|
SkPictureRecorder recorder;
|
|
SkDeferredCanvas deferred(recorder.beginRecording(src->cullRect()),
|
|
SkDeferredCanvas::kEager);
|
|
src->playback(&deferred);
|
|
src = recorder.finishRecordingAsPicture();
|
|
}
|
|
const int w = SkScalarCeilToInt(src->cullRect().width());
|
|
const int h = SkScalarCeilToInt(src->cullRect().height());
|
|
|
|
SkRecord record;
|
|
SkRecorder canvas(&record, w, h);
|
|
src->playback(&canvas);
|
|
|
|
if (FLAGS_optimize) {
|
|
SkRecordOptimize(&record);
|
|
}
|
|
if (FLAGS_optimize2) {
|
|
SkRecordOptimize2(&record);
|
|
}
|
|
|
|
dump(FLAGS_skps[i], w, h, record);
|
|
|
|
if (FLAGS_write.count() > 0) {
|
|
SkPictureRecorder r;
|
|
SkRecordDraw(record,
|
|
r.beginRecording(SkRect::MakeIWH(w, h)),
|
|
nullptr,
|
|
nullptr,
|
|
0,
|
|
nullptr,
|
|
nullptr);
|
|
sk_sp<SkPicture> dst(r.finishRecordingAsPicture());
|
|
SkFILEWStream ostream(FLAGS_write[0]);
|
|
dst->serialize(&ostream);
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|