Commit Graph

3473 Commits

Author SHA1 Message Date
robertphillips@google.com
28b4bce1b1 Fix for performance regression due to r3832
http://codereview.appspot.com/6188045/



git-svn-id: http://skia.googlecode.com/svn/trunk@3840 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-04 16:34:52 +00:00
reed@google.com
c1992933f1 fix/revert the unsigned-shift change made to clamp in 3836. For clamp we want
to see the negatives, so we must have a signed shift.



git-svn-id: http://skia.googlecode.com/svn/trunk@3839 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-04 12:54:20 +00:00
djsollen@google.com
548674f69a Upstream font changes from Android repository.
Review URL: https://codereview.appspot.com/6166043

git-svn-id: http://skia.googlecode.com/svn/trunk@3838 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-04 12:03:48 +00:00
reed@google.com
0da0627646 fix fixed-point build
git-svn-id: http://skia.googlecode.com/svn/trunk@3837 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-03 20:26:06 +00:00
reed@google.com
99c114e0ac We were numerically overflowing our 16bit coordinates that we communicate
between these two procs. The fixes was in two parts:

1. Just don't draw bitmaps larger than 64K-1 in width or height, since we
   can't represent those coordinates in our transport format (yet).
2. Perform an unsigned shift during the calculation, so we don't get
   sign-extension bleed when packing the two values (X,Y) into our 32bit
   slot.
Review URL: https://codereview.appspot.com/6173046

git-svn-id: http://skia.googlecode.com/svn/trunk@3836 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-03 20:14:26 +00:00
robertphillips@google.com
7265e72555 Added "--list" command line option to SampleApp
http://codereview.appspot.com/6161043/

committed on behalf of Guanqun



git-svn-id: http://skia.googlecode.com/svn/trunk@3835 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-03 18:22:28 +00:00
robertphillips@google.com
67a6db3611 Made "Clip" sample use AA clipping
http://codereview.appspot.com/6176046/



git-svn-id: http://skia.googlecode.com/svn/trunk@3834 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-03 18:05:18 +00:00
robertphillips@google.com
180bc887f1 Disabled stencil buffer for AA clip mask
http://codereview.appspot.com/6182047/



git-svn-id: http://skia.googlecode.com/svn/trunk@3833 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-03 18:03:05 +00:00
robertphillips@google.com
1942c05e9c Fixed texture ref/unref bug in GrInOrderDrawBuffer/GrDrawState
http://codereview.appspot.com/6186043/



git-svn-id: http://skia.googlecode.com/svn/trunk@3832 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-03 17:58:27 +00:00
robertphillips@google.com
58b381841c Fix to prevent infinite recursion during AA clip mask generation
http://codereview.appspot.com/6183044/



git-svn-id: http://skia.googlecode.com/svn/trunk@3831 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-03 16:29:41 +00:00
reed@google.com
5f7c8a55ee restore extra slot in sentinal array that was removed in 3825. This extra value
is read, but not acted-upon, by spanRec.init(), and so we need to have a valid
address/slot allocated.

Caught by the remoting_unittests in chrome run using ASAN.
Review URL: https://codereview.appspot.com/6176045

git-svn-id: http://skia.googlecode.com/svn/trunk@3830 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-03 16:17:38 +00:00
epoger@google.com
58b8d4a7a8 recreate http://codereview.appspot.com/6131051/ in svn instead of git
Review URL: https://codereview.appspot.com/6181044

git-svn-id: http://skia.googlecode.com/svn/trunk@3829 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-03 14:02:17 +00:00
robertphillips@google.com
fd6daf5ed7 Added cache to gpu AA clipping
http://codereview.appspot.com/6160046/



git-svn-id: http://skia.googlecode.com/svn/trunk@3828 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 19:32:32 +00:00
robertphillips@google.com
7ff2e37185 Moved SW path rendering path back to using TU/sampler #2. This reverts r3813
http://codereview.appspot.com/6159046/



git-svn-id: http://skia.googlecode.com/svn/trunk@3827 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 19:27:44 +00:00
scroggo@google.com
16d1d0b39a Updates for SkGPipe.
Keep track of SkBitmaps which have been flattened by
the PipeWriter so we can reuse them.

