AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,504 Commits 1 Branch 0 Tags 544 MiB
d51ea26ea1
Commit Graph

4504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bsalomon@google.com
1c31f63323 Remove texture/mask setters on GrPaint 
Review URL: http://codereview.appspot.com/6446052/



git-svn-id: http://skia.googlecode.com/svn/trunk@4790 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-26 19:39:06 +00:00
chudy@google.com
ea5488b965 GL Widget Alpha 
Review URL: https://codereview.appspot.com/6422060

git-svn-id: http://skia.googlecode.com/svn/trunk@4789 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-26 19:38:22 +00:00
robertphillips@google.com
beb1af78d0 Altered Ganesh's clip stack plumbing to pass down new GrClipData class 
http://codereview.appspot.com/6454047/



git-svn-id: http://skia.googlecode.com/svn/trunk@4788 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-26 18:52:16 +00:00
robertphillips@google.com
cc6493bbef Added ctor to SkClipStack and isEmpty method 
http://codereview.appspot.com/6444048/



git-svn-id: http://skia.googlecode.com/svn/trunk@4787 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-26 18:39:13 +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
reed@google.com
9364511bd1 reject any paths that are not finite. 
git-svn-id: http://skia.googlecode.com/svn/trunk@4785 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-26 16:11:47 +00:00
reed@google.com
0bb18bb264 explicitly track if a path is finite or not 
we need this (it appears) so we can definitively reject non-finite paths
in canvas, before passing them down into the guts.
Review URL: https://codereview.appspot.com/6453047

git-svn-id: http://skia.googlecode.com/svn/trunk@4784 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-26 15:20:36 +00:00
borenet@google.com
904160772e Whitespace change to trigger rebuild after slave script modifications 
git-svn-id: http://skia.googlecode.com/svn/trunk@4783 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-26 15:14:57 +00:00
reed@google.com
ae57c17abe rebaseline after gpu changes 
git-svn-id: http://skia.googlecode.com/svn/trunk@4781 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-26 14:55:46 +00:00
djsollen@google.com
56f8f338b6 Revert "Remove Bitmaps Raw Pixel Support." 
BUG=
TEST=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4780 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-26 14:48:52 +00:00
borenet@google.com
84d6715153 Implementing Color32 functions for Neon platforms. 
Besides the raw processing improvement provided by Neon, the code uses memory
preteches (pld) which seem to improve performance greatly when dealing with
very large counts.

