AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
21,176 Commits 1 Branch 0 Tags 544 MiB
1590f3b328
Commit Graph

102 Commits

Author SHA1 Message Date
cblume
6121405df5 Cleaning up trailing spaces and typos. 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1631993002

Review URL: https://codereview.chromium.org/1631993002
 2016-01-26 09:10:48 -08:00
bsalomon
045802dbb7 Rewrite GrTextureMaker to disentangle bitmap case from base class and give GPU object a say in what copying needs to be done. 
Committed: https://skia.googlesource.com/skia/+/fcffaf22d697f06f903c3193308f9dc54a959f79

Committed: https://skia.googlesource.com/skia/+/1a197ea31e0aac7ea312e9a6c0d9f5df626b0350

Review URL: https://codereview.chromium.org/1409163002
 2015-10-20 07:58:01 -07:00
Brian Salomon
bc0bcc08b3 Revert recent CLs around GrTextureMaker/GrTextureParamsAdjuster 
Review URL: https://codereview.chromium.org/1411353002 .
 2015-10-19 15:12:32 -04:00
bsalomon
1a197ea31e Rewrite GrTextureMaker to disentangle bitmap case from base class and give GPU object a say in what copying needs to be done. 
Committed: https://skia.googlesource.com/skia/+/fcffaf22d697f06f903c3193308f9dc54a959f79

Review URL: https://codereview.chromium.org/1409163002
 2015-10-19 08:24:09 -07:00
egdaniel
91957941ce Revert of Rewrite GrTextureMaker to disentangle bitmap case from base class and give GPU object a say in what… (patchset #4 id:60001 of https://codereview.chromium.org/1409163002/ ) 
Reason for revert:
breaking nanobench

Original issue's description:
> Rewrite GrTextureMaker to disentangle bitmap case from base class and give GPU object a say in what copying needs to be done.
>
> Committed: https://skia.googlesource.com/skia/+/fcffaf22d697f06f903c3193308f9dc54a959f79

TBR=reed@google.com,bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1409923003
 2015-10-16 13:59:14 -07:00
bsalomon
fcffaf22d6 Rewrite GrTextureMaker to disentangle bitmap case from base class and give GPU object a say in what copying needs to be done. 
Review URL: https://codereview.chromium.org/1409163002
 2015-10-16 13:35:10 -07:00
bsalomon
afa95e270c Remove image usage type enum. Use GrTextureParams instead. 
BUG=skia:

Review URL: https://codereview.chromium.org/1404433002
 2015-10-12 10:39:46 -07:00
bsalomon
f276ac5c16 Move functions from SkGr to SkGrPriv.h 
Review URL: https://codereview.chromium.org/1397123002
 2015-10-09 13:36:42 -07:00
reed
b39abc4d76 remove unused helper function 
BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/1376603006
 2015-09-29 18:27:59 -07:00
bsalomon
f1b7a1d828 Make skpaint->grpaint flow work for composing draws (verts and atlas) 
One side effect is that the SkShader's (or implicit shader's) fragment processor is responsible for the transition from an unpremul paint color to a premul color.

Review URL: https://codereview.chromium.org/1348583002
 2015-09-28 06:26:29 -07:00
bsalomon
aca31fea8c Stop supporting HW dither 
Review URL: https://codereview.chromium.org/1359833004
 2015-09-22 11:38:46 -07:00
reed
3322a8137d share code between SkGr and Cacherator 
BUG=skia:

Review URL: https://codereview.chromium.org/1351533004
 2015-09-16 10:09:24 -07:00
bsalomon
ae4738f677 Create fragment processor for performing input color blend with child processor 
The new FP is used to implement SkXM::Mode color filters and SkXM::Mode image filters. Also, these now support all advanced SkXM::Mode xfermodes.

Review URL: https://codereview.chromium.org/1334293003
 2015-09-15 15:33:27 -07:00
reed
85d9178832 Use SkImageCacherator in SkImages 
Possible follow-up changes to consider

1. Roll SkImage_Raster and _Gpu into _Generator, where the generator (or cacherator) is backed by a pre-existing texture or raster.
2. Evolve SkImageUsageType into a verb requiring stretching, and have the caller (common code) digest the caps() and usage, so that subclasses are just told what to do (stretch or not)
3. Common code/utility to convert an unstretched texture into a stretch one (and cache it) if the generator can only make an unstretched one.

BUG=skia:

Review URL: https://codereview.chromium.org/1282363002
 2015-09-10 14:33:38 -07:00
bsalomon
cb1ccfd205 SK_API on GrWrapTextureInBitmap 
BUG=chromium:524717
TBR=reed@google.com

Review URL: https://codereview.chromium.org/1334563002
 2015-09-09 14:51:52 -07:00
reed
43fe6185c5 refactor parts of SkGr.cpp for use by SkImages 
BUG=skia:

Review URL: https://codereview.chromium.org/1315353006
 2015-09-08 08:37:36 -07:00
