AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,348 Commits 1 Branch 0 Tags 544 MiB
a047f12bd7
Commit Graph

1023 Commits

Author SHA1 Message Date
joshualitt
9b98932ada This change will ultimately pull uniform color, and to a much lesser degree uniform coverage, into GPs. There are still some loose ends because drawstate has the ability to override the GP, but fixing these cleanly will have to wait until we have deferred geometry in place and can make attribute / uniform decisions on the fly. 
BUG=skia:

Review URL: https://codereview.chromium.org/746423007
 2014-12-15 14:16:27 -08:00
egdaniel
54160f3286 Add xp optimization for RGB coverage. 
This is needed since clearColorStages is being changed to ignore color input. For RGB coverage,
we want to clear all the color stages (since we know the final output color), but we don't want
to ignore the color input since it is needed.

In future we will change this so the XP stores the color internally and thus can tell the GP to
simiply ignore color.

BUG=skia:

Review URL: https://codereview.chromium.org/791933006
 2014-12-15 12:38:53 -08:00
tfarina
912ed6ebb8 Cleanup: Mark some overridden methods with 'SK_OVERRIDE'. 
This fixes errors like this:

../../include/gpu/effects/GrPorterDuffXferProcessor.h:27:25: error:
'name' overrides a member function but is not marked 'override'
[-Werror,-Winconsistent-missing-override]

BUG=skia:3075
TEST=ninja -C out/Debug skia_lib
TBR=bsalomon@google.com

Review URL: https://codereview.chromium.org/804813002
 2014-12-14 15:20:11 -08:00
joshualitt
56995b5cc0 Remove GP from drawstate, revision of invariant output for GP 
BUG=skia:

Committed: https://skia.googlesource.com/skia/+/c6bc58eded89b0c0a36b8e20e193c200f297a0da

Review URL: https://codereview.chromium.org/791743003
 2014-12-11 15:44:02 -08:00
junov
5756aff409 Adding a custom data field to GrGpuResource 
Motivation: allow Blink to track pre-existing mailbox names for
textures that are recycled by the ganesh scratch texture pool.

BUG=440462
TBR=bsalomon@google.com

Review URL: https://codereview.chromium.org/796163002
 2014-12-11 14:59:32 -08:00
egdaniel
c230414861 Create xfer processor backend. 
This includes:
-Having an actual XP stage at the end of the gl pipeline.
-All Blending work is handled by XP until actually setting GL blend states
-GLPrograms test to test XP

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/4dffc940c430eec66d4707490eace19c9b3f7904

Review URL: https://codereview.chromium.org/764643004
 2014-12-11 13:15:14 -08:00
junov
436293a330 Making GrGpuResource::release public for special case in Blink 
BUG=440462

Review URL: https://codereview.chromium.org/739383006
 2014-12-11 10:32:32 -08:00
