AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,852 Commits 1 Branch 0 Tags 544 MiB
b2a6fe7976
Commit Graph

152 Commits

Author SHA1 Message Date
reed
aed98b80d9 enable sk4f xfermodes 
BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/1061543002
 2015-04-03 09:48:30 -07:00
mtklein
3d626834b4 New names for SkPMFloat methods. 
BUG=skia:

Review URL: https://codereview.chromium.org/1055123002
 2015-04-03 07:05:20 -07:00
reed
92dabe7421 Exclusion and Difference modes using Sk4f 
Before:
   7M	1	15.3ms	15.5ms	15.8ms	17.2ms	4%	▁█▄▁▇▂▁▁▂▁	8888	Xfermode_Exclusion
   7M	1	16.5ms	17.1ms	17.3ms	18.8ms	5%	▁█▃█▃▂▂▃▂▂	8888	Xfermode_Difference

After:
   7M	1	9.06ms	9.34ms	9.42ms	10.4ms	4%	▁▁▅▄█▁▂▁▂▃	8888	Xfermode_Exclusion
   7M	1	10.5ms	10.9ms	11ms	12ms	5%	▃▁▆█▂▁▅▂▁▃	8888	Xfermode_Difference

TBR=mtklein@google.com

Review URL: https://codereview.chromium.org/1060493002
 2015-04-02 19:19:14 -07:00
reed
f8f5478f92 impl Multiply mode using Sk4f 
Before:
   7M	1	14.4ms	14.8ms	15.4ms	17.5ms	7%	▆█▅▅▂▁▁▁▂▁	8888	Xfermode_Multiply

After:
   7M	1	12ms	12.1ms	12.5ms	14.1ms	6%	▃█▇▂▁▂▁▁▂▁	8888	Xfermode_Multiply

TBR=mtklein@google.com

Review URL: https://codereview.chromium.org/1056003002
 2015-04-02 17:13:22 -07:00
reed
f92ace90d8 experimental speedup some xfermodes with Sk4f 
Old:
   7M	1	11.1ms	11.3ms	11.3ms	11.6ms	1%	▅▄▂▂▁▁▄▄█▇	8888	Xfermode_Screen
   7M	1	10.7ms	10.9ms	10.9ms	11.1ms	1%	▄▄▄▇▃▁█▄▂▅	8888	Xfermode_Modulate
   7M	1	7.86ms	8.03ms	8ms	8.18ms	1%	█▇▅▁▃▃▂▃▆▅	8888	Xfermode_Plus
   7M	1	14.6ms	14.8ms	14.8ms	15.1ms	1%	▄█▆▅▄▁▁▆▄▆	8888	Xfermode_Xor
   7M	1	13ms	13.5ms	13.4ms	13.8ms	2%	▅▃▇▁█▂▃▅▃▅	8888	Xfermode_DstATop
   7M	1	13.1ms	13.4ms	13.3ms	13.6ms	1%	▄▁▁▆▅▄▇▆█▂	8888	Xfermode_SrcATop

New:
   7M	1	6.99ms	7.19ms	7.4ms	8.98ms	8%	▁▂▁▃▂█▁▂▂▂	8888	Xfermode_Screen
   7M	1	5.27ms	5.46ms	5.46ms	5.89ms	3%	▁▁▅▁▂█▄▃▄▃	8888	Xfermode_Modulate
   7M	1	6.8ms	7.04ms	7.27ms	8.53ms	8%	▂▁█▁▁▂▂▂▂▇	8888	Xfermode_Plus
   7M	1	9ms	9.2ms	9.33ms	10.5ms	5%	▁█▃▁▂▁▁▁▅▂	8888	Xfermode_Xor
   7M	1	8.34ms	8.57ms	8.73ms	10.6ms	8%	▁▁▁▂▂▂▂▂▂█	8888	Xfermode_DstATop
   7M	1	8.38ms	8.62ms	8.91ms	10.3ms	8%	▁▃▁▂▇▂▁▂▁█	8888	Xfermode_SrcATop

