Commit Graph

4967 Commits

Author SHA1 Message Date
caryclark@google.com
976298edd7 unbreak the build
move define of skia_arch_type to front

git-svn-id: http://skia.googlecode.com/svn/trunk@5650 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-24 19:41:43 +00:00
caryclark@google.com
594dd3cd78 iOS support work in progress
include/core/SkTypes.h
- address unsigned warning

include/core/SkInstCnt.h
src/core/SkInstCnt.cpp
gyp/common.gypi
- always define SK_ENABLE_INST_COUNT for debug builds

src/views/mac/SkNSView.mm
- only call glClear if there is a GL context

src/ports/SkImageDecoder_CG.cpp
- fix iOS hack by using proper include

gyp/opts.gyp
- exclude more ARM files from iOS for now (see issue 900)

gyp/common_conditions.gypi
- add release, more ios specific common settings

gyp/bench.gyp
- add iOS condition

gyp/SampleApp.gyp
- remove precompiled header, hardcoded SDK path
- add more frameworks

gyp/debugger.gyp
- fix syntax error
- add iOS/Android condition

gyp/core.gyp
- remove hardcoded SDK path, add more frameworks

gyp/common_variables.gypi
- add ios SDK path
- add ios SDK version

gyp/iOSSampleApp.gyp
- remove obsolete project

gyp/zlib.gyp
- add ios library path
Review URL: https://codereview.appspot.com/6551070

git-svn-id: http://skia.googlecode.com/svn/trunk@5649 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-24 19:33:57 +00:00
robertphillips@google.com
cdb426d55a Fix for GrTextureStripAtlas memory leak
https://codereview.appspot.com/6549050/



git-svn-id: http://skia.googlecode.com/svn/trunk@5648 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-24 19:33:59 +00:00
robertphillips@google.com
5b5bba36dc Addressed xcode analysis complaints
http://codereview.appspot.com/6558048/



git-svn-id: http://skia.googlecode.com/svn/trunk@5646 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-24 14:20:00 +00:00
borenet@google.com
56072f9ecc Whitespace change to trigger rebuild after tweaking Windows build slaves
git-svn-id: http://skia.googlecode.com/svn/trunk@5645 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-24 13:16:52 +00:00
scroggo@google.com
977e6626af When recording a GM to a picture, pass the GM's size to beginRecording.
Review URL: https://codereview.appspot.com/6552047

git-svn-id: http://skia.googlecode.com/svn/trunk@5644 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-21 19:12:32 +00:00
scroggo@google.com
a0c2bc2438 Make flattenables no longer depend on global static initializers.
Instead, force all builds to call InitializeFlattenables.

Remove the make_debugger script, which was created to force
rebuilding without global static initializers so that all flattenables
would be linked. It is no longer necessary since all flattenables
will be linked thanks to InitializeFlattenables, which now can (and
must) be called when global static initializers are turned on.

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5642 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-21 17:54:46 +00:00
vandebo@chromium.org
251a7667d2 [PDF] Fix name generation - / needs to be escaped.
BUG=chromium 148422

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5641 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-21 17:50:50 +00:00
reed@google.com
8136d58161 check for very large blurs, and don't try to cache the result in fontcache
http://code.google.com/p/chromium/issues/detail?id=138208



git-svn-id: http://skia.googlecode.com/svn/trunk@5640 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-21 17:38:06 +00:00
reed@google.com
c544325fdb disable experiemental hack to try to speedup floor
git-svn-id: http://skia.googlecode.com/svn/trunk@5636 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-21 12:15:13 +00:00
skia.committer@gmail.com
4c5ea44803 Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@5635 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-21 02:01:01 +00:00
junov@chromium.org
a38dfb6981 Adding hasPendingCommands API method to SkDeferredCanvas
BUG=http://code.google.com/p/chromium/issues/detail?id=146178
Review URL: https://codereview.appspot.com/6550050

git-svn-id: http://skia.googlecode.com/svn/trunk@5632 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-20 22:10:33 +00:00
borenet@google.com
d2002d2a23 Whitespace change to trigger a bot cycle after r5630
git-svn-id: http://skia.googlecode.com/svn/trunk@5631 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-20 22:05:27 +00:00
junov@chromium.org
eeaf47f638 Fixing how deferred canvas purges itself when a clear is recoreded.
This fixes performance because the old code was not reconstructing the clip
state correctly. This was causing a major performance degradation in the 
Galactic IE testdrive demo. This fix also enbles the purge
on clear optimization when there is saved state on the matrix/clip stack.
The approach taken to solve the problem consists in purging by running the
playback silently. The previous approach was tearing down and
restarting the gpipe, which required reconstructing state, which is fragile
and hard to do correctly, and has the side effect of clearing the bitmap heap
and the flattened dictionary.