joshualitt
294738268d Revert of Create xfer processor backend. (patchset #6 id:100001 of https://codereview.chromium.org/764643004/) 
Reason for revert:
CL breaks windows DM

Original issue's description:
> Create xfer processor backend.
>
> This includes:
> -Having an actual XP stage at the end of the gl pipeline.
> -All Blending work is handled by XP until actually setting GL blend states
> -GLPrograms test to test XP
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/4dffc940c430eec66d4707490eace19c9b3f7904

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

Review URL: https://codereview.chromium.org/789343002
 2014-12-10 15:03:01 -08:00
joshualitt
06f019fc0f Revert of Fix to set correct output type when blending when we've read dst (patchset #4 id:60001 of https://codereview.chromium.org/791143002/) 
Reason for revert:
Breaks DM on windows

Original issue's description:
> Fix to set correct output type when blending when we've read dst
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/733fc2054044377e914559fa4f46db66ab7d9cea

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

Review URL: https://codereview.chromium.org/795783002
 2014-12-10 14:57:50 -08:00
joshualitt
8c0f615fdd Revert of Remove GP from drawstate, revision of invariant output for GP (patchset #9 id:160001 of https://codereview.chromium.org/791743003/) 
Reason for revert:
breaks mac

Original issue's description:
> Remove GP from drawstate, revision of invariant output for GP
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/c6bc58eded89b0c0a36b8e20e193c200f297a0da

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

Review URL: https://codereview.chromium.org/794843002
 2014-12-10 14:12:22 -08:00
joshualitt
c6bc58eded Remove GP from drawstate, revision of invariant output for GP 
BUG=skia:

Review URL: https://codereview.chromium.org/791743003
 2014-12-10 13:48:57 -08:00
egdaniel
733fc20540 Fix to set correct output type when blending when we've read dst 
BUG=skia:

Review URL: https://codereview.chromium.org/791143002
 2014-12-10 12:45:20 -08:00
egdaniel
4dffc940c4 Create xfer processor backend. 
This includes:
-Having an actual XP stage at the end of the gl pipeline.
-All Blending work is handled by XP until actually setting GL blend states
-GLPrograms test to test XP

BUG=skia:

Review URL: https://codereview.chromium.org/764643004
 2014-12-10 07:43:50 -08:00
joshualitt
2e3b3e369d This cl moves color and coverage off of drawstate. In an effort to keep this CL manageable, I have left the compute invariant input / output in a bit of a strange state(fixing this will be complicated). 
In addition, NVPR makes this very complicated, and I haven't quite figured out a good way to handle it, so for now color and coverage DO live on optstate, but I will figure out some way to refactor that in future CLs.

BUG=skia:

Review URL: https://codereview.chromium.org/783763002
 2014-12-09 13:31:15 -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
309e346744 Rename CustomCoordTextureEffect to GrBitmapTextGeoProc. 
Also add in explicit set for LCD text in invariantOutput.

BUG=skia:

Review URL: https://codereview.chromium.org/786293002
 2014-12-09 10:35:58 -08:00
bsalomon
422f56f6e5 Make addUniform take a precision 
Review URL: https://codereview.chromium.org/788733003
 2014-12-09 10:18:12 -08:00
bsalomon
c0bd6484f6 Move shader precision out of GrShaderVar 
Review URL: https://codereview.chromium.org/777443003
 2014-12-09 10:04:14 -08:00
bsalomon
17168df779 Use texture size to determine precision of texture coord varyings. 
Review URL: https://codereview.chromium.org/778783002
 2014-12-09 09:00:49 -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
4ccf0b9405 Fix GrUnPreMulColor. 
Current version incorrectly unpacked the resulting sk unpremulled color into rgba.

BUG=skia:3208

Review URL: https://codereview.chromium.org/787713002
 2014-12-08 12:35:16 -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
jvanverth
28f9c606e4 Add support for half float alpha textures. 
This allows us to create distance field textures with better precision,
which may help text quality.

BUG=skia:3103

Review URL: https://codereview.chromium.org/762923003
 2014-12-05 13:06:35 -08:00
egdaniel
915187b71d Check XpFactory equality in DrawState 
BUG=skia:

Review URL: https://codereview.chromium.org/767873006
 2014-12-05 12:58:28 -08:00
egdaniel
8bf2bd335f Move GrPorterDuffXferProcessor to include/gpu/effects. 
BUG=skia:

Review URL: https://codereview.chromium.org/780263003
 2014-12-05 12:14:27 -08:00
bsalomon
c92aadcf9a clean up default precision handling 
R=joshualitt@google.com

Review URL: https://codereview.chromium.org/766753006
 2014-12-04 13:02:47 -08:00
joshualitt
eb2a676165 Remove backend factories 
BUG=skia:

Review URL: https://codereview.chromium.org/778453002
 2014-12-04 11:35:34 -08:00
joshualitt
87f48d997e create and thread batch tracker object 
I remove the factory on the next CL

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/c3a6eb23483e5d28073b509a5f637f41660de294

Review URL: https://codereview.chromium.org/772513002
 2014-12-04 10:41:40 -08:00
joshualitt
841a6b54c1 Revert of create and thread batch tracker object (patchset #9 id:160001 of https://codereview.chromium.org/772513002/) 
Reason for revert:
Breaking linux layout test

Original issue's description:
> create and thread batch tracker object
>
> I remove the factory on the next CL
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/c3a6eb23483e5d28073b509a5f637f41660de294

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

Review URL: https://codereview.chromium.org/774133003
 2014-12-04 06:00:41 -08:00
joshualitt
c3a6eb2348 create and thread batch tracker object 
I remove the factory on the next CL

BUG=skia:

Review URL: https://codereview.chromium.org/772513002
 2014-12-03 15:34:20 -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
bsalomon
ee64d6ef49 Add glGetShaderPrecisionFormat 
Review URL: https://codereview.chromium.org/778703003
 2014-12-03 10:46:08 -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
joshualitt
2dd1ae016d First step to moving vertex attributes to the geometryProcessor 
BUG=skia:

Review URL: https://codereview.chromium.org/761563002
 2014-12-03 06:24:10 -08:00
egdaniel
4bd4e8031d Add function to return an unpremuled version of a GrColor 
BUG=skia:

Review URL: https://codereview.chromium.org/773553002
 2014-12-01 12:30:51 -08:00
jvanverth
5eefe42e72 Fix assert in GrMaskFormatBytesPerPixel. 
BUG=skia:3174

Review URL: https://codereview.chromium.org/762553006
 2014-11-26 12:07:33 -08:00
joshualitt
267ce482b5 remove proc key 
BUG=skia:

Review URL: https://codereview.chromium.org/755363002
 2014-11-25 14:52:21 -08:00
bsalomon
a2c2323005 Remove GrSurface::isSameAs 
Review URL: https://codereview.chromium.org/753783003
 2014-11-25 07:41:12 -08:00
bsalomon
10e23caea3 Use scratch keys for stencil buffers. 
BUG=skia:2889

Committed: https://skia.googlesource.com/skia/+/91175f19664a62851da4ca4e0984a7c7c45b258f

Review URL: https://codereview.chromium.org/747043004
 2014-11-25 05:52:06 -08:00
bsalomon
19cd0f1813 Revert "Use scratch keys for stencil buffers." 
This reverts commit 91175f1966.

Revert "Cleanup res cache bench and split out into a unit test."

This reverts commit 4e4303f002.

Revert "rebaselines"

This reverts commit 65ba7b5775.

TBR=tomhudson@google.com

Review URL: https://codereview.chromium.org/752233002
 2014-11-24 12:19:06 -08:00
bsalomon
91175f1966 Use scratch keys for stencil buffers. 
BUG=skia:2889

Review URL: https://codereview.chromium.org/747043004
 2014-11-24 07:05:15 -08:00
bsalomon
932f866987 Create GrOptDrawState directly in the cmd buffer in GrIODB. 
Review URL: https://codereview.chromium.org/746243002
 2014-11-24 06:47:48 -08:00
bsalomon
b03c4a35bd Don't use NULL GrOptDrawState to indicate that draw should be skipped. 
Review URL: https://codereview.chromium.org/742853002
 2014-11-20 09:56:11 -08:00
joshualitt
02bcd9db00 move GrGeometryProcessor to src 
TBR=
BUG=skia:

Review URL: https://codereview.chromium.org/739943003
 2014-11-19 08:24:09 -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
egdaniel
ec03a46080 Add processor name to comment when printing out shaders. 
BUG=skia:

Review URL: https://codereview.chromium.org/735153002
 2014-11-19 06:22:39 -08:00
joshualitt
7eb8c7b00a drawinfo carries bufferinfo 
BUG=skia:

Review URL: https://codereview.chromium.org/737723003
 2014-11-18 14:24:27 -08:00
joshualitt
9853ccef19 Drawstate on stack 
BUG=skia:

Review URL: https://codereview.chromium.org/732693002
 2014-11-17 14:22:49 -08:00
bsalomon
84c8e62fad Allow GPU resources to not be counted against the cache budget. 
BUG=skia:2889

Review URL: https://codereview.chromium.org/721353002
 2014-11-17 09:33:27 -08:00