161e1ba4c0
Share common code between bench_ and render_ to set up the PictureRenderer. Fix an include error in SkPictureRenderer.h. Simplified parameter passing in render_pictures_main. Switch to using an SkAutoTUnref for the PictureRenderer. I also changed the input format somewhat, so the buildbots need to be updated as well: https://codereview.appspot.com/7441044/ Fixed a bug in PictureBenchmark where calling setTimeIndividualTiles(false) sets the member variable to true. Removed setDeviceType from PictureBenchmark, since only the PictureRenderer needs to know which device type to use. Some changes to the input format: '--logPerIter' no longer takes a 1 or 0. Instead, '--logPerIter' turns it on and '--nologPerIter' turns it off (with off as the default). (Note that this is for bench_pictures; bench still uses the old format) Change '--device' to '--config' and 'bitmap' to '8888' to be the same as gm. Requires '--r' before inputs (to match gm), though there can be multiple inputs following it. Changed --enable-deferred-image-decoding (which no one uses but me yet anyway) to --deferImageDecoding, since the former is incompatible with the flag parser. Changes to behavior: Show a short error message on failure (rather than the explanation of all flags). BUG=https://code.google.com/p/skia/issues/detail?id=1094 Review URL: https://codereview.appspot.com/7230053 git-svn-id: http://skia.googlecode.com/svn/trunk@7961 2bbb7eff-a529-9590-31e7-b0007b416f81
35 lines
909 B
C++
35 lines
909 B
C++
/*
|
|
* Copyright 2013 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#ifndef PICTURE_RENDERING_FLAGS
|
|
#define PICTURE_RENDERING_FLAGS
|
|
|
|
#include "SkString.h"
|
|
|
|
namespace sk_tools {
|
|
class PictureRenderer;
|
|
}
|
|
|
|
enum PictureTool {
|
|
kBench_PictureTool,
|
|
kRender_PictureTool,
|
|
};
|
|
|
|
/**
|
|
* Uses SkFlags to parse the command line, and returns a PictureRenderer
|
|
* reflecting the flags used. Assumes that SkFlags::ParseCommandLine has
|
|
* been called.
|
|
* @param error If there is an error or warning, it will be stored in error.
|
|
* @param tool Which tool is being used.
|
|
* @return PictureRenderer A PictureRenderer with the settings specified
|
|
* on the command line, or NULL if the command line is invalid.
|
|
*/
|
|
sk_tools::PictureRenderer* parseRenderer(SkString& error, PictureTool tool);
|
|
|
|
#endif // PICTURE_RENDERING_FLAGS
|
|
|