41b8687417
Include SkTypes before using ifdefs.
...
Fixes Android framework build.
When building for the Android framework, we depend on SkUserConfig.h
to define things like SK_SUPPORT_GPU. So we cannot have the first
include inside a guard requring SK_SUPPORT_GPU to be defined. Include
SkTypes first, which will pull in SkUserConfig, define the flag, and
allow us to include GrContextFactory.h.
R=reed@google.com , djsollen@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/394533003
2014-07-14 10:25:01 -07:00
24b04fa2ad
Alphabetize defines in generated SkUserConfig.
...
When generating SkUserConfig.h for Android, alphabetize the defines.
This will make one merge much harder to look at, but every following
one much easier.
R=mtklein@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/388693003
2014-07-14 10:22:02 -07:00
837f5321a4
Fix for saveLayer() with filters vs. the BBox Hierarchy.
...
When building acceleration structures for SkPicture, we must transform
the primitive's bounds not only by its own SkPaint, but by the paints of
any saveLayer()s currently active above it.
We do this by pushing the SkPaint onto a stack on
saveLayer(), and popping them on restore(). We also push
a NULL paint in save(), so that the pushes and pops are
balanced.
BUG=skia:2734
R=mtklein@google.com , reed@google.com , robertphillips@google.com
Committed: https://skia.googlesource.com/skia/+/6ca0b6a46cbe9bef3e2b9b9db813ec864efd62de
Author: senorblanco@chromium.org
Review URL: https://codereview.chromium.org/380373003
2014-07-14 10:19:55 -07:00
3b72f79289
remove unused SkPixelRef constructor
...
TBR=
Author: reed@google.com
Review URL: https://codereview.chromium.org/390893002
2014-07-14 10:13:57 -07:00
ed458688e2
remove SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE code
...
TBR=
Author: reed@google.com
Review URL: https://codereview.chromium.org/387313004
2014-07-14 09:21:31 -07:00
e322482f4d
Move SkPDFStream back to SkStream to save memory.
...
SkPDFStream stores data as a SkStreamRewindable to minimize
deep duplication and memory overhead.
SkStreamToStreamRewindable function to deal with fact that
SkTypeface returns a SkStream.
BUG=skia:2743
R=djsollen@google.com , mtklein@google.com , bungeman@google.com , reed@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/387863005
2014-07-14 09:12:12 -07:00
9c6878be37
Revert of Enable the SSSE3 compile time check on all platforms. ( https://codereview.chromium.org/391693004/ )
...
Reason for revert:
windows fail
Original issue's description:
> Enable the SSSE3 compile time check on all platforms.
>
> BUG=skia:2746
>
> Committed: https://skia.googlesource.com/skia/+/ee349531446ae2a8336b0903e05d0b2150d2131f
R=mtklein@google.com , djsollen@google.com
TBR=djsollen@google.com , mtklein@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2746
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/390063002
2014-07-14 08:32:18 -07:00
c07e2811dd
Revert "Fix for saveLayer() with filters vs. the BBox Hierarchy." and
...
"resizeimagefiler is ok with a BBH now".
This reverts commits 6ca0b6a46c8fa73202eaR=mtklein@google.com , robertphillips@google.com
TBR=mtklein, robertphillips
BUG=skia:
Author: senorblanco@chromium.org
Review URL: https://codereview.chromium.org/381353005
2014-07-14 08:25:34 -07:00
ee34953144
Enable the SSSE3 compile time check on all platforms.
...
BUG=skia:2746
R=mtklein@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/391693004
2014-07-14 07:58:42 -07:00
55d316eaba
Remove last SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX.
...
Should have been included in https://codereview.chromium.org/379323002
but it was overlooked. As of that CL, the flag does not do anything.
BUG=skia:1976
R=reed@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/390033002
2014-07-14 07:58:34 -07:00
e8464994bb
Make SkPictureShader and SkPictureImageFilter use const SkPictures
...
R=mtklein@google.com , reed@google.com
TBR=reed@google.com
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/390023002
2014-07-14 07:53:27 -07:00
7e4b2b5027
Remove unused kImageIsOpaque_Flag.
...
This flag is never set or read. We now look at the alpha type to
determine opacity.
R=reed@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/385943003
2014-07-14 07:53:18 -07:00
6336f7c225
MIPS: added optimization for SkRGB16_Opaque_Blitter::blitMask
...
gaint is ~30%
R=djsollen@google.com
Author: djordje.pesut@imgtec.com
Review URL: https://codereview.chromium.org/357693002
2014-07-14 07:48:11 -07:00
cef04f8188
Deleted SkImage::newShaderClamp: not used, not implemented.
...
Implemented SkImage::newShader.
BUG=skia:2701, 344804
R=junov@chromium.org , reed@chromium.org , bsalomon@chromium.org , reed@google.com
Author: piotaixr@chromium.org
Review URL: https://codereview.chromium.org/345463009
2014-07-14 07:48:04 -07:00
4fdba1cec4
Reallow default SkPicture constructor for Chromium
...
This is breaking the Chromium build in:
external/chromium_org/android_webview/browser/browser_view_renderer.cc
TBR=reed@google.com
Review URL: https://codereview.chromium.org/392593002
2014-07-14 09:28:15 -04:00
c4f30b1074
Make GrAtlas::removePlot static
...
This CL just calves off a small chunk of (Add atlased layer purging - https://codereview.chromium.org/367073002/ ).
R=jvanverth@google.com
TBR=jvanverth@google.com
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/388103002
2014-07-13 10:09:42 -07:00
cfaeec446d
Remove Skia's use of the default SkPicture constructor and multi-clone
...
This cannot be landed until (Chrome: Switch to one-at-a-time SkPicture::clone interface - https://codereview.chromium.org/380323002/ ) has landed.
R=mtklein@google.com
TBR=reed@google.com
Review URL: https://codereview.chromium.org/388833003
2014-07-13 12:00:50 -04:00
dd528967fc
Remove SkPicture copy constructor
...
Given where we're heading with SkPicture why would you need to make a copy?
R=reed@google.com , mtklein@google.com
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/381133002
2014-07-13 07:55:53 -07:00
b184f7f52b
Add SkBitmap::readPixels() and reimplement copyTo and SkCanvas::readPixels
...
This reverts commit 651eaeadebreed@chromium.org
Review URL: https://codereview.chromium.org/390693002
2014-07-13 04:32:32 -07:00
00adc751e7
don't draw unpremul alpha (yet)
...
without these early exits, we can treat unpremul colors as premul, generating asserts and wacky colors.
TBR=
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/386203002
2014-07-12 21:10:52 -07:00
651eaeadeb
Revert of Add SkBitmap::readPixels() and reimplement copyTo and SkCanvas::readPixels ( https://codereview.chromium.org/388803007/ )
...
Reason for revert:
still failing (randomly?) bench sometimes. need stack dump to diagnose.
Original issue's description:
> Add SkBitmap::readPixels() and reimplement copyTo and SkCanvas::readPixels
> usning it.
>
> Revert "Revert of add readPixels() to SkBitmap (https://codereview.chromium.org/377303002/ )"
>
> This reverts commit d08cb905a7TBR=scroggo@google.com
>
> Committed: https://skia.googlesource.com/skia/+/debba5c3d091159149f8a88ab5dcd44dd72e0dc7
R=reed@google.com
TBR=reed@google.com
NOTREECHECKS=true
NOTRY=true
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/382543005
2014-07-12 13:16:10 -07:00
debba5c3d0
Add SkBitmap::readPixels() and reimplement copyTo and SkCanvas::readPixels
...
usning it.
Revert "Revert of add readPixels() to SkBitmap (https://codereview.chromium.org/377303002/ )"
This reverts commit d08cb905a7R=reed@chromium.org
TBR=scroggo@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/388803007
2014-07-12 12:26:36 -07:00
fb747e2c74
Make SkPDFFont::fFontInfo a const pointer.
...
BUG=skia:2742
R=djsollen@google.com , scroggo@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/383063007
2014-07-11 19:45:23 -07:00
733f5f5dbc
Refactor SkGrFontScaler and SkGrFontKey into non-virtual versions.
...
This is a pre-cleanup for another change, but has the side benefit of making
the code simpler in general.
No perf increase, despite removing virtual functions.
R=bsalomon@google.com , egdaniel@google.com
Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/385263002
2014-07-11 19:45:16 -07:00
93de7a27e0
fix ios break
...
R=reed@android.com
TBR=reed
NOTREECHECKS=TRUE
NOTRY=TRUE
BUG=skia:
Author: caryclark@google.com
Review URL: https://codereview.chromium.org/388933003
2014-07-11 13:21:17 -07:00
d41dab43e6
Revert of Add support for NEON intrinsics to speed up texture compression. We can ( https://codereview.chromium.org/390453002/ )
...
Reason for revert:
Breaking chrome.
Original issue's description:
> Add support for NEON intrinsics to speed up texture compression. We can
> now convert the time that we would have spent uploading the texture to
> compressing it giving a net 50% memory savings for these things.
>
> Committed: https://skia.googlesource.com/skia/+/bc9205be0a1094e312da098348601398c210dc5a
R=robertphillips@google.com , mtklein@google.com , kevin.petit@arm.com
TBR=kevin.petit@arm.com , mtklein@google.com , robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
Author: krajcevski@google.com
Review URL: https://codereview.chromium.org/384053003
2014-07-11 13:15:15 -07:00
1b0aa001e8
No need to cache local matrix in picture shader.
...
Now that the local matrix cannot be changed, we no longer need
to keep track of it to regenerate the bitmap shader.
Depends on https://codereview.chromium.org/379323002
R=fmalita@google.com , fmalita@chromium.org
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/387043002
2014-07-11 12:19:02 -07:00
936b73424f
ios fixes
...
skia_ios.mm
Get the app's Documents directory and pass use it to set the resource path.
This is a quick hack which will be replaced by a new application that is
a tiny shim around a command line tool.
SkImageEncoder.h
SkForceLinking.cpp
SkImageDecoder_CG.cpp
Add support for FORCE_LINKING so iOS sees the PNG encoder and others.
SkFloatBits.cpp
SkPoint.cpp
Handle denormalized numbers that are floored by the iOS ARM processor.
SkImageDecoder_iOS.mm
Remove empty encoder factory.
SkTouchGesture.cpp
Return early on empty state on touch rather than aborting (crashing)
JpegTest.cpp
Hal via stackoverflow.com says partial jpegs can be gray as well.
skia_test.cpp
Remove crash handler call for now to avoid link failure.
OverwriteLine.h
Remove fancy line overwrite for iOS.
Resources.cpp
Add interface to set resource directory based on runtime query.
BUG=skia:2736 skia:2737 skia:2738
R=reed@google.com , halcanary@google.com , mtklein@google.com , tfarina@chromium.org
Author: caryclark@google.com
Review URL: https://codereview.chromium.org/373383003
2014-07-11 12:14:51 -07:00
bc9205be0a
Add support for NEON intrinsics to speed up texture compression. We can
...
now convert the time that we would have spent uploading the texture to
compressing it giving a net 50% memory savings for these things.
R=robertphillips@google.com , mtklein@google.com , kevin.petit@arm.com
Author: krajcevski@google.com
Review URL: https://codereview.chromium.org/390453002
2014-07-11 12:12:27 -07:00
5d9d10e821
nanobench: add a cute bar chart
...
Give this a try? Helpful, or gets in the way?
BUG=skia:
R=krajcevski@google.com , mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/390483002
2014-07-11 11:57:07 -07:00
ef0fd61dc2
Remove SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX.
...
This is no longer needed by Android.
BUG=skia:1976
R=reed@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/379323002
2014-07-11 11:33:52 -07:00
8fa73202ea
resizeimagefiler is ok with a BBH now
...
BUG=skia:
R=senorblanco@chromium.org , mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/387933002
2014-07-11 11:27:01 -07:00
fa04776d3a
Use unpremul for premul_and_unpremul_alpha_ bench.
...
Using the wrong color type resulted in invalid colors.
R=bsalomon@google.com , reed@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/382243005
2014-07-11 10:45:11 -07:00
c870d494dd
Use SkShader's localMat for SkLocalMatrixShader.
...
Instead of setting SkShader::fLocalMatrix to Identity and storing
a separate SkMatrix inside SkLocalMatrixShader, reuse
SkShader::fLocalMatrix.
R=reed@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/386693003
2014-07-11 10:42:12 -07:00
b02ab4b47b
New Mac 10.6 x86_64 Debug baselines for perlin noise tests.
...
R=jcgregorio@google.com
TBR=jcgregorio@google.com
NOTRY=true
NOTREECHECKS=true
BUG=skia:
Author: senorblanco@chromium.org
Review URL: https://codereview.chromium.org/384043002
2014-07-11 10:09:02 -07:00
848faf00ec
This moves us towards variable length effect keys. The overall program key now allows for it. After the header it stores an array of offsets to effect keys. This allows us to grab the effect keys to pass to effects when they generate code. It also ensures that we can't get a collision by sets of keys that are different lengths but are the same when appended together.
...
R=robertphillips@google.com , jvanverth@google.com , egdaniel@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/356513003
2014-07-11 10:01:02 -07:00
6ca0b6a46c
Fix for saveLayer() with filters vs. the BBox Hierarchy.
...
When building acceleration structures for SkPicture, we must transform
the primitive's bounds not only by its own SkPaint, but by the paints of
any saveLayer()s currently active above it.
We do this by pushing the SkPaint onto a stack on
saveLayer(), and popping them on restore(). We also push
a NULL paint in save(), so that the pushes and pops are
balanced.
BUG=skia:2734
R=mtklein@google.com , reed@google.com
Author: senorblanco@chromium.org
Review URL: https://codereview.chromium.org/380373003
2014-07-11 09:56:03 -07:00
c855ca0c94
Revert of Remove gpu shader optimatization for solid white or trans black colors ( https://codereview.chromium.org/375823005/ )
...
Reason for revert:
possible test and gm failures
Original issue's description:
> Remove gpu shader optimatization for solid white or trans black colors
>
> Running test on the added bench which draws a grid of all white paths, all blue paths, or alternating checkered white/blue paths.
>
> With optimization in (ms):
> White Blue Checkered
> Linux ~80 ~80 ~160
> N7 ~800 ~1100 ~1500
> Moto-e ~830 ~1100 ~2500
>
> Without optimization in (ms):
> White Blue Checkered
> Linux ~80 ~80 ~80
> N7 ~1100 ~1100 ~1100
> Moto-e ~1100 ~1100 ~1500
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/5f78d2251a440443c9eaa321dad058d7a32bfef7
R=bsalomon@google.com
TBR=bsalomon@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/385163004
2014-07-11 09:13:37 -07:00
c9af44add0
Revert of Remove public_headers.gypi, unneeded by Skia. ( https://codereview.chromium.org/381633003/ )
...
Reason for revert:
Breaking canary: http://108.170.220.120:10117/builders/Canary-Chrome-Ubuntu13.10-Ninja-x86_64-ToT/builds/1207/steps/Update/logs/stdio
Original issue's description:
> Remove public_headers.gypi, unneeded by Skia.
>
> This file not needed by Skia, and is almost always out of date.
> We recommend generating this inside Android WebView, where it is
> used. Generating it is relatively straightforward; here is one way:
> https://codereview.chromium.org/198063002/diff/110001/platform_tools/android/gyp_gen/gen_public_headers.py
>
> BUG=skia:2350
>
> Committed: https://skia.googlesource.com/skia/+/a3fce46f7c85eb3eb5c5373c1eaa0336d9756252
R=robertphillips@google.com
TBR=robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2350
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/382153007
2014-07-11 09:05:32 -07:00
5f78d2251a
Remove gpu shader optimatization for solid white or trans black colors
...
Running test on the added bench which draws a grid of all white paths, all blue paths, or alternating checkered white/blue paths.
With optimization in (ms):
White Blue Checkered
Linux ~80 ~80 ~160
N7 ~800 ~1100 ~1500
Moto-e ~830 ~1100 ~2500
Without optimization in (ms):
White Blue Checkered
Linux ~80 ~80 ~80
N7 ~1100 ~1100 ~1100
Moto-e ~1100 ~1100 ~1500
BUG=skia:
R=bsalomon@google.com
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/375823005
2014-07-11 08:57:40 -07:00
133931f4ab
roll "common" DEPS, and replace tools/pyutils with it
...
BUG=skia:2682
R=borenet@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/385783002
2014-07-11 08:52:35 -07:00
3a21d61668
Update find_name_and_attributes to take ttc index and rename to SkTypeface_FreeType::ScanFont.
...
The name 'ScanFont' is to mirror the naming convention of similar functions in FontConfig.
R=tomhudson@google.com
Author: bungeman@google.com
Review URL: https://codereview.chromium.org/382053003
2014-07-11 08:52:26 -07:00
f94bdb84ef
explicitly add /data/local/tmp to the library path to support new AOSP restrictions
...
BUG=skia:2660
R=tomhudson@chromium.org , tomhudson@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/387893003
2014-07-11 08:47:23 -07:00
a3fce46f7c
Remove public_headers.gypi, unneeded by Skia.
...
This file not needed by Skia, and is almost always out of date.
We recommend generating this inside Android WebView, where it is
used. Generating it is relatively straightforward; here is one way:
https://codereview.chromium.org/198063002/diff/110001/platform_tools/android/gyp_gen/gen_public_headers.py
BUG=skia:2350
R=robertphillips@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/381633003
2014-07-11 08:47:16 -07:00
19fcc7494e
Slim Skia down to just one murmur3 implementation.
...
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/6ac0037b70410ff7d5ce5788bc89314223e1a587
Committed: https://skia.googlesource.com/skia/+/67a3271f0de9ccc32d559b042b862528272047cc
Committed: https://skia.googlesource.com/skia/+/53d435990bdb4d14df78013da45a9364d0287ebe
CQ_EXTRA_TRYBOTS=tryserver.skia:Perf-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release-Trybot
R=reed@google.com , mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/376183004
2014-07-11 08:42:17 -07:00
00a8fae0ce
Add support for 64bit atomic inc/dec/cas
...
R=mtklein@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/377073002
2014-07-11 08:42:11 -07:00
d08cb905a7
Revert of add readPixels() to SkBitmap ( https://codereview.chromium.org/377303002/ )
...
Reason for revert:
Maybe causing crashes in bench.
http://108.170.220.120:10117/builders/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/builds/2608/steps/RunBench/logs/stdio
Original issue's description:
> add readPixels() to SkBitmap
>
> BUG=chromium:390782
>
> Committed: https://skia.googlesource.com/skia/+/c4f216151b6ade70c35fade09a353052f40236b1
R=scroggo@google.com , bsalomon@google.com , reed@google.com
TBR=bsalomon@google.com , reed@google.com , scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=chromium:390782
Author: jcgregorio@google.com
Review URL: https://codereview.chromium.org/382243003
2014-07-11 07:48:20 -07:00
d081cf661a
Pin to a newer version of ANGLE than M36 branch.
...
R=robertphillips@google.com
TBR=robertphillips@google.com
BUG=skia:
NOTRY=true
NOTREECHECKS=true
Author: jcgregorio@google.com
Review URL: https://codereview.chromium.org/390433002
2014-07-11 06:51:59 -07:00
ffc75efc1a
Revert of Add alternate SkPicture::clone ( https://codereview.chromium.org/381193002/ )
...
Reason for revert:
Going to try to just remove the many-at-once clone interface
Original issue's description:
> Add alternate SkPicture::clone
>
> This adds an alternate version of SkPicture::clone for two reasons:
>
> 1) Chromium uses the SkPicture copy constructor to unpack the pictures from the old-style clone interface (and I would like to remove the copy ctor)
>
> 2) This is part of the long term plan to wean Chrome off of cloning. Once pictures are thread safe we will switch the new SkPicture::clone call to just return 'this'. From there it is a small step to removing clone entirely.
>
> Note that the two versions of clone() is temporary. Once this is landed (and rolled) I will land a Chrome-side patch to remove their use of the old interface (Use new SkPicture::clone interface - https://codereview.chromium.org/380323002/ )
>
> Committed: https://skia.googlesource.com/skia/+/e372e78223a8ce916d276d6e0420d552fb0267e9
R=mtklein@google.com , reed@google.com
TBR=mtklein@google.com , reed@google.com
NOTREECHECKS=true
NOTRY=true
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/386933004
2014-07-11 06:45:58 -07:00
134ae83012
manual bench rebase after bf0b9ce
...
R=robertphillips@google.com , jcgregorio@google.com
TBR=robertphillips@google.com
Bypassing trybots:
NOTRY=true
NOTREECHECKS=true
Author: bensong@google.com
Review URL: https://codereview.chromium.org/385073005
2014-07-11 06:34:59 -07:00
scroggo
senorblanco
reed
halcanary
djsollen
robertphillips
djordje.pesut
piotaixr
reed
jvanverth
caryclark
krajcevski
mtklein
bsalomon
egdaniel
epoger
bungeman
jcgregorio
bensong