Need to define SK_SUPPORT_LEGACY_SCALAR_XFERMODES in chrome to suppress change (see https://codereview.chromium.org/1054083002/)

Review URL: https://codereview.chromium.org/1043413002
 2015-04-02 12:46:24 -07:00
mtklein
36352bf5e3 C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} 
NOPRESUBMIT=true

BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002

Review URL: https://codereview.chromium.org/1037793002
 2015-03-25 18:17:32 -07:00
egdaniel
dcfb7cf336 Remove the need for asCoeff in SkXfermode. 
BUG=skia:

Review URL: https://codereview.chromium.org/864833002
 2015-01-22 06:52:29 -08:00
egdaniel
58136167fc Do more cleanup from xp changes 
BUG=skia:

Review URL: https://codereview.chromium.org/811903004
 2015-01-20 10:19:22 -08:00
egdaniel
54f0e9d784 Add Xfer Processor for GrCustomXfermodes 
BUG=skia:

Review URL: https://codereview.chromium.org/852203003
 2015-01-16 06:29:47 -08:00
egdaniel
0063a9b69a Move XferEffects class to GrCustomXfermode file 
BUG=skia:

Review URL: https://codereview.chromium.org/844913003
 2015-01-15 10:52:32 -08:00
egdaniel
38cd055215 Do some minor pre cleanup work before converting all xfermodes to XPs. 
BUG=skia:

Review URL: https://codereview.chromium.org/853543003
 2015-01-14 08:05:11 -08:00
mtklein
72c9faab45 Fix up all the easy virtual ... SK_OVERRIDE cases. 
This fixes every case where virtual and SK_OVERRIDE were on the same line,
which should be the bulk of cases.  We'll have to manually clean up the rest
over time unless I level up in regexes.

for f in (find . -type f); perl -p -i -e 's/virtual (.*)SK_OVERRIDE/\1SK_OVERRIDE/g' $f; end

BUG=skia:

Review URL: https://codereview.chromium.org/806653007
 2015-01-09 10:06:40 -08:00
egdaniel
9513143efa Make all blending up to GrOptDrawState be handled by the xp/xp factory. 
In this cl the blending information is extracted for the xp and stored in the ODS
which is then used as it currently is. In the follow up cl, an XP backend will be added
and at that point all blending work will take place inside XP's.

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/7c66342a399b529634bed0fabfaa562db2c0dbd4

Review URL: https://codereview.chromium.org/759713002
 2014-12-09 11:15:44 -08:00
bsalomon
9f876a37d8 Use threshold of 1 texture coord value per pixel w/ nearest neighbor. 
Review URL: https://codereview.chromium.org/787873002
 2014-12-09 10:51:07 -08:00
