Commit Graph

3430 Commits

Author SHA1 Message Date
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
keyar@chromium.org
bffacc01d6 Added some assertions.
git-svn-id: http://skia.googlecode.com/svn/trunk@5184 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 15:04:07 +00:00
keyar@chromium.org
c81686cd6e Added the option to enable GPU rendering on render_ and bench_pictures.
git-svn-id: http://skia.googlecode.com/svn/trunk@5183 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 15:04:04 +00:00
keyar@chromium.org
6cb110b8f5 Remove fBitmap delete. Tile bitmaps are no longer kept around.
git-svn-id: http://skia.googlecode.com/svn/trunk@5182 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 15:04:02 +00:00
keyar@chromium.org
275be533fa The tiles are properly reset.
git-svn-id: http://skia.googlecode.com/svn/trunk@5181 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 15:04:00 +00:00
keyar@chromium.org
a474ce3c0b TiledPictureRenderer now has tiles accelerated when appropiate.
git-svn-id: http://skia.googlecode.com/svn/trunk@5180 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 15:03:57 +00:00
keyar@chromium.org
941844b3f9 Changed new and delete to SkNEW* and SkDELETE as appropriate.
git-svn-id: http://skia.googlecode.com/svn/trunk@5179 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 15:03:54 +00:00
keyar@chromium.org
f8a513fbcd resetState is called between every benchmark run.
git-svn-id: http://skia.googlecode.com/svn/trunk@5178 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 15:03:52 +00:00
keyar@chromium.org
77a5522d0e State reset and gpu timers added.
git-svn-id: http://skia.googlecode.com/svn/trunk@5177 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 15:03:47 +00:00
keyar@chromium.org
78a35c5f1d Changed to Yoda style comparisons where appropriate.
git-svn-id: http://skia.googlecode.com/svn/trunk@5176 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 15:03:44 +00:00
keyar@chromium.org
fe6391a624 Have GPU based approach workingish.
Benchmarks do not work and it is always on.

git-svn-id: http://skia.googlecode.com/svn/trunk@5175 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 15:03:41 +00:00
keyar@chromium.org
02dfb12501 Minor whitespace change.
git-svn-id: http://skia.googlecode.com/svn/trunk@5173 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 15:03:36 +00:00
keyar@chromium.org
0612564bb7 The GrContext and the GrFactoryContext are now kept around.
git-svn-id: http://skia.googlecode.com/svn/trunk@5172 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 15:03:33 +00:00
keyar@chromium.org
4ea96c5e54 Dirty commit so Brian can see changes.
git-svn-id: http://skia.googlecode.com/svn/trunk@5171 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-20 15:03:29 +00:00
epoger@google.com
71329d809a skdiff: recurse over subdirectories, unless --norecurse option is given
in anticipation of https://code.google.com/p/skia/issues/detail?id=743 ('move gm baselines outside of trunk, and modify naming convention')
Review URL: https://codereview.appspot.com/6465053

git-svn-id: http://skia.googlecode.com/svn/trunk@5121 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-16 13:42:13 +00:00
robertphillips@google.com
5d8d18651a Addressed Windows compiler complaints
http://codereview.appspot.com/6462062/

This CL will require re-baselining of the imagemagnifier GM



git-svn-id: http://skia.googlecode.com/svn/trunk@5108 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-15 14:36:41 +00:00
tomhudson@google.com
8afae61a57 Clean up most clang warnings outside animator/
http://codereview.appspot.com/6464058/



git-svn-id: http://skia.googlecode.com/svn/trunk@5079 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-14 15:03:35 +00:00
epoger@google.com
21ecba88cd skdiff: clean up isPathAbsolute check for Windows
This is a followup to https://codereview.appspot.com/6458046/ ('Fix skdiff when using windows path that begins with a drive letter')
Review URL: https://codereview.appspot.com/6450106

git-svn-id: http://skia.googlecode.com/svn/trunk@5004 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-08 13:47:39 +00:00
keyar@chromium.org
9d696c0d04 Refactored the bitmap creation into PictureRenderer.
Further, the picture is also stored in the PictureRenderer.

