Commit Graph

157 Commits

Author SHA1 Message Date
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
robertphillips@google.com
163c84ba50 Added GPU resource cache stats printing to render_pictures
https://codereview.appspot.com/6492104/



git-svn-id: http://skia.googlecode.com/svn/trunk@5523 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-13 15:40:37 +00:00
scroggo@google.com
5239c32d1e Add -logPerIter, -timers, and -min to bench_pictures.
Additional changes:

Add instance count to bench_pictures.

Remove various PictureBenchmark subclasses which did not do
anything besides have a different PictureRenderer.

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5496 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-11 19:15:32 +00:00
bungeman@google.com
7c961e9e5a Baseline DirectWrite.
git-svn-id: http://skia.googlecode.com/svn/trunk@5487 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-11 17:29:37 +00:00
scroggo@google.com
0a36f43d5f Init graphics in bench_pictures.
Should fix http://code.google.com/p/skia/issues/detail?id=858
Review URL: https://codereview.appspot.com/6490100

git-svn-id: http://skia.googlecode.com/svn/trunk@5475 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-10 20:29:13 +00:00
rileya@google.com
a04dc02b11 Fix ordering of initializer list to fix compiler complaints.
git-svn-id: http://skia.googlecode.com/svn/trunk@5472 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-10 19:01:38 +00:00
borenet@google.com
03fcee8164 Add per-picture logging to render_pictures
This will be helpful for debugging crashes
Review URL: https://codereview.appspot.com/6495112

git-svn-id: http://skia.googlecode.com/svn/trunk@5469 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-10 18:18:38 +00:00
borenet@google.com
10ef79ec95 Fix render_pictures for skia_static_initializers=0
Review URL: https://codereview.appspot.com/6500097

git-svn-id: http://skia.googlecode.com/svn/trunk@5465 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-10 17:19:06 +00:00
epoger@google.com
f5ad077741 download_baselines: allow user to select which builder's images to download
BUG=806
Review URL: https://codereview.appspot.com/6492091

git-svn-id: http://skia.googlecode.com/svn/trunk@5435 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-07 16:05:34 +00:00
scroggo@google.com
9a4125283a Report data from bench_pictures in the same fashion as bench.
Move SkBenchLogger into separate files and make bench_pictures use it.
Remove sk_tools::print_msg, since SkBenchLogger is now used instead.

Combine picture_benchmark with bench_pictures, since that is the
only project that uses it.

Refactor the aggregator for bench timer data into its own class and
make bench_pictures use it.

Consolidate the various virtual PictureBenchmark::run functions
into one for reuse.

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5432 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-07 15:21:18 +00:00
robertphillips@google.com
94acc70312 Fixed Windows compiler complaints (esp. in debugger)
https://codereview.appspot.com/6497090/



git-svn-id: http://skia.googlecode.com/svn/trunk@5419 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-06 18:43:21 +00:00
bsalomon@google.com
100abf49e1 Shut up some Mac (xcode 3) warnings
Review URL: http://codereview.appspot.com/6503053/



git-svn-id: http://skia.googlecode.com/svn/trunk@5402 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-05 17:40:04 +00:00
scroggo@google.com
6bc8cf8f64 Fix windows build of tools.
Review URL: https://codereview.appspot.com/6494068

git-svn-id: http://skia.googlecode.com/svn/trunk@5374 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-31 18:34:09 +00:00
skia.committer@gmail.com
11f869277c Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@5373 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-31 17:14:46 +00:00
scroggo@google.com
8e073ba2d6 Rename my DeferredPipeController to not conflict with the other.
Fixes build.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5372 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-31 16:25:46 +00:00
scroggo@google.com
58b4ead36c Perform multi core rendering in bench_pictures.
Add a flag in SkGPipeWriter for threadsafe drawing.

Add a deferred pipe controller to SamplePipeControllers, which can
be called to play back in multiple threads.

Depends on http://codereview.appspot.com/6459105/

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5371 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-31 16:15:22 +00:00
reed@google.com
b1d47e211c add --dump-ops option to pinspect, which will invoke SkDumpCanvas on the picture(s)
git-svn-id: http://skia.googlecode.com/svn/trunk@5370 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-31 15:41:37 +00:00
jkleinert@google.com
ed01f12d13 Adding checkboxes to skdiff output so a user can select a subset of images to rebaseline.
BUG=745
Review URL: https://codereview.appspot.com/6497054

git-svn-id: http://skia.googlecode.com/svn/trunk@5360 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-30 22:05:53 +00:00
rileya@google.com
b947b91794 Fix uninitialized values in bench_pictures' tiled renderer.
Review URL: https://codereview.appspot.com/6506049

git-svn-id: http://skia.googlecode.com/svn/trunk@5333 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-29 17:35:07 +00:00
rileya@google.com
edfbff683e Change picture record benchmark to include begin/end record in timings and make the source picture draw itself into record canvas, so it records the draws instead of directly copying the picture.
Review URL: https://codereview.appspot.com/6501045