egdaniel
8d95ffa497 Revert of Make all blending up to GrOptDrawState be handled by the xp/xp factory. (patchset #7 id:140001 of https://codereview.chromium.org/759713002/) 
Reason for revert:
break many gm's

Original issue's description:
> Make all blending up to GrOptDrawState be handled by the xp/xp factory.
>
> In this cl the blending information is extracted for the xp and stored in the ODS
> which is then used as it currently is. In the follow up cl, an XP backend will be added
> and at that point all blending work will take place inside XP's.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/7c66342a399b529634bed0fabfaa562db2c0dbd4

TBR=bsalomon@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/766653008
 2014-12-08 13:26:43 -08:00
egdaniel
7c66342a39 Make all blending up to GrOptDrawState be handled by the xp/xp factory. 
In this cl the blending information is extracted for the xp and stored in the ODS
which is then used as it currently is. In the follow up cl, an XP backend will be added
and at that point all blending work will take place inside XP's.

BUG=skia:

Review URL: https://codereview.chromium.org/759713002
 2014-12-08 11:20:40 -08:00
joshualitt
eb2a676165 Remove backend factories 
BUG=skia:

Review URL: https://codereview.chromium.org/778453002
 2014-12-04 11:35:34 -08:00
egdaniel
c016fb8f9f Use static XPF for porter duff xp factories. 
BUG=skia:

Review URL: https://codereview.chromium.org/776843004
 2014-12-03 11:41:55 -08:00
egdaniel
378092f3d1 Add XferProcessor factory in GrPaint and GrDrawState. 
In this CL the XP should have zero effect on the actual rendering pipeline.

BUG=skia:

Review URL: https://codereview.chromium.org/751283002
 2014-12-03 10:40:13 -08:00
mtklein
3f3b3d0035 Remove SK_SUPPORT_LEGACY_DEEPFLATTENING. 
This was needed for pictures before v33, and we're now requiring v35+.

Will follow up with the same for skia/ext/pixel_ref_utils_unittest.cc

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/52c293547b973f7fb5de3c83f5062b07d759ab88

Review URL: https://codereview.chromium.org/769953002
 2014-12-01 11:47:08 -08:00
mtklein
6e78293ee8 Revert of Remove SK_SUPPORT_LEGACY_DEEPFLATTENING. (patchset #1 id:1 of https://codereview.chromium.org/769953002/) 
Reason for revert:
Breaks canary builds.  Will reland after the Chromium change lands.

Original issue's description:
> Remove SK_SUPPORT_LEGACY_DEEPFLATTENING.
>
> This was needed for pictures before v33, and we're now requiring v35+.
>
> Will follow up with the same for skia/ext/pixel_ref_utils_unittest.cc
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/52c293547b973f7fb5de3c83f5062b07d759ab88

TBR=reed@google.com,mtklein@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/768183002
 2014-12-01 10:56:05 -08:00
mtklein
52c293547b Remove SK_SUPPORT_LEGACY_DEEPFLATTENING. 
This was needed for pictures before v33, and we're now requiring v35+.

Will follow up with the same for skia/ext/pixel_ref_utils_unittest.cc

BUG=skia:

Review URL: https://codereview.chromium.org/769953002
 2014-12-01 10:23:11 -08:00
joshualitt
267ce482b5 remove proc key 
BUG=skia:

Review URL: https://codereview.chromium.org/755363002
 2014-11-25 14:52:21 -08:00
rosca
ace7f42769 Preventing division by 0 in non-separable blend mode shaders. 
In the software path, the same issue has been fixed some time ago:
https://codereview.chromium.org/114173002

BUG=skia:

Review URL: https://codereview.chromium.org/666043003
 2014-11-20 07:24:32 -08:00
egdaniel
605dd0fbce Move GrInvariantOutput out of GrProcessor and into its own class. 
This will help with the ability to subclass, add to, etc. GrInvariantOutput. Also it was simply
getting a little too big to be a "supporting" subclass
BUG=skia:

Review URL: https://codereview.chromium.org/699943003
 2014-11-12 08:35:25 -08:00
bsalomon
420d7e9a79 Auto-compare GrProcessors' texture accesses in isEqual(). 
R=joshualitt@google.com

Review URL: https://codereview.chromium.org/654313002
 2014-10-16 09:18:09 -07:00
egdaniel
9e4d6d180f Move willUseInputColor check to computeInvariantOutput 
BUG=skia:

Review URL: https://codereview.chromium.org/656503002
 2014-10-15 13:49:02 -07:00
bsalomon
6251d17dfa Split GrFragmentProcessor into its own header 
Review URL: https://codereview.chromium.org/660573002
 2014-10-15 10:50:36 -07:00
bsalomon
0e08fc17e4 Push isEqual/onIsEqual down from GrProcessor to subclasses. 
R=joshualitt@google.com

Review URL: https://codereview.chromium.org/654273002
 2014-10-15 08:19:04 -07:00
mtklein
148ec59001 Require SK_DECLARE_STATIC_LAZY_PTR is used in global scope. 
Function- or method- local scope isn't threadsafe; the pointer is generally
zero-initialized on first use in function scope (i.e. lazily... we have to go
deeper), but for globals we can be pretty sure the linker will do that for us.

BUG=skia:

No public API changes.
TBR=reed@google.com

Review URL: https://codereview.chromium.org/651723003
 2014-10-13 13:17:56 -07:00
egdaniel
ccb2e384a0 Create helper functions to use in computeInvariantOutput calls 
BUG=skia:

Review URL: https://codereview.chromium.org/643743003
 2014-10-13 12:53:46 -07:00
joshualitt
1598899975 FPs now use the correct builder types(just a rename) 
BUG=skia:

Review URL: https://codereview.chromium.org/648463003
 2014-10-09 15:04:05 -07:00
egdaniel
1a8ecdfb73 Add isSingleComponent bool to getConstantColorComponent 
Initial step to allowing effects to use/output 1 or 4 color/coverage components. This cl doesn't change any current logic and all effects still assume they are working with 4 components.

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/3b8af078281a5a20f951b9fd84f38d92b8f6217b

Review URL: https://codereview.chromium.org/608253002
 2014-10-03 06:24:12 -07:00
robertphillips
b4b7a4c9ea Revert of Add isSingleComponent bool to getConstantColorComponent (patchset #6 id:100001 of https://codereview.chromium.org/608253002/) 
Reason for revert:
Changing some GMs

Original issue's description:
> Add isSingleComponent bool to getConstantColorComponent
>
> Initial step to allowing effects to use/output 1 or 4 color/coverage components. This cl doesn't change any current logic and all effects still assume they are working with 4 components.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/3b8af078281a5a20f951b9fd84f38d92b8f6217b

TBR=joshualitt@chromium.org,bsalomon@google.com,reed@google.com,egdaniel@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/617853003
 2014-10-02 12:12:48 -07:00
egdaniel
3b8af07828 Add isSingleComponent bool to getConstantColorComponent 
Initial step to allowing effects to use/output 1 or 4 color/coverage components. This cl doesn't change any current logic and all effects still assume they are working with 4 components.

BUG=skia:

Review URL: https://codereview.chromium.org/608253002
 2014-10-02 09:57:48 -07:00
senorblanco
0f7197bc0d Fix SkXfermode deserialization. 
Validation was failing due to an inverted test condition.

BUG=417266
R=reed@google.com

Author: senorblanco@chromium.org

Review URL: https://codereview.chromium.org/596333002
 2014-09-24 11:09:38 -07:00
joshualitt
b0a8a377f8 Patch to create a distinct geometry processor. The vast majority of this patch 
is just a rename.  The meat is in GrGeometryProcessor, GrProcessor,
GrGL*Processor, GrProcessorStage, Gr*BackendProcessorFactory,
GrProcessUnitTestFactory, and the builders

BUG=skia:
R=bsalomon@google.com

Author: joshualitt@chromium.org

Review URL: https://codereview.chromium.org/582963002
 2014-09-23 09:50:21 -07:00
joshualitt
23e280d1f2 Changes to remove program effects builder 
BUG=skia:
R=bsalomon@google.com

Author: joshualitt@chromium.org

Review URL: https://codereview.chromium.org/551253004
 2014-09-18 12:26:38 -07:00
joshualitt
49586bec73 removing GrDrawEffect 
BUG=skia:

Committed: https://skia.googlesource.com/skia/+/8ddbe8b9366c8c59c4fb55f01f253de8a0b37d6e

R=bsalomon@google.com

Author: joshualitt@chromium.org

Review URL: https://codereview.chromium.org/571163002
 2014-09-16 08:21:42 -07:00
joshualitt
08da4f22d7 Revert of removing GrDrawEffect (patchset #4 id:60001 of https://codereview.chromium.org/571163002/) 
Reason for revert:
reverting to unblock another revert

Original issue's description:
> removing GrDrawEffect
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/8ddbe8b9366c8c59c4fb55f01f253de8a0b37d6e

R=bsalomon@google.com
TBR=bsalomon@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: joshualitt@chromium.org

Review URL: https://codereview.chromium.org/577593003
 2014-09-16 07:17:28 -07:00
joshualitt
8ddbe8b936 removing GrDrawEffect 
BUG=skia:
R=bsalomon@google.com

Author: joshualitt@chromium.org

Review URL: https://codereview.chromium.org/571163002
 2014-09-16 06:46:30 -07:00
bsalomon
49f085dddf "NULL !=" = NULL 
R=reed@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/544233002
 2014-09-05 13:34:00 -07:00
joshualitt
30ba436f04 Initial refactor of shaderbuilder to prepare for geometry shaders 
gitignore for eclipse

BUG=skia:
R=bsalomon@google.com, bsalomon@chromium.org

Author: joshualitt@chromium.org

Review URL: https://codereview.chromium.org/491673002
 2014-08-21 20:18:45 -07:00
reed
9fa60daad4 Simplify flattening to just write enough to call the factory/public-constructor for the class. We want to *not* rely on private constructors, and not rely on calling through the inheritance hierarchy for either flattening or unflattening(CreateProc). 
Refactoring pattern:

1. guard the existing constructor(readbuffer) with the legacy build-flag
2. If you are a instancable subclass, implement CreateProc(readbuffer) to create a new instances from the buffer params (or return NULL).

If you're a shader subclass
1. You must read/write the local matrix if your class accepts that in its factory/constructor, else ignore it.

R=robertphillips@google.com, mtklein@google.com, senorblanco@google.com, senorblanco@chromium.org, sugoi@chromium.org

Author: reed@google.com

Review URL: https://codereview.chromium.org/395603002
 2014-08-21 07:59:51 -07:00
bsalomon
63e99f7a03 Allow GrGLEffects to produce variable length keys. 
R=robertphillips@google.com, jvanverth@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/385713005
 2014-07-21 08:03:14 -07:00
bsalomon
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
bsalomon
83d081ae1d Goodbye GrEffectRef. 
Also, reworked some var names and comments around SkShader::asNewEffect.

R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/374923002
 2014-07-08 09:56:11 -07:00
bsalomon
55fad7af61 Remove GrEffect::CreateEffectRef and GrEffect::AutoEffectRef. 
R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/371103003
 2014-07-08 07:34:21 -07:00
bsalomon
97b9ab72cd Make GrDrawState and GrPaint take GrEffect* instead of GrEffectRef*. 
Make Sk-effect virtuals produce GrEffect* rather than GrEffectRef*

Make GrEffectRef a typedef for GrEffect.

Committed: https://skia.googlesource.com/skia/+/2011fe9cdfa63b83489a146cea6a724cede352c8

R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/377503004
 2014-07-08 06:52:35 -07:00
reed
969842ac9c Revert of Make GrDrawState and GrPaint take GrEffect* instead of GrEffectRef*. (https://codereview.chromium.org/377503004/) 
Reason for revert:
broke linux builders

Original issue's description:
> Make GrDrawState and GrPaint take GrEffect* instead of GrEffectRef*.
>
> Make Sk-effect virtuals produce GrEffect* rather than GrEffectRef*
>
> Make GrEffectRef a typedef for GrEffect.
>
> Committed: https://skia.googlesource.com/skia/+/2011fe9cdfa63b83489a146cea6a724cede352c8

R=robertphillips@google.com, bsalomon@google.com
TBR=bsalomon@google.com, robertphillips@google.com
NOTREECHECKS=true
NOTRY=true

Author: reed@google.com

Review URL: https://codereview.chromium.org/372053003
 2014-07-07 15:17:49 -07:00