The main gain of all of this is that we will not have to change how the device in more than one place when we end up adding different devices.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4990 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-07 17:11:33 +00:00
keyar@chromium.org
795cd47342 render_pictures and bench_pictures now use a --mode parameter.
This replaces the --tile, --pipe, etc. options from before as they are mutually exclusive.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4930 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-02 18:57:53 +00:00
keyar@chromium.org
163b56734f Merged bench_pictures and render_pictures rendering methods.
bench_pictures now uses a class based method for choosing the benchmark type as well.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4894 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-08-01 17:53:29 +00:00
bsalomon@google.com
f1478f8803 Fix skdiff when using windows path that begins with a drive letter
Review URL: https://mail.google.com/mail/u/0/?shva=1#inbox/138d92244ca33549


git-svn-id: http://skia.googlecode.com/svn/trunk@4838 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-30 19:16:02 +00:00
keyar@chromium.org
cc6e5efe03 Added an option to specify the tiling size to render_pictures.
With this change I should be able to start merging the rendering implementations of bench_pictures and render_pictures.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4816 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-27 20:09:26 +00:00
epoger@google.com
4a6ba46b9f Update list of platforms to rebaseline
Review URL: https://codereview.appspot.com/6441061

git-svn-id: http://skia.googlecode.com/svn/trunk@4806 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-27 15:19:54 +00:00
robertphillips@google.com
fc91dc7004 Windows compiler complaint cleanup
http://codereview.appspot.com/6441055/



git-svn-id: http://skia.googlecode.com/svn/trunk@4796 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-26 21:18:31 +00:00
keyar@chromium.org
451bb9f801 Changed to a class based method in passing around the rendering method for render_pictures.
This is based on a comment for https://codereview.appspot.com/6427061/

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4786 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-26 17:27:57 +00:00
keyar@chromium.org
472b379b5b render_pictures can now do tiling based rendering.
Review URL: https://codereview.appspot.com/6401057

git-svn-id: http://skia.googlecode.com/svn/trunk@4707 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-20 22:34:27 +00:00
epoger@google.com
3af4ff46a7 skdiff output: indicate which result types would cause failure
Review URL: https://codereview.appspot.com/6419053

git-svn-id: http://skia.googlecode.com/svn/trunk@4676 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-19 17:35:04 +00:00
borenet@google.com
855cd7aa5e Update download_baselines.py
No longer using *-fixed
Added Android
Review URL: https://codereview.appspot.com/6428047

git-svn-id: http://skia.googlecode.com/svn/trunk@4662 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-18 21:23:40 +00:00
rmistry@google.com
a8a977a97b Update docs and trunk dirs if they exist overriding any local merge conflicts.
Created to fix bug http://code.google.com/p/skia/issues/detail?id=710 :
housekeeping buildbot: conflict in UpdateDoxygen step.

git-svn-id: http://skia.googlecode.com/svn/trunk@4640 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-17 18:27:03 +00:00
keyar@chromium.org
21e3ed2e9a bench_pictures now has an option for benchmarking record time.
Review URL: https://codereview.appspot.com/6350102

git-svn-id: http://skia.googlecode.com/svn/trunk@4632 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-16 19:20:14 +00:00
epoger@google.com
2865988361 skdiff: cap return value at 255 to avoid automatic 'wrapping' (%256) of return value
Review URL: https://codereview.appspot.com/6409045

git-svn-id: http://skia.googlecode.com/svn/trunk@4629 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-16 18:01:06 +00:00
keyar@chromium.org
a2333d9703 Added pipe as a rendering option for render_pictures.
I will add tiling as a rendering option and then figure out a way to not have the code duplicated between render_pictures and bench_pictures.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4626 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-16 17:29:16 +00:00
epoger@google.com
dfbf24e5e7 skdiff: replace --failonmismatches with repeatable --failonresult option
Review URL: https://codereview.appspot.com/6392064

git-svn-id: http://skia.googlecode.com/svn/trunk@4611 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-13 21:22:02 +00:00
senorblanco@chromium.org
3cbbb543ef Mac build fix for Keyar. Unreviewed.
git-svn-id: http://skia.googlecode.com/svn/trunk@4607 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-13 18:55:53 +00:00
keyar@chromium.org
1cbd47c4b1 Preparations for adding options and different render types to render_pictures.
Review URL: https://codereview.appspot.com/6345107