reed
8f34372f7e Extend SkImageGenerator to support natively generated GrTextures. As part of this, added uniqueID() to the generator, and made it be in the same namespace is bitmaps, pixelrefs, images. 
To do this, create SkImageCacherator, which wraps a generator and provides an
interface to get a cached answer for either the raster or texture output of
the generator.

BUG=skia:

Review URL: https://codereview.chromium.org/1291803002
 2015-08-13 13:32:39 -07:00
joshualitt
9bc3954fc1 Refactor helper function for SkBitmapShader to GrFragmentProcessor 
BUG=skia:

Review URL: https://codereview.chromium.org/1285283002
 2015-08-12 12:57:54 -07:00
reed
8b26b99c97 new image from backend desc 
BUG=485243

Review URL: https://codereview.chromium.org/1121813002
 2015-05-07 15:36:18 -07:00
bsalomon
bed83a66f5 Don't draw if SkShader::asNewFragmentProcessor fails. 
BUG=chromium:473156

Review URL: https://codereview.chromium.org/1089063002
 2015-04-15 14:18:34 -07:00
bsalomon
c9c3e62b4e Add constant color GrFP. 
Committed: https://skia.googlesource.com/skia/+/dfbbec436cbcacc3270d4b28357c8393e67d6494

Review URL: https://codereview.chromium.org/978713002
 2015-04-02 11:12:09 -07:00
