Commit Graph

195 Commits

Author SHA1 Message Date
scroggo@google.com
a9e3a369c1 Add an option to render_pictures to rerecord the pictures with PNG encoded bitmaps.
Review URL: https://codereview.appspot.com/6821092

git-svn-id: http://skia.googlecode.com/svn/trunk@6332 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-07 17:52:48 +00:00
caryclark@google.com
e3e940cf81 Add low blur and AAClip options to picture bench.
Copy the settings instead of pointing to the
original set on the stack.
Review URL: https://codereview.appspot.com/6818103

git-svn-id: http://skia.googlecode.com/svn/trunk@6330 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-07 16:42:17 +00:00
reed@google.com
ea6a306457 include SkPaint.h
git-svn-id: http://skia.googlecode.com/svn/trunk@6321 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-06 22:14:54 +00:00
caryclark@google.com
411bb7237e leading character accidentally deleted on merge
git-svn-id: http://skia.googlecode.com/svn/trunk@6319 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-06 21:29:16 +00:00
caryclark@google.com
a362237644 add draw filter option to picture_bench
Option allows adding a draw filter option per type
or for all types. All SkPaint flags may be filtered,
plus disabling blur and setting the hint level.
Review URL: https://codereview.appspot.com/6816092

git-svn-id: http://skia.googlecode.com/svn/trunk@6318 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-06 21:26:13 +00:00
junov@chromium.org
7b53706a7d Adding SkTileGrid: a new subclass of BBoxHierarchy, optimized for tiled playback.
Review URL: https://codereview.appspot.com/6820093

git-svn-id: http://skia.googlecode.com/svn/trunk@6314 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-06 18:58:43 +00:00
djsollen@google.com
fd9720cfec Fix the PictureRecord step of BenchPictures.
Review URL: https://codereview.appspot.com/6820100

git-svn-id: http://skia.googlecode.com/svn/trunk@6311 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-06 16:54:40 +00:00
skia.committer@gmail.com
1aa90cf11e Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6306 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-06 13:18:25 +00:00
scroggo@google.com
0a049b861e Make bench_pictures output a meaningful config name.
Review URL: https://codereview.appspot.com/6813074

git-svn-id: http://skia.googlecode.com/svn/trunk@6288 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-02 22:01:26 +00:00
scroggo@google.com
a62da2fee7 In bench_pictures --multi, maintain thread local caches.
Builds on https://codereview.appspot.com/6718046/ by mtklein.

Previously, each iteration of drawing a picture started new threads to draw the picture. Since each thread is using thread local storage for the font cache, this means that each iteration had to start with an empty font cache.

The newly added MultiCorePictureRenderer, separated from TiledPictureRenderer, now starts the drawing threads at the beginning of the test using an SkThreadPool, and keeps them alive through all iterations, so the font cache can be reused.

For now, I have removed the pipe version of the threaded renderer.

Updated bench_pictures_main and render_pictures_main to use the new
renderer, and to unref a renderer before early exit.

Review URL: https://codereview.appspot.com/6777063

git-svn-id: http://skia.googlecode.com/svn/trunk@6285 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-02 21:28:12 +00:00
junov@chromium.org
50ff9bd4d7 Fixing crash in render_pictures. Uninitialized member in PictureRenderer
TBR=scroggo



git-svn-id: http://skia.googlecode.com/svn/trunk@6272 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-02 19:16:22 +00:00
junov@chromium.org
9313ca4bde Adding rtree support to the bench_pictures utility
Review URL: https://codereview.appspot.com/6775080

git-svn-id: http://skia.googlecode.com/svn/trunk@6267 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-02 18:11:49 +00:00
skia.committer@gmail.com
760f2d95dd Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6258 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-02 02:01:24 +00:00
edisonn@google.com
9cf5b28648 Support render_pdfs in iOS too (add tool_main()).
git-svn-id: http://skia.googlecode.com/svn/trunk@6254 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-01 20:07:33 +00:00
edisonn@google.com
c319abeeef Add utility to convert skp files to pdf files. Code compatible with render_pictures_main.cpp. I could have refactored the code to avoid code duplication, but it does not seem right, and it will overcomplicate the code.
Review URL: https://codereview.appspot.com/6615073