git-svn-id: http://skia.googlecode.com/svn/trunk@4603 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-13 18:22:59 +00:00
keyar@chromium.org
3e8483e0de Benchmark tiling now better reflects how it is done in Chrome.
Namely, the tile backing stores are all the same size.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4602 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-13 18:15:04 +00:00
epoger@google.com
c665832fbf update-doxygen.sh: update local copy of workspace rather than checking it out fresh every time
Review URL: https://codereview.appspot.com/6346099

git-svn-id: http://skia.googlecode.com/svn/trunk@4590 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-12 23:35:28 +00:00
keyar@chromium.org
b5e30abbeb Changed cmsecs to msecs to be consistent with bench.
We are using wall time and not cpu time and so the proper name for this
should probably be outputted.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4587 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-12 21:16:49 +00:00
keyar@chromium.org
4916971526 Added a benchmark for measuring picture unflattening time.
Review URL: https://codereview.appspot.com/6354097

git-svn-id: http://skia.googlecode.com/svn/trunk@4582 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-12 19:19:55 +00:00
epoger@google.com
70044cc496 rename NO_ERROR to kNoError, because Windows defines a NO_ERROR macro elsewhere
TBR=rmistry
Review URL: https://codereview.appspot.com/6355100

git-svn-id: http://skia.googlecode.com/svn/trunk@4581 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-12 18:37:55 +00:00
epoger@google.com
46a45963fa skdiff: add --failonmismatches and --listfilename options, plus cleanup
These changes are needed in order to switch the buildbots from using "gm -r" to "skdiff" to compare gm results, and should be generally good for humans too.
Review URL: https://codereview.appspot.com/6392054

git-svn-id: http://skia.googlecode.com/svn/trunk@4579 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-12 18:16:02 +00:00
keyar@chromium.org
a4091ba864 Each benchmark that needs a bitmap will now make its own.
Before, the bitmaps were created and then passed to the benchmark. However, some benchmarks in the future will not require bitmaps. This will remove the necessity of passing around an extraneous bitmap to those tests.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4519 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-10 19:53:59 +00:00
keyar@chromium.org
0665f25b31 bench_pictures can now take percentages for tiling width and height.Review URL: https://codereview.appspot.com/6354074
Review URL: https://codereview.appspot.com/6354074

git-svn-id: http://skia.googlecode.com/svn/trunk@4516 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-10 18:30:18 +00:00
robertphillips@google.com
59f46b81f8 Fixed Windows compiler complaints
http://codereview.appspot.com/6392044



git-svn-id: http://skia.googlecode.com/svn/trunk@4511 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-10 17:30:58 +00:00
keyar@chromium.org
2724ae0bb1 bench_pictures will now output the number of tiles for a tiled benchmark.
Review URL: https://codereview.appspot.com/6387044

git-svn-id: http://skia.googlecode.com/svn/trunk@4507 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-10 15:13:21 +00:00
keyar@chromium.org
a6318194df skdiff now has the option to not print out the directories it is using.
Further, test_pictures.py will call skdiff with this option.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4497 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 21:01:50 +00:00
rmistry@google.com
bcf0c5229c * Adding arguments to specify the working directory and whether the script should try to commit at the end.
* Redirecting doxygen output to a last_run_output.txt file.
* Maintaining backwards compatibility.

Context-
This CL is a preparatory CL for the housekeeping slave. The slave will use this script to update Doxygen docs. The script will not be used to commit and instead the slave will call AddMergeIntoSvn to commit.
Review URL: https://codereview.appspot.com/6348076

git-svn-id: http://skia.googlecode.com/svn/trunk@4495 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 20:53:03 +00:00
keyar@chromium.org
70b4222344 Tiles that extend beyond the picture are now clipped.
Review URL: https://codereview.appspot.com/6352078

git-svn-id: http://skia.googlecode.com/svn/trunk@4491 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 19:51:05 +00:00
keyar@chromium.org
cf6c44cf92 Added a sgpipe benchmark.
Review URL: https://codereview.appspot.com/6349070