Note: This CL is expected to slightly degrade performance of the 
deferred_canvas_record bench, which uses the skip on clear optimization.
This is because a silent playback takes more time that just destroying
the SkGPipe. Correctness trumps performance.

BUG=http://code.google.com/p/chromium/issues/detail?id=146178
Review URL: https://codereview.appspot.com/6531048

git-svn-id: http://skia.googlecode.com/svn/trunk@5627 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-20 20:42:44 +00:00
junov@chromium.org
fb10389403 Adding a silent playback option to SkGPipeRead
Testing state consistency after silent playback in CanvasTest indirectly
through SkDeferredCanvas.

BUG=http://code.google.com/p/chromium/issues/detail?id=146178
TEST=CanvasTest unit test, and bench with --mode deferredSilent
Review URL: https://codereview.appspot.com/6542047

git-svn-id: http://skia.googlecode.com/svn/trunk@5619 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-20 19:35:43 +00:00
robertphillips@google.com
84d320e258 Got debugger compiling again after SkCanvas API change
http://codereview.appspot.com/6543047/



git-svn-id: http://skia.googlecode.com/svn/trunk@5616 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-20 19:09:17 +00:00
senorblanco@chromium.org
c5e1ed8752 Prevent LinearRegression from dividing by zero so the GenerateBenchGraphs step doesn't blow up if the data is all zeroes.
http://codereview.appspot.com/6546049/



git-svn-id: http://skia.googlecode.com/svn/trunk@5615 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-20 19:05:33 +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
borenet@google.com
dc12b62bb9 Update bench_expectations
We only have three runs since the regression was fixed in r5605:
153.68, 154.09, 153.71

These bounds seem reasonable to me.
Review URL: https://codereview.appspot.com/6541049

git-svn-id: http://skia.googlecode.com/svn/trunk@5613 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-20 18:52:10 +00:00
reed@google.com
af777278c5 remove use of SkRefPtr in public header (SkPDFDocument.h)
Review URL: https://codereview.appspot.com/6546048

git-svn-id: http://skia.googlecode.com/svn/trunk@5612 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-20 18:19:26 +00:00
reed@google.com
52657c75b5 remove unused parameter (that also slowed us down) to SkAutoTDelete
git-svn-id: http://skia.googlecode.com/svn/trunk@5611 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-20 18:04:12 +00:00
senorblanco@chromium.org
cc9471c36d Fix premul alpha problems w/matrix convolution filter, and re-enable the bench.
http://codereview.appspot.com/6541043/



git-svn-id: http://skia.googlecode.com/svn/trunk@5610 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-20 17:59:49 +00:00
reed@google.com
fc641d09e5 remove all SkRefPtr from SkPDFDevice.h
Review URL: https://codereview.appspot.com/6542049

git-svn-id: http://skia.googlecode.com/svn/trunk@5609 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-20 17:52:20 +00:00
senorblanco@chromium.org
bc5cbfe4ed Pull SDKROOT into a gyp variable, so it can be locally overridden. This
allows building on Lion or Mountain Lion using XCode 4.4.

http://codereview.appspot.com/6553044/



git-svn-id: http://skia.googlecode.com/svn/trunk@5607 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-20 16:10:02 +00:00
caryclark@google.com
867cbd8bc2 first cut at making iOS work
Replace __arm__ with SK_CPU_ARM
add support for iOS simulator and device
fix const warning in iOSSampleApp
update gyp files

https://code.google.com/p/skia/issues/detail?id=900
tracks fixing missing arm assembly
Review URL: https://codereview.appspot.com/6552045

git-svn-id: http://skia.googlecode.com/svn/trunk@5606 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-20 15:45:41 +00:00
bsalomon@google.com
db545aec72 Fix GrTextureAccess::operator ==
compare the textures, correctly intepret memcmp result, don't compare last byte of swizzle array which must be 0.

BUG=895
Review URL: https://codereview.appspot.com/6542048

git-svn-id: http://skia.googlecode.com/svn/trunk@5605 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-20 15:37:30 +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
senorblanco@chromium.org
b4ca9df976 Yet another speculative Android fix. Unreviewed.
git-svn-id: http://skia.googlecode.com/svn/trunk@5600 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-19 22:50:21 +00:00
junov@chromium.org
0a67f964b3 Renaming a couple methods in SkDeferredCanvas.cpp to improve readability
Review URL: https://codereview.appspot.com/6536060

git-svn-id: http://skia.googlecode.com/svn/trunk@5599 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-19 22:48:34 +00:00
senorblanco@chromium.org
bc55a3c1c1 Speculative fix for Android GMs. Unreviewed.
git-svn-id: http://skia.googlecode.com/svn/trunk@5598 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-19 22:40:54 +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
reed@google.com
2a006c1127 begin to skiafy PDF headers : removing use of SkRefPtr
Review URL: https://codereview.appspot.com/6526050