git-svn-id: http://skia.googlecode.com/svn/trunk@6253 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-01 19:52:38 +00:00
senorblanco@chromium.org
5682f21f99 Simple rebaseline tool: Add support for ANGLE, DirectWrite builders.
Set svn mime type to image/png.

Review URL: https://codereview.appspot.com/6820054

git-svn-id: http://skia.googlecode.com/svn/trunk@6199 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-30 14:34:55 +00:00
senorblanco@chromium.org
782f3b4230 First stab at a simple rebaseline script.
Review URL: https://codereview.appspot.com/6775045

git-svn-id: http://skia.googlecode.com/svn/trunk@6170 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-29 18:06:26 +00:00
borenet@google.com
070d354d51 Make output path to render_pictures optional
Review URL: https://codereview.appspot.com/6779049

git-svn-id: http://skia.googlecode.com/svn/trunk@6136 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-26 13:26:55 +00:00
robertphillips@google.com
831c726f83 Correctly set width & height in filtered SkPictures
https://codereview.appspot.com/6772047/



git-svn-id: http://skia.googlecode.com/svn/trunk@6103 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-25 14:45:08 +00:00
robertphillips@google.com
63f1127a70 Make filter tool actually filter the read in SkPicture
https://codereview.appspot.com/6765046/



git-svn-id: http://skia.googlecode.com/svn/trunk@6080 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-24 19:30:41 +00:00
robertphillips@google.com
801cee1d4c Added ability to extract SkBitmaps to filter tool
https://codereview.appspot.com/6748043/



git-svn-id: http://skia.googlecode.com/svn/trunk@6021 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-19 19:06:11 +00:00
scroggo@google.com
b8e404aebe Fix a warning.
Review URL: https://codereview.appspot.com/6650048

git-svn-id: http://skia.googlecode.com/svn/trunk@5902 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-11 19:10:33 +00:00
borenet@google.com
efb1d77ad2 Build Skia as a static library
- Roll GYP so that we get non-thin archives on Linux
- Add merge_static_libs.py
- Add skia_core_lib target which builds core, ports, opts*, and utils
- Replace dependencies on core/ports/opts/utils with skia_core_libs
- Rename exportable libraries with "skia_"
Review URL: https://codereview.appspot.com/6619049

git-svn-id: http://skia.googlecode.com/svn/trunk@5889 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-10 19:45:51 +00:00
edisonn@google.com
2a827e81b3 Add an SKP to PDF rendered. test_pdfs.py will be hooked up in buildbot testing later.
Review URL: https://codereview.appspot.com/6610056

git-svn-id: http://skia.googlecode.com/svn/trunk@5880 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-10 15:20:34 +00:00
edisonn@google.com
c2c4981d02 Refactor test_pictures so we can add test_pdfs without code duplication.
Review URL: https://codereview.appspot.com/6611050

git-svn-id: http://skia.googlecode.com/svn/trunk@5878 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-10 15:08:12 +00:00
caryclark@google.com
9598f4256d fix filter for ios
Review URL: https://codereview.appspot.com/6635047

git-svn-id: http://skia.googlecode.com/svn/trunk@5859 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-09 12:32:37 +00:00
tfarina@chromium.org
a5b7cc00b9 Remove unnecessary function declaration.
R=robertphillips@google.com

Review URL: https://codereview.appspot.com/6593082

git-svn-id: http://skia.googlecode.com/svn/trunk@5851 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-08 14:41:10 +00:00
scroggo@google.com
5a7c6be72b Add the ability to provide function pointers to SkPicture serialization
and deserialization for encoding and decoding bitmaps.

Remove kForceFlattenBitmapPixels_Flag, which is no longer used.

When an SkOrderedReadBuffer needs to read a bitmap, if it does not
have an image decoder, use a dummy bitmap.

In GM, add a tolerance option for color differences, used when
testing picture serialization, so it can assume two images are the
same even though PNG encoding/decoding may have resulted in small
differences.

Create dummy implementations for SkImageDecoder and SkImageEncoder
functions in SkImageDecoder_empty so that a project that does not
want to include the images project it can still build.