git-svn-id: http://skia.googlecode.com/svn/trunk@5323 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-28 19:13:39 +00:00
borenet@google.com
3578eb7d06 Move gm baselines from trunk/gm to gm-expected
- Move images
- Update build slaves with the change
- Update baseline tools with the change

git-svn-id: http://skia.googlecode.com/svn/trunk@5319 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-28 16:53:10 +00:00
robertphillips@google.com
91ee3a11ed Added second "truncated" cpu/wall timer to bench
http://codereview.appspot.com/6476064/

This CL will increase the bench baselines across the board



git-svn-id: http://skia.googlecode.com/svn/trunk@5305 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-28 12:18:40 +00:00
borenet@google.com
405ebbcade Script to help cycle skia-autogen
Review URL: https://codereview.appspot.com/6481066

git-svn-id: http://skia.googlecode.com/svn/trunk@5291 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-27 19:37:48 +00:00
bungeman@google.com
6e59e498e5 Rebaseline for r5280.
git-svn-id: http://skia.googlecode.com/svn/trunk@5281 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-24 19:49:29 +00:00
rmistry@google.com
0032407e29 Created to fix http://code.google.com/p/skia/issues/detail?id=817 : UpdateDoxygen step does not fail when Doxygen step fails.
Review URL: https://codereview.appspot.com/6480060

git-svn-id: http://skia.googlecode.com/svn/trunk@5278 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-24 17:16:05 +00:00
keyar@chromium.org
e599ab74ac Updated options for test_picturs.py to match new option in render_pictures.
Review URL: https://codereview.appspot.com/6481056

git-svn-id: http://skia.googlecode.com/svn/trunk@5275 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-23 21:51:11 +00:00
keyar@chromium.org
f4959ab118 Implemented power of two tiling.
Review URL: https://codereview.appspot.com/6485056

git-svn-id: http://skia.googlecode.com/svn/trunk@5274 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-23 20:53:25 +00:00
rmistry@google.com
d6176b0dca Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/)
This CL is part II of IV (I broke down the 1280 files into 4 CLs).
Review URL: https://codereview.appspot.com/6474054

git-svn-id: http://skia.googlecode.com/svn/trunk@5263 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-23 18:14:13 +00:00
keyar@chromium.org
ea82695325 Changed how tiles are copied to the master canvas.
This is in preparation for adding the powers of two mode.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5254 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-23 15:24:13 +00:00
rmistry@google.com
3de7b21efa Fix bug in tools/sanitize_source_files.py
Review URL: https://codereview.appspot.com/6474053

git-svn-id: http://skia.googlecode.com/svn/trunk@5253 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-23 14:46:18 +00:00
rmistry@google.com
b1faddffd8 The script does the following:
* Adds a newline to the end of files if it does not have one.
* Sets svn:eol-style to LF.
* Replaces CRLF with LF.
* Replaces Tabs with 4 whitespaces.
* Removes trailing whitespaces.

Created to fix http://code.google.com/p/skia/issues/detail?id=779 : New buildbot step that fixes and submits whitespace and newline source file fixes.
Review URL: https://codereview.appspot.com/6465078

git-svn-id: http://skia.googlecode.com/svn/trunk@5234 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-22 18:10:37 +00:00
keyar@chromium.org
9299eded38 Images are written by PictureRenderer and not render_pictures_main.
Review URL: https://codereview.appspot.com/6448174

git-svn-id: http://skia.googlecode.com/svn/trunk@5216 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-21 19:05:08 +00:00
keyar@chromium.org
db9a5fb55f Benchmark results will now print to STDOUT if on not-Android.
Review URL: https://codereview.appspot.com/6446164

git-svn-id: http://skia.googlecode.com/svn/trunk@5215 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-21 17:57:59 +00:00
keyar@chromium.org
da652c2ad5 Removed the TileInfo struct used in TiledPictureRenderer.
Review URL: https://codereview.appspot.com/6443153

git-svn-id: http://skia.googlecode.com/svn/trunk@5206 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 22:04:07 +00:00
keyar@chromium.org
b3fb7c1f46 Added copyright notice to PictureRenderer.cpp
Review URL: https://codereview.appspot.com/6453156

git-svn-id: http://skia.googlecode.com/svn/trunk@5203 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 21:02:49 +00:00
keyar@chromium.org
f0fed9f978 test_pictures.py will now look for render_pictures.exe and skdiff.exe
Before it was not and so was failing on Windows.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5191 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 17:33:06 +00:00
keyar@chromium.org
28136b308f flush() and glFinish() are now in the timed area of rendering.
git-svn-id: http://skia.googlecode.com/svn/trunk@5187 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 15:04:15 +00:00
keyar@chromium.org
a40c20df0e Fixed up SK_SUPPORT_GPU flags.
git-svn-id: http://skia.googlecode.com/svn/trunk@5186 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 15:04:12 +00:00
keyar@chromium.org
378c97fae0 Deleted timer for record and unflatten benchmarks.
git-svn-id: http://skia.googlecode.com/svn/trunk@5185 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 15:04:09 +00:00