Commit Graph

120 Commits

Author SHA1 Message Date
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