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

4199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twiz@google.com
5807116946 This CL implements the Ganesh path for the SkTable_ColorFilter color transformation. 
A new texture stage dedicated to color transforms has been added, along with the new custom stage implementing the LUT.
Review URL: https://codereview.appspot.com/6351081

git-svn-id: http://skia.googlecode.com/svn/trunk@4663 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-18 21:41:50 +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
junov@chromium.org
fbe9c8fbb8 Adding virtual overload of isDrawingToLayer() to SkGPipe 
This change is to make The SkGPipe port of SkDeferredCanvas pass the CanvasTest unit test
Review URL: https://codereview.appspot.com/6426046

git-svn-id: http://skia.googlecode.com/svn/trunk@4661 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-18 20:22:52 +00:00
senorblanco@chromium.org
1e95d715d0 Clean up the use of AutoScratchTexture in the gaussian blur and morphology 
filters.  Instead of passing in AutoScratchTextures for temporaries, we allocate
them inside the function and detach() after rendering.  Since the functions now
return a ref()'ed texture, we no longer ref() the result in filter_texture().

Also, the imageblur gm was passing a paint with an image filter both to
saveLayer()/restore(), and to every text draw call.  Back when only restore()
was applying filters, this was fine, but since we're now applying filters on all
draw calls, this means we're double-blurring in this GM.

I've reverted the Mac baselines for the imageblur GM to their previous versions;
hopefully this will be correct.



git-svn-id: http://skia.googlecode.com/svn/trunk@4659 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-18 19:52:53 +00:00
vandebo@chromium.org
7f1ffa6b42 Add SK_API for SkData. Needed for https://bugs.webkit.org/show_bug.cgi?id=91171 
Review URL: https://codereview.appspot.com/6420047

git-svn-id: http://skia.googlecode.com/svn/trunk@4658 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-18 18:53:28 +00:00
bsalomon@google.com
f2f8fc3726 Fix grdrawstate == test when left side has disabled stage and right side does not 
Review URL: http://codereview.appspot.com/6427044/



git-svn-id: http://skia.googlecode.com/svn/trunk@4657 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-18 18:25:07 +00:00
junov@chromium.org
77eec248cb Refactoring SkDeferredCanvas to use SkGPipe. 
Keeping the refactor hidden behind a config macro for now.

TEST=covered by existing skia gm tests
BUG=https://code.google.com/p/chromium/issues/detail?id=133432
Review URL: https://codereview.appspot.com/6405054

git-svn-id: http://skia.googlecode.com/svn/trunk@4656 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-18 17:54:45 +00:00
epoger@google.com
9d250762cb whitespace change to trigger Skia buildbots after master update/restart 
git-svn-id: http://skia.googlecode.com/svn/trunk@4654 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-18 15:13:30 +00:00
borenet@google.com
7ef392940d Enable Compile Option to Build Android Executables 
Since we can't debug APKs on 4.1, we sometimes need to
build Skia the old way for Android.  This CL enables
a switch to do so.
Review URL: https://codereview.appspot.com/6408053

git-svn-id: http://skia.googlecode.com/svn/trunk@4653 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-18 14:59:54 +00:00
reed@google.com
d074c3709a Need to apply matrix to advance in generateAdvance (as we already were in generateMetrics) 
Fixes b/6833339
Expand existing unittest to detect this (we needed to set both scale and skew on the paint)



git-svn-id: http://skia.googlecode.com/svn/trunk@4647 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-18 13:45:58 +00:00
bsalomon@google.com
ecb60aad5c Factory method for creating GrGLProgram 
Review URL: http://codereview.appspot.com/6407049/



git-svn-id: http://skia.googlecode.com/svn/trunk@4646 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-18 13:20:29 +00:00
robertphillips@google.com
5836b6dec5 Add skipToLast method to SkClipStack 
http://codereview.appspot.com/6411043/



git-svn-id: http://skia.googlecode.com/svn/trunk@4644 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-18 12:06:15 +00:00
alokp@chromium.org
f7751ae229 Exported SkFILEWStream class so that it can be used in Chrome. 
Review URL: https://codereview.appspot.com/6409052

git-svn-id: http://skia.googlecode.com/svn/trunk@4643 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-17 19:10:36 +00:00
tomhudson@google.com
57143a2d87 Fix build breakage in r4641. 
Unreviewed.