Allow ports to build without images project.

In Mac's image encoder, copy 4444 to 8888 before encoding.

Add SkWriter32::reservePad, to provide a pointer to write non 4 byte
aligned data, padded with zeroes.

In bench_ and render_ pictures, pass decode function to SkPicture
creation from a stream.

BUG=https://code.google.com/p/skia/issues/detail?id=842

Review URL: https://codereview.appspot.com/6551071

git-svn-id: http://skia.googlecode.com/svn/trunk@5818 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 21:46:08 +00:00
robertphillips@google.com
c7e4a5a02a Created filter command line tool
https://codereview.appspot.com/6595066/



git-svn-id: http://skia.googlecode.com/svn/trunk@5803 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-04 13:00:33 +00:00
scroggo@google.com
b6e806bf17 Allow render_pictures to render using multiple threads.
Make write() a static function so it can be used by the
thread entry functions.

Add a helper function to append a number to a string and
call write to share code.

Review URL: https://codereview.appspot.com/6589062

git-svn-id: http://skia.googlecode.com/svn/trunk@5789 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-03 17:32:33 +00:00
caryclark@google.com
868e1f682e fix return value for render_pictures
Review URL: https://codereview.appspot.com/6590049

git-svn-id: http://skia.googlecode.com/svn/trunk@5779 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-02 20:00:03 +00:00
caryclark@google.com
5987f58036 build iOS with 'make all'
This builds all skia tests by treating iOS tools
as executable applications. A few warnings were
fixed as well.

Removed old trace draw code and remnants.
Review URL: https://codereview.appspot.com/6597063

git-svn-id: http://skia.googlecode.com/svn/trunk@5776 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-02 18:33:14 +00:00
scroggo@google.com
b4773b4802 Fix some bugs in our picture tools.
When doing tiled rendering in multiple threads, clone fPicture,
rather than the blank fPictureClones. Also fix a precedence
problem so we get the correct rectangle.

In render_pictures_main, call PictureRenderer::setup().

Review URL: https://codereview.appspot.com/6585055

git-svn-id: http://skia.googlecode.com/svn/trunk@5758 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-01 20:06:09 +00:00
fmalita@google.com
c6157be6c0 Pinspect and bench_pictures are crashing when invoked with no arguments.
R=reed@google.com,scroggo@google.com
BUG=

Review URL: https://codereview.appspot.com/6575052

git-svn-id: http://skia.googlecode.com/svn/trunk@5706 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-27 13:09:58 +00:00
borenet@google.com
71f0f8e1ca Fix update-doxygen (again)
Bash trickery to find the script directory did not work, but we can just use
"trunk/tools" since trunk gets checked out into $DOXYGEN_TEMPDIR.
Review URL: https://codereview.appspot.com/6573055

git-svn-id: http://skia.googlecode.com/svn/trunk@5696 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-26 16:25:22 +00:00
borenet@google.com
72e3403914 Fix update-doxygen, which fails when skia-autogen is reset
static_footer.txt was removed from skia/docs in r2837, but update-doxygen.sh
requires it to exist in skia-autogen.  If skia-autogen is cleared (frequently),
then static_footer.txt can't be found.  Add it back to trunk/tools and manually
copy it if needed.
Review URL: https://codereview.appspot.com/6568054

git-svn-id: http://skia.googlecode.com/svn/trunk@5694 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-26 16:09:43 +00:00
tfarina@chromium.org
e0e71afc66 Remove unused includes from skhello tool.
R=epoger@google.com

Review URL: https://codereview.appspot.com/6546063

git-svn-id: http://skia.googlecode.com/svn/trunk@5676 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-25 20:16:46 +00:00
scroggo@google.com
3686c9d90a Fix a warning in PictureBenchmark.
Forgot to change from false to NULL. False does the right thing,
but gives a warning. Fix the warning.

Review URL: https://codereview.appspot.com/6570049

git-svn-id: http://skia.googlecode.com/svn/trunk@5666 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-25 17:36:36 +00:00
borenet@google.com
2d2b9a0d8c Remove automatic resizing in *_pictures
Review URL: https://codereview.appspot.com/6554045

