AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
18,686 Commits 1 Branch 0 Tags 544 MiB
c21b09eec9
Commit Graph

314 Commits

Author SHA1 Message Date
bsalomon
c21b09eec9 Change SkShader;asFragmentProcessor signature to no longer take skpaint\grcolor* 
Committed: https://skia.googlesource.com/skia/+/ecfdc251be71f3d634e76afdd6375bf55fc061aa

Review URL: https://codereview.chromium.org/1316513002
 2015-08-28 18:46:56 -07:00
rmistry
a511e6ad10 Revert of Change SkShader;asFragmentProcessor signature to no longer take skpaint\grcolor* (patchset #8 id:140001 of https://codereview.chromium.org/1316513002/ ) 
Reason for revert:
Primary suspect in failing DEPS rolls:
* https://codereview.chromium.org/1315753006
* https://codereview.chromium.org/1308323006
* https://codereview.chromium.org/1320903004

Primary suspect because the failing win bots did not fail in https://codereview.chromium.org/1315753005

Original issue's description:
> Change SkShader;asFragmentProcessor signature to no longer take skpaint\grcolor*
>
> Committed: https://skia.googlesource.com/skia/+/ecfdc251be71f3d634e76afdd6375bf55fc061aa

TBR=joshualitt@google.com,wangyix@google.com,robertphillips@google.com,bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1313573005
 2015-08-28 17:16:50 -07:00
bsalomon
ecfdc251be Change SkShader;asFragmentProcessor signature to no longer take skpaint\grcolor* 
Review URL: https://codereview.chromium.org/1316513002
 2015-08-28 14:33:47 -07:00
hendrikw
885bf09255 skia: add ability to load command_buffer_gles2 
BUG=skia:

Review URL: https://codereview.chromium.org/1306823003
 2015-08-27 10:38:39 -07:00
bsalomon
ac856c97ac Remove GrStagedProcessor, remove the word Stage as it applies to FPs 
Committed: https://skia.googlesource.com/skia/+/24243446cdf7b7e4e132c2a0c387c7723777e0c7

Review URL: https://codereview.chromium.org/1307223004
 2015-08-27 06:30:17 -07:00
joshualitt
bcf33d5c06 Rename GrBWFillRectBatch to GrNonAAFillRectBAtch 
TBR=bsalomon@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/1319733002
 2015-08-26 08:10:35 -07:00
rmistry
4bf69f7bbc Revert of Remove GrStagedProcessor, remove the word Stage as it applies to FPs (patchset #6 id:90001 of https://codereview.chromium.org/1307223004/ ) 
Reason for revert:
Causes bot failures:

https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Mac10.9-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug/builds/1639

https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug/builds/1702

https://uberchromegw.corp.google.com/i/client.skia.android/builders/Test-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Debug/builds/1223

Original issue's description:
> Remove GrStagedProcessor, remove the word Stage as it applies to FPs
>
> Committed: https://skia.googlesource.com/skia/+/24243446cdf7b7e4e132c2a0c387c7723777e0c7

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

Review URL: https://codereview.chromium.org/1306803003
 2015-08-26 06:48:27 -07:00
bsalomon
24243446cd Remove GrStagedProcessor, remove the word Stage as it applies to FPs 
Review URL: https://codereview.chromium.org/1307223004
 2015-08-26 05:39:18 -07:00
bsalomon
add79ef7cb Put drawPath in GrBatch. 
TODO: Implement path range version of this (and preserve combining consecutive ranges).

Review URL: https://codereview.chromium.org/1301823002
 2015-08-19 13:26:49 -07:00
joshualitt
ae5b2c623b Create GrQuad 
BUG=skia:

Review URL: https://codereview.chromium.org/1294713009
 2015-08-19 08:48:41 -07:00
joshualitt
da04e0e80a Allow setting of GrBatchFontCache atlas sizes 
BUG=skia:

Review URL: https://codereview.chromium.org/1255943006
 2015-08-19 08:16:43 -07:00
bsalomon
a44919ea27 Path stenciling in GrBatch 
Review URL: https://codereview.chromium.org/1293973003
 2015-08-18 13:28:20 -07:00
bsalomon
872062cab8 GrCopySurfaceBatch 
Review URL: https://codereview.chromium.org/1289673004
 2015-08-18 12:12:35 -07:00
wangyix
b1daa86732 When getGLInstance is called on a frag proc, the resulting GrGLFragmentProcessor will be the root of a tree of GrGLFragmentProcessors that mirrors the GrFragmentProcessor's tree. This allows setData() to be called recursively (removing the responsibility from compose shader) and allows gl instances direct access to their children gl instances so they can emit their code. 
BUG=skia:4182

Review URL: https://codereview.chromium.org/1287023009
 2015-08-18 11:29:32 -07:00
joshualitt
2ad37be2b1 Move GrTBatchTesselator to its own file 
BUG=skia:

Review URL: https://codereview.chromium.org/1298983002
 2015-08-18 10:16:01 -07:00
bsalomon
5346983b2e Put clear and discard into GrBatch. 
Review URL: https://codereview.chromium.org/1293563003
 2015-08-18 09:20:09 -07:00
bsalomon
7539856c1b Make GrVertexBatch objects hold their own draws during GrDrawTarget flush 
NO_MERGE_BUILDS

Review URL: https://codereview.chromium.org/1286043004
 2015-08-17 12:55:38 -07:00
bsalomon
16b991390b Split GrDrawBatch and GrVertexBatch into their own files 
TBR=joshualitt@google.com

Review URL: https://codereview.chromium.org/1296483002
 2015-08-13 14:55:50 -07:00
joshualitt
9c80b5ff59 Move GrRectBatch to GrBWFillRectBatch and make internal 
BUG=skia:

Review URL: https://codereview.chromium.org/1294553003
 2015-08-13 10:05:51 -07:00
joshualitt
14205b114a Expand functionality of GrRectBatchFactory with AARects 
BUG=skia:

Review URL: https://codereview.chromium.org/1279303002
 2015-08-10 11:40:56 -07:00
joshualitt
ecd1a69fbf Create GrRectBatchFactory 
BUG=skia:

Review URL: https://codereview.chromium.org/1287433003
 2015-08-10 10:08:26 -07:00
joshualitt
9ff6425ce4 move Stroke Rect and AAFill Rect to their own file 
BUG=skia:

Review URL: https://codereview.chromium.org/1282723004
 2015-08-10 09:03:51 -07:00
joshualitt
2771b5617c GrDrawVertices to batches 
BUG=skia:

Review URL: https://codereview.chromium.org/1276333004
 2015-08-07 12:46:26 -07:00
jvanverth
14b8803b7c Move GrDrawAtlasBatch to separate file 
Committed: https://skia.googlesource.com/skia/+/b091c44c33edbad3466601b29d60bc2eaa4453fa

Review URL: https://codereview.chromium.org/1274013003
 2015-08-07 12:18:54 -07:00
jvanverth
1694a936f6 Revert of Move GrDrawAtlasBatch to separate file (patchset #1 id:1 of https://codereview.chromium.org/1274013003/ ) 
Reason for revert:
Build failures

Original issue's description:
> Move GrDrawAtlasBatch to separate file
>
> Committed: https://skia.googlesource.com/skia/+/b091c44c33edbad3466601b29d60bc2eaa4453fa

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

Review URL: https://codereview.chromium.org/1276173003
 2015-08-07 11:53:13 -07:00
jvanverth
b091c44c33 Move GrDrawAtlasBatch to separate file 
Review URL: https://codereview.chromium.org/1274013003
 2015-08-07 11:49:17 -07:00
joshualitt
74417824cd Make folder for batches 
BUG=skia:

Review URL: https://codereview.chromium.org/1277233002
 2015-08-07 11:42:17 -07:00
bsalomon
ee14a622b0 Give strokerectbatch a proper home 
Review URL: https://codereview.chromium.org/1274763002
 2015-08-05 10:34:05 -07:00
joshualitt
b542bae1f5 Rename GrInOrderDrawBuffer to GrBufferedDrawTarget 
BUG=skia:

Review URL: https://codereview.chromium.org/1261033002
 2015-07-28 09:58:39 -07:00
wangyix
cef14bf9ce Added GrGLBlend.h|cpp with helper function AppendPorterDuffBlend() in preparation for SkComposeShader gpu backend 
BUG=skia:

Review URL: https://codereview.chromium.org/1254833003
 2015-07-24 13:48:26 -07:00
joshualitt
259fbf1916 Add sanity check to GrAtlasTextBlob 
BUG=skia:

Review URL: https://codereview.chromium.org/1250693002
 2015-07-21 11:39:35 -07:00
joshualitt
374b2f7cea rename BitmapTextBlob and move it to its own file 
BUG=skia:

Review URL: https://codereview.chromium.org/1249663002
 2015-07-21 08:05:03 -07:00
joshualitt
9ec0d4342d Removing GrTemplates.h 
BUG=skia:

Review URL: https://codereview.chromium.org/1233923004
 2015-07-17 06:40:29 -07:00
joshualitt
5ca41c1647 Remove GrRedBlackTree 
BUG=skia:

Review URL: https://codereview.chromium.org/1226203013
 2015-07-14 11:07:53 -07:00
joshualitt
3df1e2163f Another trivial cleanup 
TBR=bsalomon@google.com
BUG=skia:

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

Review URL: https://codereview.chromium.org/1229303003
 2015-07-14 11:02:46 -07:00
joshualitt
6968428f44 Revert of Another trivial cleanup (patchset #6 id:100001 of https://codereview.chromium.org/1229303003/) 
Reason for revert:
breaking things

Original issue's description:
> Another trivial cleanup
>
> TBR=bsalomon@google.com
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/52e7657cd850f95e66eb23c6d138ee45149a1039

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

Review URL: https://codereview.chromium.org/1233853004
 2015-07-13 13:29:13 -07:00
joshualitt
52e7657cd8 Another trivial cleanup 
TBR=bsalomon@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/1229303003
 2015-07-13 13:11:40 -07:00
joshualitt
690fc75b29 Get rid of GrMurmur3Hash 
BUG=skia:

Review URL: https://codereview.chromium.org/1233933002
 2015-07-13 12:49:13 -07:00
joshualitt
2419b360ea Add GrNonAtomicRef 
BUG=skia:

Review URL: https://codereview.chromium.org/1238523002
 2015-07-13 09:29:42 -07:00
joshualitt
3989205322 remove some unused stuff 
BUG=skia:

Review URL: https://codereview.chromium.org/1231163002
 2015-07-10 14:14:03 -07:00
joshualitt
9cc1775e72 rename GrShaderDataManager -> GrProcessorDataManager 
BUG=skia:

Review URL: https://codereview.chromium.org/1228683002
 2015-07-09 06:28:14 -07:00
joshualitt
8ca93e7c73 Initial CL to create dummy GrShaderDataManager and thread it through 
TBR=bsalomon@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/1225673007
 2015-07-08 06:51:43 -07:00
kkinnunen
7aedda57f8 Refactor separable varying location info to be stored in GrGLProgram subclass 
Refactor separable varying location info to be stored in GrGLProgram
subclass GrGLProgram instead of storing it in GrGLPathProcessor.

Separable varyings are exactly analoguous to uniforms: they are inputs
to the shader program. Shader compile-time information about uniforms is gathered to
GrGLProgramBuilder. This information is the converted to link-time
information, uniform locations, when constructing the program. Separable
varyings need to have same lifetime model.

This is needed in the future to support path rendering in Chromium. The
Chromium pseudo-extension will expose program fragment input binding
function similar to uniform binding function. Thus the separable varying
locations need to be decided and bound before link, e.g. before
GrGLProgram is created. This will be achieved in further patches by
overloading GrGLProgramBuilder::bindProgramResourceLocations() in
GrGLNvprProgramBuilder.

BUG=chromium:344330

Review URL: https://codereview.chromium.org/1186113007
 2015-06-29 23:01:28 -07:00
jvanverth
cba99b88fd Move GLSL-specific routines/classes to separate glsl directory 
The purpose is to begin separating our GLSL-specific code from
our GL-specific code, so it can be used with the GL45 platform

Review URL: https://codereview.chromium.org/1202293002
 2015-06-24 06:59:57 -07:00
cdalton
ee0175f1b0 Move blend enums into GrBlend.h 
Moves blend enums from GrXferProcessor.h to GrBlend.h, makes GrBlend.h
public.

BUG=skia:

Review URL: https://codereview.chromium.org/1180713008
 2015-06-12 08:21:26 -07:00
ethannicholas
1a1b3ac0d4 Added GrAAFlatteningConvexPathRenderer. 
This is an alternate version of GrAAConvexPathRenderer which handles
curves by first flattening them to straight lines.

BUG=skia:

Review URL: https://codereview.chromium.org/1158803002
 2015-06-10 12:11:17 -07:00
joshualitt
7224c86632 add context override of GeometryBufferMapThreshold 
BUG=skia:

Review URL: https://codereview.chromium.org/1159713006
 2015-05-29 06:46:47 -07:00
cdalton
6fd158ea47 Implement Porter Duff XP with a blend table 
Removes the runtime logic used by PorterDuffXferProcessor to decide
blend coeffs and shader outputs, and instead uses a compile-time
constant table of pre-selected blend formulas. Separates out the dst
read fallback into its own XP.

Introduces a new blend strategy for srcCoeff=0 that can apply coverage
with a reverse subtract blend equation instead of dual source
blending.

Adds new macros in GrBlend.h to analyze blend formulas both runtime.

Removes kSetCoverageDrawing_OptFlag and GrSimplifyBlend as they are no
longer used.

Adds a GM that verifies all xfermodes, including arithmetic, with the
color/coverage invariants used by Porter Duff.

Adds a unit test that verifies each Porter Duff formula with every
color/coverage invariant.

Major changes:

 * Uses a reverse subtract blend equation for coverage when srcCoeff=0
   (clear, dst-out [Sa=1], dst-in, modulate). Platforms that don't
   support dual source blending no longer require a dst copy for
   dst-in and modulate.

 * Sets BlendInfo::fWriteColor to false when the blend does not modify
   the dst. GrGLGpu will now use glColorMask instead of blending for
   these modes (dst, dst-in [Sa=1], modulate ignored for [Sc=1]).

 * Converts all SA blend coeffs to One for opaque inputs, and ISA to
   Zero if there is also no coverage. (We keep ISA around when there
   is coverage because we use it to tweak alpha for coverage.)

 * Abandons solid white optimizations for the sake of simplicity
   (screen was the only mode that previous had solid white opts).

Minor differences:

 * Inconsequential differences in opt flags (e.g. we now return
   kCanTweakAlphaForCoverage_OptFlag even when there is no coverage).

 * Src coeffs when the shader outputs 0.

 * IS2C vs IS2A when the secondary output is scalar.

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/9a70920db22b6309c671f8e5d519bb95570e4414

Review URL: https://codereview.chromium.org/1124373002
 2015-05-27 15:08:33 -07:00
robertphillips
ccb1b57510 Move SkGpuDevice::internalDrawPath to GrBlurUtils::drawPathWithMaskFilter 
This CL is ugly but it:

removes the stored SkGpuDevice back pointer from GrTextContext (at the cost of passing more parameters)
moves SkGpuDevice::internalDrawPath to GrDrawContext::drawPathFull

Unfortunately, the GrTextContext-derived classes still need the SkGpuDevice for filterTextFlags calls but I will try removing that in a separate CL.

Review URL: https://codereview.chromium.org/1157773003
 2015-05-27 11:02:55 -07:00
bsalomon
dc47ff7f1f Split GrCaps impl out into its own cpp 
TBR=joshualitt@google.com

Review URL: https://codereview.chromium.org/1151503003
 2015-05-26 12:16:59 -07:00