git-svn-id: http://skia.googlecode.com/svn/trunk@4490 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 19:37:40 +00:00
keyar@chromium.org
d1dc920097 Allow specific files and multiple inputs for picture testing tools.
Changed the render_pictures, bench_pictures and test_pictures.py so that multiple inputs can be given. Furthermore, specific files can also be specified.

Unit tests have also been added for picture_utils.cpp.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4486 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 18:32:08 +00:00
bsalomon@google.com
c0961f5d23 Rebaseline MSAA16 AA clip images. We now enable MSAA when stencil clipping if the clip element is AA.
git-svn-id: http://skia.googlecode.com/svn/trunk@4393 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-28 19:50:27 +00:00
epoger@google.com
28060e7c94 Improve sorting of skdiff output, and make it consistent across platforms
BUG=https://code.google.com/p/skia/issues/detail?id=677
Review URL: https://codereview.appspot.com/6351045

git-svn-id: http://skia.googlecode.com/svn/trunk@4388 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-28 16:47:34 +00:00
reed@google.com
006db0f1b8 land https://codereview.appspot.com/6349043/
git-svn-id: http://skia.googlecode.com/svn/trunk@4375 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-27 19:33:29 +00:00
epoger@google.com
da4af24c9c skdiff: no longer skip .pdf files by default
Review URL: https://codereview.appspot.com/6257080

git-svn-id: http://skia.googlecode.com/svn/trunk@4330 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-25 18:45:50 +00:00
twiz@google.com
6cf5303b93 Adding files skipped from previous patch: http://code.google.com/p/skia/source/detail?r=4310
Review URL: https://codereview.appspot.com/6339043/

git-svn-id: http://skia.googlecode.com/svn/trunk@4312 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-22 18:55:55 +00:00
twiz@google.com
a31b8bb58d Refactoring in preparation for adding the picture benchmarking program.
Review URL: https://codereview.appspot.com/6339043/

git-svn-id: http://skia.googlecode.com/svn/trunk@4310 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-22 18:24:56 +00:00
reed@google.com
1bdf7fe8f6 tools/pinspect: quick tool to inspeact the header (and rough validity) of 1 or more picture files
Review URL: https://codereview.appspot.com/6295085

git-svn-id: http://skia.googlecode.com/svn/trunk@4258 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-14 18:58:40 +00:00
junov@chromium.org
777442d52e Adding the render_pictures test tool
Submitted on behalf of keyar@chromium.org

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



git-svn-id: http://skia.googlecode.com/svn/trunk@4235 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-12 14:56:36 +00:00
caryclark@google.com
3dd459151f fix warnings on Mac in miscellaneous files
Fix these class of warnings:
- unused functions
- unused locals
- sign mismatch
- missing function prototypes
- missing newline at end of file
- 64 to 32 bit truncation

The changes prefer to link in dead code in the debug build
with 'if (false)' than to comment it out, but trivial cases
are commented out or sometimes deleted if it appears to be
a copy/paste error.
Review URL: https://codereview.appspot.com/6305047

git-svn-id: http://skia.googlecode.com/svn/trunk@4186 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 12:11:10 +00:00
epoger@google.com
be6188d647 skdiff: return nonzero exit value if there are any mismatches
This will allow us to replace "gm -r" in our buildbots with "skdiff".  This will speed things up, and work around http://code.google.com/p/skia/issues/detail?id=473 ('PDF gradtext gm image results are nondeterministic')
Review URL: https://codereview.appspot.com/6242071

git-svn-id: http://skia.googlecode.com/svn/trunk@4097 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-31 15:13:45 +00:00
epoger@google.com
76222c0ef2 skdiff: internally track lists of ALL result types, not just baseMissing and comparisonMissing
This does not change skdiff output at all; verified using tools/tests/run.sh
Review URL: https://codereview.appspot.com/6260057

git-svn-id: http://skia.googlecode.com/svn/trunk@4096 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-31 15:12:09 +00:00
epoger@google.com
8e4e51d69b test-only: add test coverage of skdiff over input with identical bits or pixels
Review URL: https://codereview.appspot.com/6260055

git-svn-id: http://skia.googlecode.com/svn/trunk@4084 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-30 19:12:45 +00:00
epoger@google.com
6dbf6cde3b svndiff: report added and deleted files, not just modified files
Review URL: https://codereview.appspot.com/6260052