git-svn-id: http://skia.googlecode.com/svn/trunk@5614 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-20 18:54:04 +00:00
scroggo@google.com
81f9d2e05b In render_pictures tiled rendering, draw a separate PNG for each tile.
Since the passed in picture may represent an image which is too large
to be represented on the GPU, never create such a large canvas. Instead,
after drawing to each tile, create a file showing just that tile.

Review URL: https://codereview.appspot.com/6532056

git-svn-id: http://skia.googlecode.com/svn/trunk@5603 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-20 14:54:21 +00:00
scroggo@google.com
bcdf2ec50d In bench_pictures, use a pool of tiles for multicore drawing.
Also includes some code cleanup and code sharing.

Allow setting the number of threads on the command line.

Rename ThreadSafePipeController::playback to ::draw, to be the same
as SkPicture so DrawTileToCanvas can take a template parameter.

Disallow multithreading with GPU turned on.

Display help information with improper tiled arguments.

BUG=https://code.google.com/p/skia/issues/detail?id=871

Review URL: https://codereview.appspot.com/6536050

git-svn-id: http://skia.googlecode.com/svn/trunk@5602 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-20 14:42:33 +00:00
borenet@google.com
57837bff3d Skip empty directories and input files not ending in .skp in *_pictures
Addressing https://code.google.com/p/skia/issues/detail?id=886
Review URL: https://codereview.appspot.com/6531047

git-svn-id: http://skia.googlecode.com/svn/trunk@5597 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-19 17:28:29 +00:00
scroggo@google.com
acfb30e5bb Reuse one canvas for every tile in bench_pictures (in single threaded mode).
Turn off multi threaded option for now.

In bench_pictures, do not create a large canvas, since we never use it.

Remove unused functions on TiledPictureRenderer.

Review URL: https://codereview.appspot.com/6521043

git-svn-id: http://skia.googlecode.com/svn/trunk@5583 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 14:32:35 +00:00
borenet@google.com
13fd5a15a1 Set DEFAULT_REPEATS to 1
bench defaults to 1 repeat, so bench_pictures should do the same.

This is causing the Android build cycles to be *hours* long.
Review URL: https://codereview.appspot.com/6490123

git-svn-id: http://skia.googlecode.com/svn/trunk@5575 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-17 21:10:05 +00:00
borenet@google.com
66bcbd12bf Check for invalid SkPictures
- Remove hasRecorded() since nobody uses it.
- Add "success" boolean to SkPicture stream constructor
- Track failures in render_pictures and bench_pictures
Review URL: https://codereview.appspot.com/6493105

git-svn-id: http://skia.googlecode.com/svn/trunk@5573 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-17 18:26:06 +00:00
borenet@google.com
3a8b0d8288 Scale even smaller in bench_pictures to get things green
Over-the-shoulder review from reed@
Review URL: https://codereview.appspot.com/6512043

git-svn-id: http://skia.googlecode.com/svn/trunk@5545 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-14 15:27:41 +00:00
borenet@google.com
e21795e277 Enable automatic rescaling in bench_pictures
bench_pictures with "--device gpu" is failing because we're trying to allocate
too much GPU memory.  Move the recently-added scaling code into picture_utils
and share it between render_pictures and bench_pictures.
Review URL: https://codereview.appspot.com/6495125

git-svn-id: http://skia.googlecode.com/svn/trunk@5543 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-14 14:34:28 +00:00
skia.committer@gmail.com
1d225f2b33 Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@5539 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-14 02:01:10 +00:00
borenet@google.com
a49bffdb03 Do not exit on failure to open logFile
Temporary solution for write-protected Android devices.  Intention is to revert
in favor of a more permanent solution.
Review URL: https://codereview.appspot.com/6497132

git-svn-id: http://skia.googlecode.com/svn/trunk@5535 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-13 18:54:48 +00:00
reed@google.com
e04e92b19f To avoid running out of memory, we rescale very large pictures before we
render them.
Review URL: https://codereview.appspot.com/6504045

git-svn-id: http://skia.googlecode.com/svn/trunk@5530 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-13 17:44:32 +00:00