AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,084 Commits 1 Branch 0 Tags 544 MiB
30efb8a94f
Commit Graph

5084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
scroggo@google.com
30efb8a94f Do not do PNG encoding/decoding when testing picture serialization. 
Fixes the build.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5819 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-04 22:02:46 +00:00
scroggo@google.com
5a7c6be72b Add the ability to provide function pointers to SkPicture serialization 
and deserialization for encoding and decoding bitmaps.

Remove kForceFlattenBitmapPixels_Flag, which is no longer used.

When an SkOrderedReadBuffer needs to read a bitmap, if it does not
have an image decoder, use a dummy bitmap.

In GM, add a tolerance option for color differences, used when
testing picture serialization, so it can assume two images are the
same even though PNG encoding/decoding may have resulted in small
differences.

Create dummy implementations for SkImageDecoder and SkImageEncoder
functions in SkImageDecoder_empty so that a project that does not
want to include the images project it can still build.

Allow ports to build without images project.

In Mac's image encoder, copy 4444 to 8888 before encoding.

Add SkWriter32::reservePad, to provide a pointer to write non 4 byte
aligned data, padded with zeroes.

In bench_ and render_ pictures, pass decode function to SkPicture
creation from a stream.

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5818 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-04 21:46:08 +00:00
scroggo@google.com
94bc60f986 Lock gFTMutex when modifying FT globals. 
This prevents a crash when running bench_pictures with multiple threads.

Also remove an unused function and fix a typo in SkFontHost.
Review URL: https://codereview.appspot.com/6625043

git-svn-id: http://skia.googlecode.com/svn/trunk@5816 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-04 20:45:06 +00:00
bsalomon@google.com
d5d69ffaea Add convenience function on GrDrawState to set state bit based on a bool. 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6615044

git-svn-id: http://skia.googlecode.com/svn/trunk@5815 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-04 19:42:00 +00:00
senorblanco@chromium.org
9f7827fcd9 Build fix: work around what appears to be an Intel GLSL driver bug. Unreviewed. 
git-svn-id: http://skia.googlecode.com/svn/trunk@5812 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-04 18:15:15 +00:00
robertphillips@google.com
837ec432cc Fixed bug(s) in batching of rects 
https://codereview.appspot.com/6608043/



git-svn-id: http://skia.googlecode.com/svn/trunk@5811 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-04 17:57:05 +00:00
bsalomon@google.com
7823d9a07f Disable SK_DEBUG_PATH_REF in debug builds. 
R=reed@google.com
Review URL: https://codereview.appspot.com/6602056

git-svn-id: http://skia.googlecode.com/svn/trunk@5810 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-04 17:55:30 +00:00
senorblanco@chromium.org
3bc16c8bc1 Implement GPU path for matrix convolution. Note that when not convolving alpha, 
the premultiplying is done less efficiently than in the raster path:  it's
done on each texture access, rather than as a pre-processing pass.   This was
so I could do the filter as a single custom stage; will try the optimization
separately.

This implementation gives a ~30X speedup on the GPU results for the
matrixconvolution bench (~10X due to the GPU, and ~3X due to texture
uploads/readback removal).

Note:  this changes the matrixconvolution for the software path as well, so
it will likely break the bots until that test is rebaselined.

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



git-svn-id: http://skia.googlecode.com/svn/trunk@5809 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-04 17:18:20 +00:00
epoger@google.com
3fc070cfce Change default skia_osx_sdkroot to "macosx" (suitable for Xcode 3.2.6+) 
See https://codereview.appspot.com/6553044
BUG=https://code.google.com/p/skia/issues/detail?id=796
Review URL: https://codereview.appspot.com/6598055

git-svn-id: http://skia.googlecode.com/svn/trunk@5806 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-04 14:50:18 +00:00
bsalomon@google.com
e6e62d1de9 Make numTextures() be non-virtual on GrCustomStage. 
R=tomhudson@google.com,robertphillips@google.com,senorblanco@chromium.org
Review URL: https://codereview.appspot.com/6586081

git-svn-id: http://skia.googlecode.com/svn/trunk@5805 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-04 14:38:48 +00:00
bsalomon@google.com
73d5b2f620 Omit shader swizzle if it is rgba. 
R=robertphilips@google.com
Review URL: https://codereview.appspot.com/6585082

git-svn-id: http://skia.googlecode.com/svn/trunk@5804 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-04 13:26:32 +00:00
robertphillips@google.com
c7e4a5a02a Created filter command line tool 
https://codereview.appspot.com/6595066/



git-svn-id: http://skia.googlecode.com/svn/trunk@5803 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-04 13:00:33 +00:00
bsalomon@google.com
4663822bc9 Allow Xcode to change paths to frameworks based on whether a device or simulator was selected. 
R=caryclark@google.com
Review URL: https://codereview.appspot.com/6590068