Implement other flavors of drawBitmap (except
drawBitmapMatrix).

Flatten SkImageFilters in SkPaints.

Do not notify if no new data has been written.
Review URL: https://codereview.appspot.com/6128062

git-svn-id: http://skia.googlecode.com/svn/trunk@3826 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 19:09:40 +00:00
reed@google.com
9c36a76102 store x-interval-count per scanline, so we can skip lines in O(1)
Review URL: https://codereview.appspot.com/6147043

git-svn-id: http://skia.googlecode.com/svn/trunk@3825 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 18:07:33 +00:00
reed@google.com
4b5894c82d show contains and intersects predicates in sample
git-svn-id: http://skia.googlecode.com/svn/trunk@3824 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 18:03:32 +00:00
reed@google.com
26dc5b6362 always return a value
git-svn-id: http://skia.googlecode.com/svn/trunk@3823 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 17:41:13 +00:00
reed@google.com
4b4f86d34d distinguish intersects-rect from intersects-rgn
git-svn-id: http://skia.googlecode.com/svn/trunk@3822 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 17:20:02 +00:00
reed@google.com
46af7efbee renormalize some loop counts for faster tests in regions
git-svn-id: http://skia.googlecode.com/svn/trunk@3821 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 16:56:49 +00:00
reed@google.com
684119d126 add more tests for rgn::intersects(rect)
git-svn-id: http://skia.googlecode.com/svn/trunk@3820 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 16:52:12 +00:00
reed@google.com
01049d5e21 rename containsrgn to containsrect, since that is what it is testing
git-svn-id: http://skia.googlecode.com/svn/trunk@3819 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 16:45:36 +00:00
reed@google.com
7ab71baf65 add more tests around contains for rects and regions
git-svn-id: http://skia.googlecode.com/svn/trunk@3818 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 16:09:21 +00:00
robertphillips@google.com
47ab504d49 Fixed usage info for SampleApp's msaa flag
http://codereview.appspot.com/6159043/

committed on behalf of Guanqun Lu



git-svn-id: http://skia.googlecode.com/svn/trunk@3817 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 14:18:20 +00:00
djsollen@google.com
7b807cbab6 Switch memset.arm.S to unified syntax.
https://codereview.appspot.com/6108046/

git-svn-id: http://skia.googlecode.com/svn/trunk@3816 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 14:15:32 +00:00
robertphillips@google.com
a93f9c3893 converted "unsigned int" to "size_t" to address compiler failure
git-svn-id: http://skia.googlecode.com/svn/trunk@3815 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 14:05:47 +00:00
robertphillips@google.com
d9d5385791 Added GM test to stress test the texture unit/sampler allocation
http://codereview.appspot.com/6134058/



git-svn-id: http://skia.googlecode.com/svn/trunk@3814 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-02 13:55:06 +00:00
robertphillips@google.com
35d50eefbb Moved SW path rendering to new texture unit
http://codereview.appspot.com/6138057/



git-svn-id: http://skia.googlecode.com/svn/trunk@3813 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-01 17:25:37 +00:00
robertphillips@google.com
a72eef322c Added gpu AA clipping to old shader path
http://codereview.appspot.com/6139065/



git-svn-id: http://skia.googlecode.com/svn/trunk@3812 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-01 17:22:59 +00:00
djsollen@google.com
f0a062bc45 Add device to top level N-way canvas.
Review URL: https://codereview.appspot.com/6131062

git-svn-id: http://skia.googlecode.com/svn/trunk@3811 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-01 16:50:25 +00:00
djsollen@google.com
ccfee2a362 Add missing null device checks in SkCanvas
Review URL: https://codereview.appspot.com/6092056

git-svn-id: http://skia.googlecode.com/svn/trunk@3810 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-01 16:50:10 +00:00
reed@google.com
9d5f76a250 fix bug (and add test) for drawing an inverse-path whose bounds do intersect
the clip, but whose edges do not (e.g. a curve). We used to overdraw a section
(and assert).