git-svn-id: http://skia.googlecode.com/svn/trunk@4642 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-17 19:07:35 +00:00
tomhudson@google.com
2f68e7684b Move texture domains onto a GrCustomStage, off of GrSamplerState. 
This will require gyp changes to roll into Chrome.

http://codereview.appspot.com/6405050/



git-svn-id: http://skia.googlecode.com/svn/trunk@4641 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-17 18:43:21 +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
scroggo@google.com
4dffc596aa Use SkFlatDictionary in SkGPipe to take advantage of its new features. 
Add a controller class to perform the allocation/unallocation for the dictionary and to provide an entry to be replaced, if replacements are allowed.

TODO:
Use LRU caching in my custom controller so replacements will be done less often.
More refactoring on SkFlatDictionary so picture recording's use of the dictionary does not require going through the path to replace.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4639 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-17 16:49:40 +00:00
scroggo@google.com
284bf502c0 Purge bitmaps from SkGPipe's shared heap. 
BitmapInfo:
Now in SkGPipePriv so it can be accessed by SkGPipeRead.

Add the ability to essentially ref count BitmapInfos so that they can
be purged to make room in the shared heap for a new one.

SkGPipeWrite:
Purge the least recently used bitmap if it has already been drawn by
all readers.

SkGPipeRead:
Read the BitmapInfo (instead of the SkBitmap) and decrement its count
after drawing.

SkGPipeController:
Added a method to tell how many readers will be used, so that when
purging bitmaps each reader can be accounted for.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4638 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-17 16:10:34 +00:00
chudy@google.com
7e4cfbf144 Added more features to deletes and breakpoints 
Review URL: https://codereview.appspot.com/6406050

git-svn-id: http://skia.googlecode.com/svn/trunk@4637 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-17 15:40:51 +00:00
robertphillips@google.com
2a021292f5 Fixed simpleaaclip gm - it wasn't showing xor case 
http://codereview.appspot.com/6402055/

This CL will require image rebaselining



git-svn-id: http://skia.googlecode.com/svn/trunk@4636 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-17 15:37:15 +00:00
reed@google.com
e9fdfb545d remove Symbian (not needed) flag, and assume all CPUs *except* thumb have fast 
conditional instructions.



git-svn-id: http://skia.googlecode.com/svn/trunk@4635 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-17 12:13:56 +00:00
robertphillips@google.com
c029062a03 Fixed two sub-optimal iterator uses 
http://codereview.appspot.com/6409048/



git-svn-id: http://skia.googlecode.com/svn/trunk@4633 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-16 21:20: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
robertphillips@google.com
52cb2c7cdf Extended SkDeque's reverse iteration capability to SkClipStack 
http://codereview.appspot.com/6409046/



git-svn-id: http://skia.googlecode.com/svn/trunk@4631 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-16 18:52:29 +00:00
chudy@google.com
e504de0a50 Cleaned up icons, added keyboard shortcuts to everything 
Keyboard Shortcuts and Menu reordering

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4630 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-16 18:35:23 +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
bsalomon@google.com
33c1f6b47b Fix test break in r4627. 
git-svn-id: http://skia.googlecode.com/svn/trunk@4628 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-16 17:54:26 +00:00
bsalomon@google.com
9ba4fa6f0f Remove GrGLProgram::CachedData, make GrGLProgram represent the program 
Review URL: http://codereview.appspot.com/6409043/



git-svn-id: http://skia.googlecode.com/svn/trunk@4627 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-16 17:36:28 +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
robertphillips@google.com
2e41becaa9 fix for non-Windows-specific compiler error in r4624 
git-svn-id: http://skia.googlecode.com/svn/trunk@4625 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-16 17:19:21 +00:00
robertphillips@google.com
0a78b0f4a2 Refactor SkDeque's iterator and allocation method 
http://codereview.appspot.com/6353098/



git-svn-id: http://skia.googlecode.com/svn/trunk@4624 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-16 16:58:49 +00:00
scroggo@google.com
50ccb0a738 Add a skia method to perform an atomic add. 
Complements sk_atomic_inc for when you want to increase by more than one.

This time, use the correct atomic add function on Windows.