git-svn-id: http://skia.googlecode.com/svn/trunk@4063 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-29 21:28:12 +00:00
epoger@google.com
2e0a061c09 Add svndiff tool: runs skdiff over all pending changes in SVN checkout
This is needed for 
https://goto.google.com/HowToLandSkiaChangesThatChangeWebkitLayoutTests ,
and will be generally useful beyond that too.
Review URL: https://codereview.appspot.com/6256052

git-svn-id: http://skia.googlecode.com/svn/trunk@4052 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-25 19:48:05 +00:00
epoger@google.com
0f645b68a3 download_baselines.py : only set svn properties of files whose content has changed
and while I was at it, sort the filenames before acting on them, to make the output easier to read

BUG=http://code.google.com/p/skia/issues/detail?id=618
Review URL: https://codereview.appspot.com/6223061

git-svn-id: http://skia.googlecode.com/svn/trunk@4031 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-22 19:14:01 +00:00
epoger@google.com
46256ea736 Add to skdiff: test images for bitwise equality before testing for pixel-wise equality
- we now check for bitwise equality of files before bothering with pixel 
  comparisons (this will help with formats for which we don't have good
  decoders, like PDF)
- unparsable files are now reported as differing, unless they are bitwise equal
  (before, they were always reported as matching!)
- "largest area mismatch" is now based on same-size image pairs only;
  previously, if any image pairs had mismatching size, it was 100%
- removed repetitive "image size mismatch, so no diff to display" messages
- changed format of leftmost table cells to be more readable

BUG=http://code.google.com/p/skia/issues/detail?id=473
Review URL: https://codereview.appspot.com/6208089

git-svn-id: http://skia.googlecode.com/svn/trunk@4027 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-22 13:45:35 +00:00
epoger@google.com
a611c3ea53 Remove chromium mode from skdiff, because it is no longer actively used.
Ran tools/tests/run.sh to validate this change.

TBR=caryclark1
Review URL: https://codereview.appspot.com/6222045

git-svn-id: http://skia.googlecode.com/svn/trunk@4005 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-18 20:10:06 +00:00
epoger@google.com
90cb9b325c skdiff test-only change: add test of --nodiffs mode, make tests validate return value
Review URL: https://codereview.appspot.com/6206085

git-svn-id: http://skia.googlecode.com/svn/trunk@3999 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-18 18:25:26 +00:00
epoger@google.com
a44435296a test-only change: update run.sh and rearrange dirs to ease addition of more tests
Review URL: https://codereview.appspot.com/6220044

git-svn-id: http://skia.googlecode.com/svn/trunk@3995 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-17 17:12:38 +00:00
epoger@google.com
b2aacb6dc2 test-only changes: add more image files to test more skdiff behavior
Tests output order for very vs. slightly different pixels, very vs. slightly different image sizes, etc.

TBR=tomhudson@google.com
Review URL: https://codereview.appspot.com/6213049

git-svn-id: http://skia.googlecode.com/svn/trunk@3977 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-16 18:06:54 +00:00
epoger@google.com
6600852667 skdiff: only write out diff images that are included in index.html
Not only are those files unnecessary, in some different-image-size cases, their contents are nondeterministic!
Review URL: https://codereview.appspot.com/6208073

git-svn-id: http://skia.googlecode.com/svn/trunk@3975 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-16 17:40:57 +00:00
epoger@google.com
292aff6aca Make skdiff use enumeration of result types instead of separate booleans for each result type.
This is one step on the way to a more robust version of skdiff that we can use to address http://code.google.com/p/skia/issues/detail?id=473 ('PDF gradtext gm image results are nondeterministic')

I have confirmed that skdiff results will not change, using tools/tests/run.sh.
Review URL: https://codereview.appspot.com/6208063

git-svn-id: http://skia.googlecode.com/svn/trunk@3972 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-16 14:57:28 +00:00
epoger@google.com
a2b793c4d1 Add self-test for skdiff, and remove date/time from skdiff output so it passes.
BUG=http://code.google.com/p/skia/issues/detail?id=612
Review URL: https://codereview.appspot.com/6198074