git-svn-id: http://skia.googlecode.com/svn/trunk@5596 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-19 17:05:55 +00:00
borenet@google.com
9ec51dd605 Whitespace change to trigger a rebuild after removing bad bench data from r5592
This should stop the failures from GenerateBenchGraphs

git-svn-id: http://skia.googlecode.com/svn/trunk@5595 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-19 12:32:06 +00:00
skia.committer@gmail.com
c1ad022608 Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@5594 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-19 02:01:47 +00:00
senorblanco@chromium.org
79723f9826 Unreviewed; build fix.
Disable matrixconvolution bench until I can figure out the
premul issues.



git-svn-id: http://skia.googlecode.com/svn/trunk@5593 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 20:44:01 +00:00
senorblanco@chromium.org
5faa2dc266 Implements a matrix convolution filter (raster path only). The filtering loop
is templated on the tiling mode for speed:  interior pixels are unconditionally
fetched; border pixels apply the appropriate tiling mode before fetching.  It
handles target, bias, divisor (as gain), and edge modes (named to be more
skia-like).  It does not handle the "preserveAlpha" semantics of
feConvolveMatrix, nor "kernelUnitLength".



git-svn-id: http://skia.googlecode.com/svn/trunk@5592 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 20:32:34 +00:00
caryclark@google.com
d1688744d5 shape ops work in progress
at least 12M of the quad/quad intersection tests pass

git-svn-id: http://skia.googlecode.com/svn/trunk@5591 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 20:08:37 +00:00
george@mozilla.com
ec0aa764eb Explicitly convert from int to SkScalar to avoid a compiler error on gcc 4.5
Review URL: https://codereview.appspot.com/6526047

git-svn-id: http://skia.googlecode.com/svn/trunk@5589 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 19:05:48 +00:00
robertphillips@google.com
972bfc4944 Fix for r5587 compiler error (removed ../src/gpu in HashCacheTest.cpp)
git-svn-id: http://skia.googlecode.com/svn/trunk@5588 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 17:30:47 +00:00
robertphillips@google.com
3b57dedc4b Added functor to GrTHashCache to allow discovery of un-reffed resources
http://codereview.appspot.com/6503126/



git-svn-id: http://skia.googlecode.com/svn/trunk@5587 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 17:16:33 +00:00
caryclark@google.com
35f5ac9738 update gyp files to build on iOS
Note that there's a hack in SkImageDecoder_CG.cpp --
the necessary defines are included directly. This
is temporary until I can figure out how to include
them properly.
Review URL: https://codereview.appspot.com/6523044

git-svn-id: http://skia.googlecode.com/svn/trunk@5586 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 15:41:18 +00:00
reed@google.com
7112173c3c re-re-land 5578
will follow w/ new .skp files to keep the waterfall green (I hope)



git-svn-id: http://skia.googlecode.com/svn/trunk@5584 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 15:14:33 +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
bsalomon@google.com
1ce49fc917 Move GrTextureParams from GrSamplerState to GrTextureAccess
Review URL: https://codereview.appspot.com/6496135/



git-svn-id: http://skia.googlecode.com/svn/trunk@5582 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 14:14:49 +00:00
reed@google.com
10f9f4a844 revert 5580
git-svn-id: http://skia.googlecode.com/svn/trunk@5581 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 14:04:54 +00:00
reed@google.com
eab16dea1c re-land 5578 w/ pipe fix
git-svn-id: http://skia.googlecode.com/svn/trunk@5580 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 13:47:20 +00:00
reed@google.com
c75c36a14b revert 5578 -- broke pipe
git-svn-id: http://skia.googlecode.com/svn/trunk@5579 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 13:20:52 +00:00
reed@google.com
f1ab723033 Change drawBitmapRect to take a float-src-rect instead of integer-src-rect. This
allows the client more control over the scaling. Because of virtual overrides
and wanting to keep the old call-sites up and running, this CL renames the
virtual entry-point to drawBitmapRectToRect, and downgrades drawBitmapRect to
a non-virtual helper function.

The implementation is to use the float-rect for computing the matrix, but still
cons-up an integer rect for the purposes of subsetting the original bitmap. We
do this by calling float_src->roundOut(&int_src) so that we include all
(partially) covered src pixels.

No change needed on SkDevice, since that signature is explicitly passed the
computed matrix.
Review URL: https://codereview.appspot.com/6501140

git-svn-id: http://skia.googlecode.com/svn/trunk@5578 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 12:59:44 +00:00
skia.committer@gmail.com
54339a826e Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@5577 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-18 02:01:09 +00:00