git-svn-id: http://skia.googlecode.com/svn/trunk@5802 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-04 12:52:03 +00:00
skia.committer@gmail.com
7cc7f49479 Sanitizing source files in Skia_Periodic_House_Keeping 
git-svn-id: http://skia.googlecode.com/svn/trunk@5798 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-04 02:01:34 +00:00
bsalomon@google.com
3a80991b81 Ensure SkPathRef debug code mutex is initialized during creation of statically-initialized SkPaths. 
R=reed@google.com
Review URL: https://codereview.appspot.com/6592069

git-svn-id: http://skia.googlecode.com/svn/trunk@5797 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-03 21:37:30 +00:00
bsalomon@google.com
c6445a17ab Make it possible to generate the ios xcode proj by specifying only skia_os="ios" in GYP_DEFINES. 
R=caryclark@google.com,epoger@google.com
Review URL: https://codereview.appspot.com/6601051

git-svn-id: http://skia.googlecode.com/svn/trunk@5796 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-03 20:58:26 +00:00
reed@google.com
1ba274d9f3 revert 5794 
git-svn-id: http://skia.googlecode.com/svn/trunk@5795 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-03 20:40:38 +00:00
reed@google.com
4837724a7e add test for rotated saveLayer, to see that we clip against the specified bounds 
(hint: we don't at the moment)



git-svn-id: http://skia.googlecode.com/svn/trunk@5794 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-03 20:17:22 +00:00
bsalomon@google.com
ae09f2dc3f Adds extra debugging to SkPathRef that can optionally be turned on in a release build. 
This is pretty hacky but hopefully will be quite short-lived.
Review URL: https://codereview.appspot.com/6584074

git-svn-id: http://skia.googlecode.com/svn/trunk@5793 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-03 19:57:01 +00:00
bsalomon@google.com
2fc2359aaa Fix test_small_segments3 path measure test. 
Review URL: https://codereview.appspot.com/6601050

git-svn-id: http://skia.googlecode.com/svn/trunk@5792 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-03 19:10:31 +00:00
scroggo@google.com
b6e806bf17 Allow render_pictures to render using multiple threads. 
Make write() a static function so it can be used by the
thread entry functions.

Add a helper function to append a number to a string and
call write to share code.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5789 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-03 17:32:33 +00:00
bsalomon@google.com
1dfe88e00a Revert r5557 (which itself was a revert of r5433). Relands SkPathRef. Will follow with change for extra debug checks to attempt to ferret out http://www.crbug.com/148637. 
git-svn-id: http://skia.googlecode.com/svn/trunk@5783 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-03 13:46:20 +00:00
robertphillips@google.com
924352685d Added bench to replicate Google spreadsheet-style table drawing 
https://codereview.appspot.com/6593076/



git-svn-id: http://skia.googlecode.com/svn/trunk@5782 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-03 13:25:13 +00:00
bungeman@google.com
4f45258d45 Delete SkStream_Win.h as it appears to never have been used. 
https://code.google.com/p/skia/issues/detail?id=281


git-svn-id: http://skia.googlecode.com/svn/trunk@5781 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-03 04:46:10 +00:00
skia.committer@gmail.com
52c2437c73 Sanitizing source files in Skia_Periodic_House_Keeping 
git-svn-id: http://skia.googlecode.com/svn/trunk@5780 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-03 02:01:13 +00:00
caryclark@google.com
868e1f682e fix return value for render_pictures 
Review URL: https://codereview.appspot.com/6590049

git-svn-id: http://skia.googlecode.com/svn/trunk@5779 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-02 20:00:03 +00:00
caryclark@google.com
ae75d25d88 Oops, forgot a file 
Review URL: https://codereview.appspot.com/6593064

git-svn-id: http://skia.googlecode.com/svn/trunk@5777 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-02 18:43:49 +00:00
caryclark@google.com
5987f58036 build iOS with 'make all' 
This builds all skia tests by treating iOS tools
as executable applications. A few warnings were
fixed as well.

Removed old trace draw code and remnants.
Review URL: https://codereview.appspot.com/6597063

git-svn-id: http://skia.googlecode.com/svn/trunk@5776 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-02 18:33:14 +00:00
reed@google.com
425a8c71e4 add getSeed() 
git-svn-id: http://skia.googlecode.com/svn/trunk@5775 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-02 17:51:29 +00:00
reed@google.com
21b519d56f catch empty stack in restorefixup called by clipRect 
write stress-test for save/clip/restore peephole optimization



git-svn-id: http://skia.googlecode.com/svn/trunk@5774 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-02 17:42:15 +00:00
reed@google.com
a3301b6d15 reenable peephole optimization for save/clip/restore, with build flag 
SK_DISABLE_PICTURE_PEEPHOLE_OPTIMIZATION to disable it (optional)



git-svn-id: http://skia.googlecode.com/svn/trunk@5770 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-02 15:54:26 +00:00
bungeman@google.com
43b4ed5b0c xcode_settings OTHER_CPLUSPLUSFLAGS is a list. 
https://codereview.appspot.com/6588062/


git-svn-id: http://skia.googlecode.com/svn/trunk@5769 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-02 15:42:21 +00:00
bsalomon@google.com
2b64f84b4b Add SkNativeGLContext implementation for iOS. 
R=caryclark@google.com
Review URL: https://codereview.appspot.com/6589055

git-svn-id: http://skia.googlecode.com/svn/trunk@5767 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-02 15:25:12 +00:00
senorblanco@chromium.org
4e3875348b When processing a morphology filter on the GPU, pass the processed texture, 
not the original source texture.

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



git-svn-id: http://skia.googlecode.com/svn/trunk@5766 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-02 14:24:22 +00:00
bungeman@google.com
8d25eb138a Roll gyp to 1509 for ninja compatibility. 
https://codereview.appspot.com/6588059/


git-svn-id: http://skia.googlecode.com/svn/trunk@5765 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-02 13:40:30 +00:00
robertphillips@google.com
ce9dce0d81 Fixed canvas creation in SampleApp 
https://codereview.appspot.com/6588061/



git-svn-id: http://skia.googlecode.com/svn/trunk@5764 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-02 12:32:22 +00:00
robertphillips@google.com
8fdb4c16a1 Fixed memory leak in bitmaprect GM 
https://codereview.appspot.com/6593058/



git-svn-id: http://skia.googlecode.com/svn/trunk@5763 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-02 11:47:16 +00:00
skia.committer@gmail.com
dc3a4e5fa8 Sanitizing source files in Skia_Periodic_House_Keeping 
git-svn-id: http://skia.googlecode.com/svn/trunk@5762 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-02 02:01:24 +00:00
reed@google.com
5957f47e8d retool so we don't need to call SkCanvas::setDevice 
Review URL: https://codereview.appspot.com/6591054

git-svn-id: http://skia.googlecode.com/svn/trunk@5759 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-01 20:31:56 +00:00
scroggo@google.com
b4773b4802 Fix some bugs in our picture tools. 
When doing tiled rendering in multiple threads, clone fPicture,
rather than the blank fPictureClones. Also fix a precedence
problem so we get the correct rectangle.

In render_pictures_main, call PictureRenderer::setup().

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5758 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-01 20:06:09 +00:00
bsalomon@google.com
c58b126623 Move android gl files from src/gpu/android to src/gpu/gl/android. 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6590051

git-svn-id: http://skia.googlecode.com/svn/trunk@5757 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-01 19:06:57 +00:00
bsalomon@google.com
17a595a1ae Use setDevice rather than the removed setBitmapDevice. 
R=reed@google.com
Review URL: https://codereview.appspot.com/6588057

git-svn-id: http://skia.googlecode.com/svn/trunk@5756 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-01 19:06:09 +00:00
robertphillips@google.com
03f1ecd4d9 Fix for typo in r5754 
unreviewed



git-svn-id: http://skia.googlecode.com/svn/trunk@5755 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-01 18:49:00 +00:00
robertphillips@google.com
ccb3950409 Speculative render target ref/unref fixes 
https://codereview.appspot.com/6592051/



git-svn-id: http://skia.googlecode.com/svn/trunk@5754 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-01 18:25:13 +00:00
reed@google.com
7ec0015ec3 delete obsolete/unused SkGpuCanvas 
git-svn-id: http://skia.googlecode.com/svn/trunk@5752 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-01 18:06:05 +00:00
reed@google.com
44a42ea8b2 1. remove references to (deprecated) SkGpuCanvas 
2. remove references to setDevice (soon to be deprecated)
Review URL: https://codereview.appspot.com/6597055

git-svn-id: http://skia.googlecode.com/svn/trunk@5751 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-01 17:54:05 +00:00
tfarina@chromium.org
0ab7c77a2c Add moc generated files to .gitignore. 
So that git status is clean again.

R=tomhudson@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5750 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-01 16:39:06 +00:00
tfarina@chromium.org
887760f60b views: Fix a typo in SkEvent.h 
WndProc is not implemented by unix/linux and does not even compile fixing the
typoe, so just remove these function declarations.

R=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@5749 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-01 16:14:21 +00:00
bsalomon@google.com
6ac79dc9da Change the ios sample app name. 
Review URL: https://codereview.appspot.com/6597053

git-svn-id: http://skia.googlecode.com/svn/trunk@5748 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-01 15:39:22 +00:00
junov@google.com
52a00cac51 Adding virtual method to SkDeferredCanvas::NotificationClient for signaling when commands are skipped due to the skip on clear optimization. 
TEST=DeferredCanvas unit test
BUG=http://code.google.com/p/chromium/issues/detail?id=116840 
Review URL: https://codereview.appspot.com/6590050

git-svn-id: http://skia.googlecode.com/svn/trunk@5747 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-01 15:27:14 +00:00