git-svn-id: http://skia.googlecode.com/svn/trunk@3938 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-15 14:58:53 +00:00
epoger@google.com
15b5167a2d Rename tests/images dir as tests/skdiff
git-svn-id: http://skia.googlecode.com/svn/trunk@3930 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-14 20:19:42 +00:00
epoger@google.com
620c3b4a9f Images for testing skdiff tool
Review URL: https://codereview.appspot.com/6208056

git-svn-id: http://skia.googlecode.com/svn/trunk@3922 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-14 15:38:57 +00:00
reed@google.com
c7a67cb57e Just use std qsort
Review URL: https://codereview.appspot.com/6195052

git-svn-id: http://skia.googlecode.com/svn/trunk@3846 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-07 14:52:12 +00:00
epoger@google.com
a5f406e998 Add new flags to skdiff
New flags are:
--nodiffs: don't write out image diffs or index.html, just generate report on stdout
--match: compare files whose filenames contain this substring; if unspecified, compare ALL files
         this flag may be repeated to add more matching substrings
--nomatch: regardless of --match, DO NOT compare files whose filenames contain this substring
           this flag may be repeated to add more forbidden substrings

Also implemented the --threshold flag, which was already documented but not implemented.
Review URL: https://codereview.appspot.com/6135045

git-svn-id: http://skia.googlecode.com/svn/trunk@3806 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-01 13:26:16 +00:00
epoger@google.com
494548b870 Land http://codereview.appspot.com/6117046/ for Guanqun.Lu@gmail.com
git-svn-id: http://skia.googlecode.com/svn/trunk@3758 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-24 15:19:23 +00:00
epoger@google.com
1610a685e0 Make download_baselines.py download *all* platforms, if none are specified.
Simplifies the Skia rebaselining process... updated the --help pages in both scripts, too.

BUG=http://code.google.com/p/skia/issues/detail?id=486
Review URL: https://codereview.appspot.com/6016045

git-svn-id: http://skia.googlecode.com/svn/trunk@3664 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-12 18:02:25 +00:00
epoger@google.com
70f8bfea3e rename compare-baselines.py and download-baselines.py using underscores instead of hyphens, as per python requirements
git-svn-id: http://skia.googlecode.com/svn/trunk@3663 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-12 17:17:59 +00:00
epoger@google.com
01f78702f1 If skdiff encounters image size mismatch, do not display diff images
Currently, if skdiff encounters images whose expected and actual dimensions do not match, it will attempt (incorrectly) to display diffs.  Better to not display the diffs at all than to display misleading diffs...
Review URL: https://codereview.appspot.com/6015049

git-svn-id: http://skia.googlecode.com/svn/trunk@3662 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-12 16:32:04 +00:00
epoger@google.com
5fd53858f8 landing patch from http://codereview.appspot.com/5874051/
git-svn-id: http://skia.googlecode.com/svn/trunk@3468 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-22 18:20:06 +00:00
epoger@google.com
db12fee829 Improve default behavior of compare-baselines script.
Now it can typically be called without any command-line arguments.
Review URL: https://codereview.appspot.com/5615057

git-svn-id: http://skia.googlecode.com/svn/trunk@3139 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-03 14:32:34 +00:00
epoger@google.com
25d961cf98 Make skdiff always generate white diffs alongside actual pixel diffs
(and some associated improvement to the output)
Review URL: https://codereview.appspot.com/5616059

git-svn-id: http://skia.googlecode.com/svn/trunk@3138 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-02 20:50:36 +00:00
epoger@google.com
afd87fe108 Delete download-baselines-old script, we don't need it anymore.
Review URL: https://codereview.appspot.com/5615047

git-svn-id: http://skia.googlecode.com/svn/trunk@3130 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-02 18:39:40 +00:00
epoger@google.com
fc241ee752 Create compare-baselines tool to compare locally generated and checked-in GMs.
Review URL: https://codereview.appspot.com/5616056

git-svn-id: http://skia.googlecode.com/svn/trunk@3128 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-02 16:49:49 +00:00
epoger@google.com
20ad5ac8f6 Change download-baselines script to download images from skia-autogen SVN repo
I have copied the old version (which downloads the images from the buildbots
directly, but only works with our Mac buildbots) to download-baselines-old,
so we can use either version during a transition period.