This was tested using bench where color32 accounts for the majority of the
workload:
bench -match rects_1 -config 8888 -repeat 500 -forceBlend 1
(the forceBlend is there so that the Color32 code does not go through the
special cases where alpha == 0xFF as it would transform color32 into
a sk_memset32.

Numbers averaged over 3 runs:
bench name      | Before | Neon, no pld | Neon with pld | full boost
rrects_1        | 153.9  | 128.3        | 92            | 1.66x
rects_1_stroke_4| 32.8   | 31.4         | 28.45         | 1.15x
rects_1         | 125.35 | 97.2         | 63.59         | 1.97x

Credits: various googletv team members.

Committed on behalf of evannier.
Review URL: http://codereview.appspot.com/5569077/

git-svn-id: http://skia.googlecode.com/svn/trunk@4779 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-26 14:20:13 +00:00
bsalomon@google.com
eb9568a13d Fix reversed bilerp setting in GrTextContext in r4773 
Review URL: http://codereview.appspot.com/6455044/


git-svn-id: http://skia.googlecode.com/svn/trunk@4778 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-26 14:12:23 +00:00
skyostil@google.com
0b7ad989b4 Correctly calculate remaining span length in Neon fallback blitter 
In the non-Neon optimized fallback in SCALE_NOFILTER_NAME() the pixels
are first processed in groups of 4, followed by the final remaining 0-3
pixels depending on the span length.

Currently the remaining span length (0-3) pixels is incorrectly
calculated as count - count / 4. This generally causes the function to
access outside the bounds of the input and/or output bitmaps.

The correct formula is count % 4, because all the full multiples of 4
pixels have been processed and only the remainder remains.

Bug spotted by Xianzhu Wang.

TEST=None, because this part of the code isn't actually even being compiled due
to the !defined(__ARM_HAVE_NEON) guard at the top of the file. It was compiled
in by mistake in Chrome for Android, which is how this bug was spotted.
Review URL: https://codereview.appspot.com/6441050

git-svn-id: http://skia.googlecode.com/svn/trunk@4777 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-26 12:19:26 +00:00
bsalomon@google.com
b8670998a5 Move filter/wrap out of GrSamplerState into GrTextureParams 
Review URL: http://codereview.appspot.com/6440046/




git-svn-id: http://skia.googlecode.com/svn/trunk@4773 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-25 21:27:09 +00:00
caryclark@google.com
cc90505674 shape ops work in progress 
git-svn-id: http://skia.googlecode.com/svn/trunk@4771 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-25 20:59:42 +00:00
bsalomon@google.com
777c3aab0a Remove uniform names from top of GrGLProgram.cpp, builder responsible for "u" and stage num tags. 
Also add LF eol-style property to some files in src/gpu/effects.

Review URL: http://codereview.appspot.com/6448049/



git-svn-id: http://skia.googlecode.com/svn/trunk@4770 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-25 20:58:20 +00:00
junov@chromium.org
09640d6bac Fixing canvas writePixels malfunctioning with SkDeferredCanvas with SkGPipe backend and GPU rendering 
BUG=http://code.google.com/p/chromium/issues/detail?id=138935
Review URL: https://codereview.appspot.com/6450045

git-svn-id: http://skia.googlecode.com/svn/trunk@4769 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-25 20:09:37 +00:00
george@mozilla.com
b1047839e0 Use CGToScalar instead of SkFloatToScalar as CGFloat can be either double or float. 
Review URL: https://codereview.appspot.com/6451049

git-svn-id: http://skia.googlecode.com/svn/trunk@4766 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-25 19:16:49 +00:00
george@mozilla.com
ece0100c22 Fix SK_OVERRIDE for various versions of clang 
BUG=
TEST=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4765 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-25 19:05:43 +00:00
george@mozilla.com
79c865a5c8 Ensure that all GNU-based systems are considered to be UNIX 
Original Mozilla bug: https://bugzilla.mozilla.org/show_bug.cgi?id=749533

R=reed1
BUG=
TEST=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4763 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-25 18:52:56 +00:00
rileya@google.com
185cd5d05a Rebaseline for single pixel radial gradient change caused by r4755. 
git-svn-id: http://skia.googlecode.com/svn/trunk@4762 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-25 18:15:54 +00:00
bsalomon@google.com
bfb459d880 Disable unused uniform assert due to texture matrices being crammed down stage's throats 
git-svn-id: http://skia.googlecode.com/svn/trunk@4761 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-25 18:13:32 +00:00
bsalomon@google.com
b9119a6b56 Fix static assert on non-windows compilers(?) 
git-svn-id: http://skia.googlecode.com/svn/trunk@4759 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-25 17:55:26 +00:00
bsalomon@google.com
dbbc4e2da9 Add GL uniform manager 
Review URL: http://codereview.appspot.com/6423066/



git-svn-id: http://skia.googlecode.com/svn/trunk@4758 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-25 17:48:39 +00:00
junov@chromium.org
b10a6bd0a7 Refactoring how SkDeferredCanvas manages mutable bitmaps 
This CL makes the SkGPipe flavor of SkDeferredCanvas properly
decide whether to flush or record mutable bitmaps.  The flushing
is now managed by conditionally switching the canvas to non-deferred
mode, which avoids an unnecessary transient copy of the bitmap.

BUG=http://code.google.com/p/chromium/issues/detail?id=137884
TEST=DeferredCanvas unit test, sub test TestDeferredCanvasMemoryLimit
Review URL: https://codereview.appspot.com/6421060

git-svn-id: http://skia.googlecode.com/svn/trunk@4756 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-25 17:27:13 +00:00
rileya@google.com
91f319c5dc Use asNewCustomStage instead of asABitmap in SkGpuDevice, also removed now-unecessary twoPointRadialParams parameter from asABitmap. 
In SkGpuDevice we still fall back on using asABitmap for effects that don't have asNewCustomStage implemented, but it still simplifies things a fair amount.
Review URL: https://codereview.appspot.com/6430060

git-svn-id: http://skia.googlecode.com/svn/trunk@4755 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-25 17:18:31 +00:00
bungeman@google.com
0567f222b9 Add SkScalarPow. 
git-svn-id: http://skia.googlecode.com/svn/trunk@4754 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-25 17:00:47 +00:00
bungeman@google.com
7cf0e9e555 Prevent MipMaps from crashing. 
git-svn-id: http://skia.googlecode.com/svn/trunk@4753 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-25 16:09:10 +00:00
borenet@google.com
de9ac1446c Fix Android build for new toolchain 
The new toolchain (r8b) does not automatically include
the necessary directories
(http://code.google.com/p/android/issues/detail?id=35279).
Add them manually until this is fixed.
Review URL: https://codereview.appspot.com/6419076

git-svn-id: http://skia.googlecode.com/svn/trunk@4749 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-25 15:17:03 +00:00
reed@google.com
bba65d9a5e experimental only 
git-svn-id: http://skia.googlecode.com/svn/trunk@4748 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-25 14:42:15 +00:00
caryclark@google.com
18063441c2 shape ops work in progress 
git-svn-id: http://skia.googlecode.com/svn/trunk@4746 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-25 12:05:18 +00:00
robertphillips@google.com
4c2a2f7c5e Added isIntersectionOfRects to SkClipStack 
http://codereview.appspot.com/6434050/



git-svn-id: http://skia.googlecode.com/svn/trunk@4745 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-24 22:07:50 +00:00
tomhudson@google.com
dcba4c2cc3 Use GrMemoryPool to manage GrCustomStage allocations. 
Improve memory reclamation of GrMemoryPool for new/delete/new/delete pattern.

http://codereview.appspot.com/6438046/



git-svn-id: http://skia.googlecode.com/svn/trunk@4744 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-24 21:36:16 +00:00
bungeman@google.com
6e502fe067 Fix Android build broken due to changes in r4741. 
git-svn-id: http://skia.googlecode.com/svn/trunk@4743 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-24 21:18:54 +00:00
scroggo@google.com
dd39488997 Avoid a loop in writeString and writePad by zeroing padding first. 
Also add a benchmark to time the new improved writeString. Before
my change the bench took ~1.23ms and afterwards it takes ~.95ms.

Add some testing to ensure that writePad works properly.

TEST=Writer32Test, WriterBench

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4742 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-24 20:47:55 +00:00
bungeman@google.com
bbe5013141 Split SkGlyph into its own header. 
https://codereview.appspot.com/6434049/


git-svn-id: http://skia.googlecode.com/svn/trunk@4741 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-24 20:33:21 +00:00
borenet@google.com
0dc9ba4c31 Revert r4671 
Add deleted giantbitmap images after fix of 718.
Review URL: https://codereview.appspot.com/6425065

git-svn-id: http://skia.googlecode.com/svn/trunk@4740 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-24 18:32:14 +00:00
borenet@google.com
83a3dd9064 Revert r5667 
Add deleted giantbitmap images back after fix of #718
Review URL: https://codereview.appspot.com/6431065

git-svn-id: http://skia.googlecode.com/svn/trunk@4739 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-24 18:28:23 +00:00
robertphillips@google.com
b99225c92b Added requires_AA method to GrClipMaskManager.cpp to replace GrClip capability 
http://codereview.appspot.com/6422062/



git-svn-id: http://skia.googlecode.com/svn/trunk@4738 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-24 18:20:10 +00:00
caryclark@google.com
afe56de636 shape ops work in progress 
git-svn-id: http://skia.googlecode.com/svn/trunk@4737 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-24 18:11:03 +00:00
bsalomon@google.com
8f4fdc9968 Fix npot bitmap tiling 
Review URL: http://codereview.appspot.com/6419073/



git-svn-id: http://skia.googlecode.com/svn/trunk@4736 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-24 17:59:01 +00:00
bungeman@google.com
0eec2d0486 Remove SkSfntUtils, as it is not longer used. 
git-svn-id: http://skia.googlecode.com/svn/trunk@4735 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-24 17:50:25 +00:00
bungeman@google.com
aa8483b49d SkSfntUtils should use public types. 
git-svn-id: http://skia.googlecode.com/svn/trunk@4734 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-24 17:34:41 +00:00
tomhudson@google.com
1bb4be2384 Fix TableColorFilter memory leak. 
http://codereview.appspot.com/6437045/



git-svn-id: http://skia.googlecode.com/svn/trunk@4733 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-24 17:24:21 +00:00
robertphillips@google.com
2a4a49e79f Rebaselining to address r4730 (using SkClipStack's bound) 
http://codereview.appspot.com/6431064/



git-svn-id: http://skia.googlecode.com/svn/trunk@4732 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-24 16:29:52 +00:00
bungeman@google.com
6fccbd1e56 SkTextBox to use public interfaces for line layout. 
https://codereview.appspot.com/6438044/


git-svn-id: http://skia.googlecode.com/svn/trunk@4731 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-24 16:08:45 +00:00
robertphillips@google.com
607fe077c8 Added bound computation to SkClipStack 
http://codereview.appspot.com/6419048/

This will require re-baselining of complexclip* and filltypespersp



git-svn-id: http://skia.googlecode.com/svn/trunk@4730 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-24 13:54:00 +00:00
reed@google.com
7866228f06 land http://codereview.appspot.com/6353063/ by Lei 
optimizations for D16 using SSE2

skia_bench -config 565 -match bitmap_8888_scale_filter -forceFilter 1 -repeat
30

The result I got on Android platform was below:

w/o this optimization routine: 
D/skia    ( 1868): running bench [640 480]     bitmap_8888_scale_filter
D/skia    ( 1868):    565: cmsecs = 286.50

w/ with optimization:
D/skia    ( 1463): running bench [640 480]     bitmap_8888_scale_filter
D/skia    ( 1463):    565: cmsecs = 186.80

The net gain is 34.80%.



git-svn-id: http://skia.googlecode.com/svn/trunk@4729 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-24 13:53:23 +00:00
tomhudson@google.com
060ef18d5c Replace new with SkNEW in more effects classes. 
http://codereview.appspot.com/6431052/



git-svn-id: http://skia.googlecode.com/svn/trunk@4727 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-24 12:22:40 +00:00
caryclark@google.com
e21cb18c52 shape ops work in progress 
git-svn-id: http://skia.googlecode.com/svn/trunk@4726 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-23 21:26:31 +00:00