Reviewed at https://codereview.appspot.com/6399050/

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4623 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-16 16:51:28 +00:00
reed@google.com
70d1be5f94 land http://codereview.appspot.com/6325044/ by Lei 
git-svn-id: http://skia.googlecode.com/svn/trunk@4622 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-16 16:07:42 +00:00
epoger@google.com
5e504ff4aa Delete 5 stale gm expected images 
- complexclip_gpu.png is no longer being generated
- aaclip_pdf.pdf and clamped_gradients_pdf.pdf have not been exercised and need rebaselining
Review URL: https://codereview.appspot.com/6405048

git-svn-id: http://skia.googlecode.com/svn/trunk@4620 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-16 14:56:37 +00:00
bsalomon@google.com
187c15c847 Fix bad allocator access in r4616 
git-svn-id: http://skia.googlecode.com/svn/trunk@4619 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-16 14:16:22 +00:00
junov@chromium.org
4e6dfa5152 Adding bracketing save/restore calls to SkPicture at record time and 
preparing tests for enforcing save/restore balancing constraints on SkPicture

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



git-svn-id: http://skia.googlecode.com/svn/trunk@4618 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-16 14:04:59 +00:00
bsalomon@google.com
ec4037f773 Fix fs param name in conical gradient due to r4616. 
git-svn-id: http://skia.googlecode.com/svn/trunk@4617 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-16 13:46:39 +00:00
bsalomon@google.com
032b221dad Remove uniform var pointers from custom effects 
Review URL: http://codereview.appspot.com/6374067/



git-svn-id: http://skia.googlecode.com/svn/trunk@4616 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-16 13:36:18 +00:00
scroggo@google.com
96cbd2c4d2 Revert "Add a method to atomic add." 
This reverts commit eb539cf92f487daf9567ffbbba6b6653406d43ae.

BUG=
TEST=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4615 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-16 13:22:56 +00:00
scroggo@google.com
e3f84f3911 Add a skia method to perform an atomic add. 
Complements sk_atomic_inc for when you want to increase by more than one.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4614 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-16 13:13:29 +00:00
tomhudson@google.com
fde2c0af2f Having updated the documentation of GrCustomStage to argue that all custom stages must be 
immutable, this CL makes that true for ConvolutionEffect.

http://codereview.appspot.com/6398043/



git-svn-id: http://skia.googlecode.com/svn/trunk@4613 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-16 12:23:32 +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
caryclark@google.com
0e08a19367 shape ops work in progress 
git-svn-id: http://skia.googlecode.com/svn/trunk@4610 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-13 21:07:52 +00:00
vandebo@chromium.org
238be8c7e5 [PDF] Add link annotations. 
Review URL: https://codereview.appspot.com/6346100

git-svn-id: http://skia.googlecode.com/svn/trunk@4609 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-13 20:06:02 +00:00
tomhudson@google.com
e742bf0ab1 Start removing calls to GrDrawState::setTexture() (and GrPaint::setTexture()?) when there's 
a GrSingleTextureEffect involved holding the texture.

http://codereview.appspot.com/6353094/



git-svn-id: http://skia.googlecode.com/svn/trunk@4608 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-13 19:54:19 +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
b630c6c8b7 Updated make_filepath test to reflect changes in picture_utils. TBR 
Review URL: https://codereview.appspot.com/6350105

git-svn-id: http://skia.googlecode.com/svn/trunk@4606 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-13 18:43:39 +00:00
senorblanco@chromium.org
f4770d7e84 There were three different problems with lighting filters: 
1)  Texture offsets (fImageIncrement) have to be signed depending on
whether the texture is "right way up" (texture upload) or "upside down"
(render target), so the surface normals were coming out upside down.
2)  Light normals have to y-negated on upload
These two bugs were cancelling each other out in SampleApp, (where we
were testing w/textures) but not in Chrome (where we were testing
w/render targets).
3)  The extract-the-height-from-the-view-matrix hack I was using to
compare light positions vs. gl_FragCoord doesn't work in Chrome where we
compile with GR_STATIC_RECT_VB, and the view matrix contains more than
the viewport transform (to accomodate the canonical vertex buffer).
Fixed by passing the destination render target to
GrGLProgramStage::setData(), so it can flip the light positions in Y on
the CPU.

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



git-svn-id: http://skia.googlecode.com/svn/trunk@4605 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-13 18:25:06 +00:00
reed@google.com
ac8fe134de add baselines for new gm 
git-svn-id: http://skia.googlecode.com/svn/trunk@4604 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-13 18:24:16 +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