Another difference: the new version sets the mimetype property of all image
files in the baseline_subdir, even those that have not changed.

BUG=386
http://code.google.com/p/skia/issues/detail?id=386 ('make buildbots write out RunGM image results to a browsable directory')
Review URL: https://codereview.appspot.com/5544056

git-svn-id: http://skia.googlecode.com/svn/trunk@3058 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-17 21:26:05 +00:00
epoger@google.com
d6256557cd Add --add-new-files option to download-baselines.py script
This will allow the user to determine whether the script downloads just
updates for baselines that are already checked in, or all available baselines.

BUG=436
addresses http://code.google.com/p/skia/issues/detail?id=436 ('add "update" flag to download-baselines script')
Review URL: http://codereview.appspot.com/5523050

git-svn-id: http://skia.googlecode.com/svn/trunk@2993 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-10 14:10:34 +00:00
epoger@google.com
27442af204 Add tool that downloads gm baseline images from the bots.
Review URL: http://codereview.appspot.com/5503082

git-svn-id: http://skia.googlecode.com/svn/trunk@2937 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-29 21:13:08 +00:00
epoger@google.com
338ef6532d Make update-doxygen.sh upload docs to http://code.google.com/p/skia-autogen
(and fix mime-type propset bug)

Once this is committed, I will remove the doxygen docs from the skia repo.
Review URL: http://codereview.appspot.com/5452072

git-svn-id: http://skia.googlecode.com/svn/trunk@2824 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-07 18:52:40 +00:00
epoger@google.com
b0c5e078d8 Create update-doxygen script that generates and uploads docs
(but only causes an SVN commit if any documentation actually changed).
Review URL: http://codereview.appspot.com/5440109

git-svn-id: http://skia.googlecode.com/svn/trunk@2807 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-06 14:52:38 +00:00
tomhudson@google.com
8b08c3e152 Make skdiff robust to image size differences: if the two image sizes differ,
report that fact explicitly, record 100% pixel difference, and don't try to
generate a valid delta image.



git-svn-id: http://skia.googlecode.com/svn/trunk@2767 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-30 17:01:00 +00:00
bsalomon@google.com
8e06dabfe6 Fix more VS2010 warnings.
Review URL: http://codereview.appspot.com/5169053/



git-svn-id: http://skia.googlecode.com/svn/trunk@2432 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-07 20:03:39 +00:00
bsalomon@google.com
1a315fe57e Make skdiff paths work on windows
http://codereview.appspot.com/5111041/



git-svn-id: http://skia.googlecode.com/svn/trunk@2321 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-23 14:56:37 +00:00
tomhudson@google.com
9b540ced41 Move SkBitmap members of the skdiff DiffRecord to pointers so that they
can be deleted as soon as they're written. When we're running in --chromium
mode we now have much larger datasets.



git-svn-id: http://skia.googlecode.com/svn/trunk@2025 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-02 14:10:04 +00:00
epoger@google.com
935d94500d Script to automatically update copyright notices in C/C++ source code.
Created to implement http://codereview.appspot.com/4816058/ ('Automatic update of all copyright notices to reflect new license terms.')

We can also use this to periodically clean up our code headers.
Review URL: http://codereview.appspot.com/4800055

git-svn-id: http://skia.googlecode.com/svn/trunk@1983 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-28 14:29:58 +00:00
epoger@google.com
ec3ed6a5eb Automatic update of all copyright notices to reflect new license terms.
I have manually examined all of these diffs and restored a few files that
seem to require manual adjustment.

The following files still need to be modified manually, in a separate CL:

android_sample/SampleApp/AndroidManifest.xml
android_sample/SampleApp/res/layout/layout.xml
android_sample/SampleApp/res/menu/sample.xml
android_sample/SampleApp/res/values/strings.xml
android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java
android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java
experimental/CiCarbonSampleMain.c
experimental/CocoaDebugger/main.m
experimental/FileReaderApp/main.m
experimental/SimpleCocoaApp/main.m
experimental/iOSSampleApp/Shared/SkAlertPrompt.h
experimental/iOSSampleApp/Shared/SkAlertPrompt.m
experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig
experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig
experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig
gpu/src/android/GrGLDefaultInterface_android.cpp
gyp/common.gypi
gyp_skia
include/ports/SkHarfBuzzFont.h
include/views/SkOSWindow_wxwidgets.h
make.bat
make.py
src/opts/memset.arm.S
src/opts/memset16_neon.S
src/opts/memset32_neon.S
src/opts/opts_check_arm.cpp
src/ports/SkDebug_brew.cpp
src/ports/SkMemory_brew.cpp
src/ports/SkOSFile_brew.cpp
src/ports/SkXMLParser_empty.cpp
src/utils/ios/SkImageDecoder_iOS.mm
src/utils/ios/SkOSFile_iOS.mm
src/utils/ios/SkStream_NSData.mm
tests/FillPathTest.cpp
Review URL: http://codereview.appspot.com/4816058

git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-28 14:26:00 +00:00
tomhudson@google.com
7d04280a68 Extends skdiff to handle commands of the form
skdiff --chromium-release baseDir outputDir
  skdiff --chromium-debug baseDir outputDir
where baseDir is typically ../chromium/src.

Handles Chromium/WebKit layout tests: recursively traverses the
layout-test-results directory and compares -expected and -actual PNGs,
building a webpage showing the two images, their difference image,
and statistics, sorted by % of pixels difference. Respects all the
standard skdiff flags.

Also changes command line options named with words from starting with
a single hyphen to starting with two, falling in line with standards:
--threshold, --sortbymismatch, etc.



git-svn-id: http://skia.googlecode.com/svn/trunk@1856 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-14 13:15:55 +00:00
tomhudson@google.com
4e3059868f In skdiff, merge paths into the struct that holds the filename, to enable
1. better support reading from multiple input directories, and
2. allow filenames to differ between reference and novel images.



git-svn-id: http://skia.googlecode.com/svn/trunk@1848 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-13 17:42:46 +00:00
tomhudson@google.com
88a0e05265 Fix signed/unsigned mismatch in rev 1553.
git-svn-id: http://skia.googlecode.com/svn/trunk@1558 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-09 18:54:01 +00:00
tomhudson@google.com
9dc527bebf skdiff usability improvements: summary to stdout, -diff in output filenames,
better statistics on HTML page when using -white, output directory name is
optional.

codereview.appspot.com/4590048/


git-svn-id: http://skia.googlecode.com/svn/trunk@1553 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-09 15:47:10 +00:00
tomhudson@google.com
5b32529ab8 Stores index.html in the output (diff) directory rather than in the current
working directory.
Skips PDFs since we have no way to compare them.
Includes prototype of --weighted option to scale percent different metric by
intensity of difference at each pixel.

(qv http://codereview.appspot.com/4557042/)



git-svn-id: http://skia.googlecode.com/svn/trunk@1411 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-05-24 19:41:13 +00:00
tomhudson@google.com
4b33d28eb3 New 'skdiff' tool to compare two directories full of files, write diff images
into a third directory, and create a summary web page with metrics for easy
inspection of the results.



git-svn-id: http://skia.googlecode.com/svn/trunk@1200 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-04-27 15:39:30 +00:00
reed@android.com
fd9714e5bd add png to makefile for linux
git-svn-id: http://skia.googlecode.com/svn/trunk@551 2bbb7eff-a529-9590-31e7-b0007b416f81
2010-04-15 14:28:24 +00:00
reed@android.com
6413e79414 add skhello for simple hello-world sample code
git-svn-id: http://skia.googlecode.com/svn/trunk@539 2bbb7eff-a529-9590-31e7-b0007b416f81
2010-04-12 14:27:37 +00:00
reed@android.com
8015dd83ae almost there on gm (need to fix image writes/reads/compares)
move SkAutoGraphics into SkGraphics.h
add [] operators to SkString



git-svn-id: http://skia.googlecode.com/svn/trunk@228 2bbb7eff-a529-9590-31e7-b0007b416f81
2009-06-21 00:49:18 +00:00
reed@android.com
af459795e3 add skiamge (in tools/) that decodes and encodes images
git-svn-id: http://skia.googlecode.com/svn/trunk@160 2bbb7eff-a529-9590-31e7-b0007b416f81
2009-04-24 19:52:53 +00:00