git-svn-id: http://skia.googlecode.com/svn/trunk@3809 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-01 14:49:28 +00:00
reed@google.com
af7e6943b7 record yspancount and intervalcount in regions
Review URL: https://codereview.appspot.com/6132055

git-svn-id: http://skia.googlecode.com/svn/trunk@3808 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-01 14:43:22 +00:00
robertphillips@google.com
ed4155d610 Moved SW path renderer from GrContext.cpp to GrSoftwarePathRenderer.cpp
http://codereview.appspot.com/6138056/



git-svn-id: http://skia.googlecode.com/svn/trunk@3807 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-01 14:30:24 +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
tomhudson@google.com
b88bbd2a53 Make GrSamplerState::operator==() use GrCustomStage::isEquivalent() rather
than just bit-compare all fields.



git-svn-id: http://skia.googlecode.com/svn/trunk@3805 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-01 12:48:07 +00:00
robertphillips@google.com
7c2578d392 Second half of refactoring to move SW path rendering to GrPathRenderer
http://codereview.appspot.com/6125046/



git-svn-id: http://skia.googlecode.com/svn/trunk@3804 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-01 12:19:34 +00:00
tomhudson@google.com
02b1ea24fd Add comparison and assignment operators to GrSamplerState.
http://codereview.appspot.com/6137058/



git-svn-id: http://skia.googlecode.com/svn/trunk@3803 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-30 20:19:07 +00:00
robertphillips@google.com
443e5a52b7 Re-adding red texture support (by rolling back r3800)
http://code.google.com/p/skia/source/detail?r=3622 - for original review
http://crbug.com/125596 ('M20 windows renderer stability maze') - for issue



git-svn-id: http://skia.googlecode.com/svn/trunk@3802 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-30 20:01:21 +00:00
caryclark@google.com
a833b5c40d shape ops work in progress
git-svn-id: http://skia.googlecode.com/svn/trunk@3801 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-30 19:38:50 +00:00
epoger@google.com
0048469578 Roll back http://code.google.com/p/skia/source/detail?r=3622 to deal with http://crbug.com/125596 ('M20 windows renderer stability maze')
git-svn-id: http://skia.googlecode.com/svn/trunk@3800 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-30 19:02:08 +00:00
reed@google.com
8790fc635e add comment on return-value for SkTSearch
git-svn-id: http://skia.googlecode.com/svn/trunk@3797 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-30 17:17:21 +00:00
reed@google.com
a95ea2c518 code-style cleanups only
git-svn-id: http://skia.googlecode.com/svn/trunk@3796 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-30 16:35:25 +00:00
reed@google.com
8a0d8ff854 add tests for how empty regions should behave in intersects() and contains()
Review URL: https://codereview.appspot.com/6134053

git-svn-id: http://skia.googlecode.com/svn/trunk@3795 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-30 16:28:04 +00:00
reed@google.com
c34f53db60 just coding style fixes, no logic change
Review URL: https://codereview.appspot.com/6141043

git-svn-id: http://skia.googlecode.com/svn/trunk@3794 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-30 15:10:13 +00:00
reed@google.com
515d99840f make name lower-case, to match all other benches
git-svn-id: http://skia.googlecode.com/svn/trunk@3793 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-30 14:43:46 +00:00
reed@google.com
71937d6618 must return a value
git-svn-id: http://skia.googlecode.com/svn/trunk@3792 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-30 13:54:36 +00:00
reed@google.com
7d4aee34e2 Variant of SkRegion::op (called Oper) that either writes the result into a 3rd
region (normal mode) or does a quick-return if the result will be non-empty
(called for predicates like contains() and intersects()).

git-svn-id: http://skia.googlecode.com/svn/trunk@3791 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-30 13:29:02 +00:00
reed@google.com
6720d50d33 rebaseline
git-svn-id: http://skia.googlecode.com/svn/trunk@3790 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-30 13:24:34 +00:00
reed@google.com
fceadf0125 rebaseline
git-svn-id: http://skia.googlecode.com/svn/trunk@3789 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-30 13:22:36 +00:00