bsalomon
599ea40cec Revert of Add constant color GrFP. (patchset #10 id:180001 of https://codereview.chromium.org/978713002/) 
Reason for revert:
Revert while investigating assertions.

Original issue's description:
> Add constant color GrFP.
>
> Committed: https://skia.googlesource.com/skia/+/dfbbec436cbcacc3270d4b28357c8393e67d6494

TBR=egdaniel@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1055023002
 2015-04-02 08:33:54 -07:00
bsalomon
dfbbec436c Add constant color GrFP. 
Review URL: https://codereview.chromium.org/978713002
 2015-04-01 14:54:57 -07:00
joshualitt
25d9c15408 Pass Rendertarget into context. 
Adding Jim for text context stuff, and Steven for image blur stuff.

BUG=skia:

Review URL: https://codereview.chromium.org/939623005
 2015-02-18 12:29:52 -08:00
bsalomon
23e619cf46 Reimplement gpu message bus for invalidated bitmap gen IDs 
Review URL: https://codereview.chromium.org/902873002
 2015-02-06 11:54:28 -08:00
bsalomon
24db3b1c35 Add specialized content key class for resources. 
Review URL: https://codereview.chromium.org/858123002
 2015-01-23 04:24:05 -08:00
jvanverth
fa1e8a7cef Add sRGB texture support. 
Review URL: https://codereview.chromium.org/791823003
 2014-12-22 08:31:49 -08:00
joshualitt
5531d51ce7 remove view matrix from context 
BUG=skia:

Review URL: https://codereview.chromium.org/808703006
 2014-12-17 15:50:11 -08:00
bsalomon
ae59b77612 Create GrOptDrawState before recording draw in GrInOrderDrawBuffer 
Review URL: https://codereview.chromium.org/739673002
 2014-11-19 08:23:49 -08:00
bsalomon
71cb0c241e Replace GrResourceCache with GrResourceCache2. 
BUG=skia:2889

Committed: https://skia.googlesource.com/skia/+/66a450f21a3da174b7eed89a1d5fc8591e8b6ee6

Committed: https://skia.googlesource.com/skia/+/407aa584d183c1bf314f5defd1cf0202e8a96c89

Review URL: https://codereview.chromium.org/716143004
 2014-11-14 12:10:15 -08:00
bsalomon
ac49acda52 Revert of Replace GrResourceCache with GrResourceCache2. (patchset #7 id:120001 of https://codereview.chromium.org/716143004/) 
Reason for revert:
broken again

Original issue's description:
> Replace GrResourceCache with GrResourceCache2.
>
> BUG=skia:2889
>
> Committed: https://skia.googlesource.com/skia/+/66a450f21a3da174b7eed89a1d5fc8591e8b6ee6
>
> Committed: https://skia.googlesource.com/skia/+/407aa584d183c1bf314f5defd1cf0202e8a96c89

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

Review URL: https://codereview.chromium.org/726913002
 2014-11-14 06:47:39 -08:00
bsalomon
407aa584d1 Replace GrResourceCache with GrResourceCache2. 
BUG=skia:2889

Committed: https://skia.googlesource.com/skia/+/66a450f21a3da174b7eed89a1d5fc8591e8b6ee6

Review URL: https://codereview.chromium.org/716143004
 2014-11-14 06:29:40 -08:00
bsalomon
f21dab9540 Revert of Replace GrResourceCache with GrResourceCache2. (patchset #6 id:100001 of https://codereview.chromium.org/716143004/) 
Reason for revert:
Breaking stuff

Original issue's description:
> Replace GrResourceCache with GrResourceCache2.
>
> BUG=skia:2889
>
> Committed: https://skia.googlesource.com/skia/+/66a450f21a3da174b7eed89a1d5fc8591e8b6ee6

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

Review URL: https://codereview.chromium.org/715333003
 2014-11-13 13:33:28 -08:00
bsalomon
66a450f21a Replace GrResourceCache with GrResourceCache2. 
BUG=skia:2889

Review URL: https://codereview.chromium.org/716143004
 2014-11-13 13:19:10 -08:00
bsalomon
bcf0a52d4f GrResourceCache2 manages scratch texture. 
BUG=skia:2889

Review URL: https://codereview.chromium.org/608883003
 2014-10-08 08:40:09 -07:00
Brian Salomon
9323b8b8e1 Revert "GrResourceCache2 manages scratch texture." 
This reverts commit d14e1a2764.
 2014-10-07 15:07:38 -04:00
bsalomon
d14e1a2764 GrResourceCache2 manages scratch texture. 
BUG=skia:2889

Review URL: https://codereview.chromium.org/608883003
 2014-10-07 07:27:07 -07:00
robertphillips
dbe6074a06 Revert of GrResourceCache2 manages scratch texture. (patchset #14 id:260001 of https://codereview.chromium.org/608883003/) 
Reason for revert:
Turning bots red:
Nanobench seems to be uniformly failing on Android
(http://108.170.220.21:10117/builders/Perf-Android-Venue8-PowerVR-x86-Release/builds/99/steps/RunNanobench/logs/stdio)

Ubuntu GTX660 32bit is failing in both Debug and Release on GM generation (it appears to be out of memory) (http://108.170.220.120:10117/builders/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/builds/2457/steps/GenerateGMs/logs/stdio)

Original issue's description:
> GrResourceCache2 manages scratch texture.
>
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/3d398c876440deaab39bbf2a9b881c337e6dc8d4

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

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/611383003
 2014-09-30 06:54:17 -07:00
bsalomon
3d398c8764 GrResourceCache2 manages scratch texture. 
BUG=skia:
R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/608883003
 2014-09-30 06:02:23 -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
reed
bbe7a2ad32 eliminate code related to SkBitmap::Config 
BUG=skia:
R=reed@google.com, mike@reedtribe.org

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/483593002
 2014-08-18 08:13:03 -07:00
jvanverth
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
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
reed
c3b3266b7d hide SkBitmap::Config entirely (behind a flag) 
patch from issue 339463002

TBR=

I think the NoGPU failure is unrelated, so ignoring
NOTRY=True

Author: reed@google.com

Review URL: https://codereview.chromium.org/340533002
 2014-06-17 08:38:31 -07:00
dandov
9de5b514d3 SkShader::asNewEffect Refactoring 
The new signature is:

	bool asNewEffect(GrContext* context, const SkPaint& paint, GrColor* grColor, GrEffectRef** grEffect, const SkMatrix* localMatrixOrNull) const;

It will fix the hack for skcolorshader by modifying the GrColor parameter in SkGr::SkPaint2GrPaintShader.

BUG=skia:2646
R=jvanverth@google.com, bsalomon@google.com

Author: dandov@google.com

Review URL: https://codereview.chromium.org/318923005
 2014-06-10 14:38:28 -07:00
commit-bot@chromium.org
3595f88aff Pass in GrContext instead of SkGpuDevice for dashing and Sk2GrPaint conversion 
BUG=skia:
R=bsalomon@google.com

Author: egdaniel@google.com

Review URL: https://codereview.chromium.org/292773002

git-svn-id: http://skia.googlecode.com/svn/trunk@14790 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-19 19:35:57 +00:00
commit-bot@chromium.org
8dcff64169 Move skPaint2GrPaint to SkGr.h/cpp 
BUG=skia:
R=bsalomon@google.com, brian@thesalomons.net, robertphillips@google.com

Author: egdaniel@google.com

Review URL: https://codereview.chromium.org/283803003

git-svn-id: http://skia.googlecode.com/svn/trunk@14753 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-15 20:32:48 +00:00
commit-bot@chromium.org
3adcc34033 stop using deprecated bitmap::config for gpu 
BUG=skia:
R=bsalomon@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/248473006

git-svn-id: http://skia.googlecode.com/svn/trunk@14330 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-23 19:18:09 +00:00
commit-bot@chromium.org
762cd80437 Move distance field generation to the glyph cache. 
Distance fields are currently created in GrTextStrike, which is the wrong place. This moves that to the glyph cache where it belongs.

As part of my testing, I found that when we fall back to paths in the GrDistanceFieldTextContext it was not scaling them properly, so that's fixed in here too.

R=robertphillips@google.com, reed@google.com

Author: jvanverth@google.com

Review URL: https://codereview.chromium.org/227593010

git-svn-id: http://skia.googlecode.com/svn/trunk@14193 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-14 22:05:07 +00:00
commit-bot@chromium.org
15a1405999 Change device factories to take SkImageInfo instead of SkBitmap::Config 
patch from issue 167033002

BUG=skia:
R=reed@google.com

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/168653002

git-svn-id: http://skia.googlecode.com/svn/trunk@13463 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-16 00:59:25 +00:00