Commit Graph

29523 Commits

Author SHA1 Message Date
Greg Daniel
d62f5541f2 Fix WrappedProxyTest for sample count change
Bug: skia:
Change-Id: I3c131cf253512f7e91558792ecb6c6a6ce0a8e9c
Reviewed-on: https://skia-review.googlesource.com/24865
Reviewed-by: Greg Daniel <egdaniel@google.com>
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
2017-07-20 13:38:12 +00:00
Greg Daniel
2bb6ecc112 Revert "Revert "Fixes from sample count change""
This reverts commit 914b285d45.

Reason for revert: Already have fix for bug, which is quicker than fixing merge conflict

Original change's description:
> Revert "Fixes from sample count change"
> 
> This reverts commit f3316224b9.
> 
> Reason for revert: <INSERT REASONING HERE>
> 
> Original change's description:
> > Fixes from sample count change
> > 
> > Re blacklist imagination msaa on Vulkan and fix i->1 bug in GL
> > 
> > Bug: skia:
> > Change-Id: I8045565b2064d2ee037ab43b167e6d5d3a59268e
> > Reviewed-on: https://skia-review.googlesource.com/24780
> > Reviewed-by: Cary Clark <caryclark@google.com>
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
> 
> TBR=egdaniel@google.com,bsalomon@google.com,caryclark@google.com
> 
> Change-Id: I8e3c95621eb0bc6ea2be24cc4ee67f88239263ed
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/24863
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>

TBR=egdaniel@google.com,bsalomon@google.com,caryclark@google.com

Change-Id: I43cb50691885cae8fe8bab1f034eb6a00b77de81
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/24900
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
2017-07-20 13:11:19 +00:00
Greg Daniel
914b285d45 Revert "Fixes from sample count change"
This reverts commit f3316224b9.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> Fixes from sample count change
> 
> Re blacklist imagination msaa on Vulkan and fix i->1 bug in GL
> 
> Bug: skia:
> Change-Id: I8045565b2064d2ee037ab43b167e6d5d3a59268e
> Reviewed-on: https://skia-review.googlesource.com/24780
> Reviewed-by: Cary Clark <caryclark@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>

TBR=egdaniel@google.com,bsalomon@google.com,caryclark@google.com

Change-Id: I8e3c95621eb0bc6ea2be24cc4ee67f88239263ed
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/24863
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
2017-07-20 13:02:39 +00:00
Cary Clark
ff98644cb4 Revert "Revert "Fixes from sample count change""
This reverts commit 390aaaf403.

Reason for revert: could not revert breaking change automatically because of conflict during merge

Original change's description:
> Revert "Fixes from sample count change"
> 
> This reverts commit f3316224b9.
> 
> Reason for revert: android vulkan build broken
> 
> Original change's description:
> > Fixes from sample count change
> > 
> > Re blacklist imagination msaa on Vulkan and fix i->1 bug in GL
> > 
> > Bug: skia:
> > Change-Id: I8045565b2064d2ee037ab43b167e6d5d3a59268e
> > Reviewed-on: https://skia-review.googlesource.com/24780
> > Reviewed-by: Cary Clark <caryclark@google.com>
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
> 
> TBR=egdaniel@google.com,bsalomon@google.com,caryclark@google.com
> 
> Change-Id: I076a4226f5725b3d48592402772ca39b64cae478
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/24840
> Reviewed-by: Cary Clark <caryclark@google.com>
> Commit-Queue: Cary Clark <caryclark@google.com>

TBR=egdaniel@google.com,bsalomon@google.com,caryclark@google.com

Change-Id: I890540a68c18ed390773e97066ed92fea370d083
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/24842
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
2017-07-20 11:02:59 +00:00
Cary Clark
390aaaf403 Revert "Fixes from sample count change"
This reverts commit f3316224b9.

Reason for revert: android vulkan build broken

Original change's description:
> Fixes from sample count change
> 
> Re blacklist imagination msaa on Vulkan and fix i->1 bug in GL
> 
> Bug: skia:
> Change-Id: I8045565b2064d2ee037ab43b167e6d5d3a59268e
> Reviewed-on: https://skia-review.googlesource.com/24780
> Reviewed-by: Cary Clark <caryclark@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>

TBR=egdaniel@google.com,bsalomon@google.com,caryclark@google.com

Change-Id: I076a4226f5725b3d48592402772ca39b64cae478
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/24840
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
2017-07-20 10:57:30 +00:00
Mike Reed
e32500f064 Assume HQ is handled by pipeline, delete legacy code-path
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD
Bug: skia:
Change-Id: If6f0d0a57463bf99a66d674e65a62ce3931d0116
Reviewed-on: https://skia-review.googlesource.com/24644
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-07-20 00:43:37 +00:00
Brian Osman
3e583cba8a Strip out unused tracing macros
Bug: skia:
Change-Id: I3edbc50820af6414405a7d4810178e050234db0c
Reviewed-on: https://skia-review.googlesource.com/24743
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
2017-07-20 00:26:07 +00:00
Brian Salomon
d17f6584df Remove GrBackendTextureDesc
Change-Id: I2b123d1782400e97ab2ce2f11e3e3d325a13e6c8
Reviewed-on: https://skia-review.googlesource.com/24748
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
2017-07-20 00:21:18 +00:00
Hal Canary
22b2d8c5e1 SkPDF: minor cleanups of skpdfdevice
Change-Id: I2143daaa6061003d8631f38ea39724fb12d494db
Reviewed-on: https://skia-review.googlesource.com/24747
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
2017-07-20 00:09:57 +00:00
Hal Canary
7e872caaf6 SkPDF: SkPDFMakeShader takes the paint color.
This allows alpha blending and also alpha shaders with color blended in.

fixes GMs:  composeshader_alpha, composeshader_bitmap

Change-Id: I3ab9cbef216f7733798d2e29541b4211c627dab2
Reviewed-on: https://skia-review.googlesource.com/24760
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
2017-07-19 22:25:22 +00:00
Mike Reed
b7648a2758 removed dead colortable code
Bug: skia:6828
Change-Id: I2d3b3b7c846d3ac08bbcb9357cb644873fe5a286
Reviewed-on: https://skia-review.googlesource.com/24623
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Leon Scroggins <scroggo@google.com>
2017-07-19 22:20:57 +00:00
Brian Salomon
1635146864 Make GrPipeline non-refcounted
GrPipelines are now created in GrOpFlushState's arena during GrOp::prepare() and cleaned up when the arena is destroyed.

Change-Id: I2cc4f03ce130bfb22e9d28bb3c22c485113d5d53
Reviewed-on: https://skia-review.googlesource.com/24681
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-07-19 22:20:18 +00:00
Mike Klein
04d488cf13 Tweak HWCAP_... names to avoid clash with hwcap.h
These HWCAP_... values are defined in hwcap.h, but we don't get them
from there because some platforms have older hwcap.h that don't have
these bits named yet.

Even though we don't directly include hwcap.h, it seems it can get
itself included somehow on some platforms.  That leads to a name
clash with the HWCAP_... #defines in there.  To avoid it, rename them.

Change-Id: I70788b5e4072c307c6eee55d6f197c3b9a49f5dc
Reviewed-on: https://skia-review.googlesource.com/24408
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-07-19 22:05:37 +00:00
Hal Canary
f828c1df2f Add Alpha Image GM
Change-Id: I835a59d9f8593e30db817dc8bd1d276af8c80cd7
Reviewed-on: https://skia-review.googlesource.com/24685
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
2017-07-19 21:58:09 +00:00
Greg Daniel
f3316224b9 Fixes from sample count change
Re blacklist imagination msaa on Vulkan and fix i->1 bug in GL

Bug: skia:
Change-Id: I8045565b2064d2ee037ab43b167e6d5d3a59268e
Reviewed-on: https://skia-review.googlesource.com/24780
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
2017-07-19 21:45:47 +00:00
Greg Daniel
81e7bf8d6d Update gpu caps for valid sample counts.
Instead of query and maxSampleCount and using that to cap, we now have
each config store its supported values and when requested returns either
the next highest or equal supported value, or if non the max config supported.

Bug: skia:
Change-Id: I8802d44c13b3b1703ee54a7e69b82102d4b8dc2d
Reviewed-on: https://skia-review.googlesource.com/24302
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
2017-07-19 19:13:25 +00:00
Hal Canary
fc3afa921b SkPDF: more paths as rects
Motivation: Content streams are marginally smaller and easier to read
(for debugging).
Change-Id: Idb82276f512408c083a1001da217707fd2d48e49
Reviewed-on: https://skia-review.googlesource.com/24744
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
2017-07-19 19:07:45 +00:00
Eric Boren
edfe4a5ca0 [infra] Add protoc asset
This is actually just needed for the infra repo, but that doesn't have
any of the mechanisms for creating assets, so it's simpler to do that
here.

NOTRY=true
Bug: skia:6866
Change-Id: I5d9810fc7440703090b55b13d06b39f92e85f172
Reviewed-on: https://skia-review.googlesource.com/24680
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
2017-07-19 18:23:36 +00:00
Ethan Nicholas
b7e8c3b52a run skslc output through clang-format
Bug: skia:
Change-Id: I97af420d1c3270e24e5d0959237b8163faa9e069
Reviewed-on: https://skia-review.googlesource.com/24646
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2017-07-19 18:19:55 +00:00
Brian Salomon
e5b399ee69 Remove GrLegacyMeshDrawOp and GrPipelineBuilder
Change-Id: Ib301a0e7d4b4c4f05417d28862017307949748c9
Reviewed-on: https://skia-review.googlesource.com/23584
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
2017-07-19 18:16:05 +00:00
Florin Malita
6d66237a03 Revert "Use raster pipeline for repeat/mirror radial gradients"
This reverts commit 2f924b4b0e.

Reason for revert: IOS nanobench crashes

Original change's description:
> Use raster pipeline for repeat/mirror radial gradients
> 
> The legacy clamp specialization is still faster, but for repeat and
> mirror RP wins (at low color stop counts).
> 
> Change-Id: Ifef3eb5b3111b3741d3a033310a4cdb58e592247
> Reviewed-on: https://skia-review.googlesource.com/24283
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Florin Malita <fmalita@chromium.org>

TBR=mtklein@google.com,herb@google.com,fmalita@chromium.org,reed@google.com

Change-Id: I65db31b149b6b2507cbe470049f67774e3bf40a0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/24660
Reviewed-by: Florin Malita <fmalita@google.com>
Commit-Queue: Florin Malita <fmalita@google.com>
2017-07-19 17:51:48 +00:00
Brian Salomon
40d01190ad Fix Google3 Roller?
Broken by: https://skia.googlesource.com/skia.git/+/dcbb9d90db0e07b7a3625bcdab3af11ab44c4cfe

Change-Id: I704e341580c50e61ec66cee59ece8ded7d491aeb
Reviewed-on: https://skia-review.googlesource.com/24642
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-07-19 17:28:24 +00:00
Brian Salomon
c5886036cb Move GrTypesPriv.h to include/private
Bug: skia:
Change-Id: I68610fed67a70454a815229c47b78ea6d9463a43
Reviewed-on: https://skia-review.googlesource.com/24624
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-07-19 17:16:14 +00:00
Florin Malita
2f924b4b0e Use raster pipeline for repeat/mirror radial gradients
The legacy clamp specialization is still faster, but for repeat and
mirror RP wins (at low color stop counts).

Change-Id: Ifef3eb5b3111b3741d3a033310a4cdb58e592247
Reviewed-on: https://skia-review.googlesource.com/24283
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
2017-07-19 17:13:44 +00:00
Brian Salomon
0c15ae82f0 Revert "Revert "Revert "Revert "Improvements to GPU dither.""""
This reverts commit f2290cb924.

Reason for revert: SPIRV codegen fix has landed

Original change's description:
> Revert "Revert "Revert "Improvements to GPU dither."""
> 
> This reverts commit 0f01b2e8b5.
> 
> Reason for revert: <INSERT REASONING HERE>
> 
> Original change's description:
> > Revert "Revert "Improvements to GPU dither.""
> > 
> > This reverts commit 38fb308f31.
> > 
> > Reason for revert: Reland with SkSL caps fix for vulkan
> > 
> > Original change's description:
> > > Revert "Improvements to GPU dither."
> > > 
> > > This reverts commit 1806e33e6a.
> > > 
> > > Reason for revert: <INSERT REASONING HERE>
> > > 
> > > Original change's description:
> > > > Improvements to GPU dither.
> > > > 
> > > > 1) Makes the range of the offset dependent on the config.
> > > > 
> > > > 2) Uses an ordered dither on GPUs that support integers in shaders.
> > > > 
> > > > 3) Enables dithering for all paints with dither flag when the color type of the dst is 4444
> > > > 
> > > > 4) Dithers r,g,b and clamps to 0,a rather than dithering all four channels (same as CPU backend).
> > > > 
> > > > Bug: skia:
> > > > Change-Id: Ie22c3adc38c6d1dbbcd97e4b7d16fc843e392c2e
> > > > Reviewed-on: https://skia-review.googlesource.com/23485
> > > > Commit-Queue: Brian Salomon <bsalomon@google.com>
> > > > Reviewed-by: Robert Phillips <robertphillips@google.com>
> > > 
> > > TBR=bsalomon@google.com,robertphillips@google.com
> > > 
> > > Change-Id: Ie82e88bd9032bf8eee745d32d9b57c335a8997c9
> > > No-Presubmit: true
> > > No-Tree-Checks: true
> > > No-Try: true
> > > Bug: skia:
> > > Reviewed-on: https://skia-review.googlesource.com/24325
> > > Reviewed-by: Brian Salomon <bsalomon@google.com>
> > > Commit-Queue: Brian Salomon <bsalomon@google.com>
> > 
> > TBR=bsalomon@google.com,robertphillips@google.com
> > 
> > Change-Id: Ic38ac276c8b88b8d993a29d1fcbfe37e84becd2a
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: skia:
> > Reviewed-on: https://skia-review.googlesource.com/24282
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
> > Commit-Queue: Brian Salomon <bsalomon@google.com>
> 
> TBR=bsalomon@google.com,robertphillips@google.com
> 
> Change-Id: I5ce47b06a1b451942faf9066b1a45a716b1b3f3c
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/24480
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>

TBR=bsalomon@google.com,robertphillips@google.com

Change-Id: I112df51494bc3cc832fde9c22a6532082df85a81
Reviewed-on: https://skia-review.googlesource.com/24285
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
2017-07-19 16:07:34 +00:00
Brian Salomon
dcbb9d90db Add SkDebugf trace event handler.
Also adds more trace events to GPU backend.

Change-Id: Ifa5f0cd4b1fd582f0cc30d37d9e6414dc498c75d
Reviewed-on: https://skia-review.googlesource.com/24622
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-07-19 15:41:34 +00:00
Ethan Nicholas
925f52d03b fixed SPIR-V int->uint conversion
Bug: skia:
Change-Id: I31c035ac5839d60521ee9d8f73c879776ef5d22d
Reviewed-on: https://skia-review.googlesource.com/24621
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
2017-07-19 15:25:09 +00:00
Brian Salomon
fc26f3ca5f Remove GrAnalyticRectOp, the last legacy GrMeshDrawOp
Change-Id: I2b8d1f4c1585af4a157d269a526874bccc74ac81
Reviewed-on: https://skia-review.googlesource.com/23484
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
2017-07-19 15:21:05 +00:00
Mike Reed
883c9bce67 experimental: draw into unpremul
raster-only

Bug: skia:
Change-Id: I3af19f031083c9cc258f73ba6a2f6020bb15f110
Reviewed-on: https://skia-review.googlesource.com/24400
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-07-19 15:20:04 +00:00
Mike Reed
9291b2921b remove google3 colortable flag
Bug: skia:6828
Change-Id: Id2d8b4ef2d1e1f9ca0ef610d550cde9021a3845e
Reviewed-on: https://skia-review.googlesource.com/24331
Reviewed-by: Mike Reed <reed@google.com>
2017-07-19 15:10:12 +00:00
Florin Malita
fff3a40767 Singleton SRGB color filters
Change-Id: I67e976e63bbb9ebb47616613e02adb97e6e2345c
Reviewed-on: https://skia-review.googlesource.com/24303
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
2017-07-19 14:55:24 +00:00
Greg Daniel
139eb805ca Add blacklist to vk win intel for skp
This blacklist the desk_skbug6850overlay2 which is causing llvm to crash
on the intel win bot when running vulkan.

Bug: skia:6863
Change-Id: I2c3ca597a3312e6c0a1bacae0056fcb1c19679bf
Reviewed-on: https://skia-review.googlesource.com/24264
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
2017-07-19 14:52:14 +00:00
Hal Canary
10ccb02fee SkPDF: Fix color glyphs with absolute positioning
BUG=chromium:617403
BUG=chromium:717570
BUG=skia:3489
Change-Id: I6b336836359e2cdccf5712edce5efd89f682a74d
Reviewed-on: https://skia-review.googlesource.com/24620
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
2017-07-19 14:49:57 +00:00
Leon Scroggins III
e726e7ca0c Report first GIF frame after knowing its meta data
Previously, we reported the first image as soon as it was available. As
a result, in crrev.com/2565323003, InitializeNewFrame might be called
before the metadata is known, meaning it would read the wrong metadata.

Instead of looking at the imagesCount(), SkGifCodec::NewFromStream looks
at frameContext(0), which may still exist even if it's not yet counted
in imagesCount().

Add a test that confirms the desired behavior.

Change-Id: Ib392721ecd2218ba0fcd35aaa64117c0ba3e4ea6
Reviewed-on: https://skia-review.googlesource.com/24405
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
2017-07-19 14:43:26 +00:00
Ravi Mistry
d81977f51b Download material design SVGs from Google Storage
NoTry: true
Bug: skia:6865
Change-Id: Id857d6ad0b5cdccbadb11810bf07a093467544ec
Reviewed-on: https://skia-review.googlesource.com/24086
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
2017-07-19 13:44:34 +00:00
Brian Osman
430e4c84e9 Some basic Flutter/Fuchsia docs
No-Try: true
Docs-Preview: https://skia.org/?cl=24406
Bug: skia:
Change-Id: I18ba9bf86b44b27262c9785cc0b5edbc982ae076
Reviewed-on: https://skia-review.googlesource.com/24406
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
2017-07-19 13:17:54 +00:00
Jungshik Shin
cae60da0a9 Add aliases mapping Windows CJ fonts to Noto Serif CJK
CrOS will have Noto Serif CJK as the default serif fonts for CJK.
Aliases in Skia need to be updated.

See https://chromium-review.googlesource.com/c/576708/ and
    https://chromium-review.googlesource.com/c/576789/

BUG=chromium:722470
TEST=With all the related CLs in, Noto Serif CJK {JP,SC,TC} are used
when MS (P)Mincho,(N)Simsun,(P)MingLiu are requested.

Change-Id: I8340c2b460671c0b2854360a89b051e0e9e8d57c
Reviewed-on: https://skia-review.googlesource.com/24521
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
2017-07-19 13:12:14 +00:00
Brian Salomon
44acb5b09b Revert "Revert "Make GrAtlasTextOp a non-legacy GrMeshDrawOp""
This reverts commit e3e9628ecf.

Adds blendmode_mask_* benchs to blacklist for Chromecast.
Otherwise a clean revert of the revert.

Bug: skia:
Change-Id: I9f64ae55804fa4aad97c1785834281039570c56c
Reviewed-on: https://skia-review.googlesource.com/24409
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
2017-07-19 12:17:34 +00:00
Robert Phillips
5af44defbd Add GrResourceAllocator class + unit test
Change-Id: I2700e8cb4213479b680519ba67f078cc3fb71376
Reviewed-on: https://skia-review.googlesource.com/23661
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
2017-07-19 11:43:54 +00:00
UpdateSKPs
11f898f154 Update SKP version
Automatic commit by the RecreateSKPs bot.

TBR=update-skps@skia.org
NO_MERGE_BUILDS

Change-Id: I5a6701b2d2fae53bede23669a6c3ae7d668da23d
Reviewed-on: https://skia-review.googlesource.com/24500
Reviewed-by: update-skps <update-skps@skia.org>
Commit-Queue: update-skps <update-skps@skia.org>
2017-07-18 22:56:24 +00:00
Chris Dalton
7bd55c2149 gl: print shader sources one line at a time
This ensures they don't get truncated by the ADB log.

Bug: skia:
Change-Id: I5ad0222e54f667c0dd3a5b1174d43588d90ca231
Reviewed-on: https://skia-review.googlesource.com/24421
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-07-18 22:53:24 +00:00
Mike Klein
968af43f72 remove gather_i8, unify memory-touching contexts
gather_i8 is now unused, so we can remove it.
That in turn makes the ctable field of SkJumper_GatherCtx unused.

After removing ctable, SkJumper_GatherCtx and SkJumper_PtrStride look
identical, so I've now fused them into SkJumper_MemoryCtx, which will
eventually be used by everything loading from, gathering from, or
storing to memory.

Change-Id: Ia882d2dbd54c9fcf9a8250a1ce83304389dd284a
Reviewed-on: https://skia-review.googlesource.com/24085
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2017-07-18 21:22:34 +00:00
Mike Reed
1e0ca8598a fix android-only function
Bug: skia:
Change-Id: I4225bcc368fb5ac0898f4e34221e47cd50f93061
Reviewed-on: https://skia-review.googlesource.com/24407
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
2017-07-18 21:15:24 +00:00
Brian Salomon
f2290cb924 Revert "Revert "Revert "Improvements to GPU dither."""
This reverts commit 0f01b2e8b5.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> Revert "Revert "Improvements to GPU dither.""
> 
> This reverts commit 38fb308f31.
> 
> Reason for revert: Reland with SkSL caps fix for vulkan
> 
> Original change's description:
> > Revert "Improvements to GPU dither."
> > 
> > This reverts commit 1806e33e6a.
> > 
> > Reason for revert: <INSERT REASONING HERE>
> > 
> > Original change's description:
> > > Improvements to GPU dither.
> > > 
> > > 1) Makes the range of the offset dependent on the config.
> > > 
> > > 2) Uses an ordered dither on GPUs that support integers in shaders.
> > > 
> > > 3) Enables dithering for all paints with dither flag when the color type of the dst is 4444
> > > 
> > > 4) Dithers r,g,b and clamps to 0,a rather than dithering all four channels (same as CPU backend).
> > > 
> > > Bug: skia:
> > > Change-Id: Ie22c3adc38c6d1dbbcd97e4b7d16fc843e392c2e
> > > Reviewed-on: https://skia-review.googlesource.com/23485
> > > Commit-Queue: Brian Salomon <bsalomon@google.com>
> > > Reviewed-by: Robert Phillips <robertphillips@google.com>
> > 
> > TBR=bsalomon@google.com,robertphillips@google.com
> > 
> > Change-Id: Ie82e88bd9032bf8eee745d32d9b57c335a8997c9
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: skia:
> > Reviewed-on: https://skia-review.googlesource.com/24325
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
> > Commit-Queue: Brian Salomon <bsalomon@google.com>
> 
> TBR=bsalomon@google.com,robertphillips@google.com
> 
> Change-Id: Ic38ac276c8b88b8d993a29d1fcbfe37e84becd2a
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/24282
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>

TBR=bsalomon@google.com,robertphillips@google.com

Change-Id: I5ce47b06a1b451942faf9066b1a45a716b1b3f3c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/24480
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-07-18 21:13:15 +00:00
Brian Osman
92ed61e624 Revert "Revert "remove dead code for legacy image encode api""
This reverts commit 1e0779ba11.

Reason for revert: Flutter and Fuchsia have both been switched to new API!

Original change's description:
> Revert "remove dead code for legacy image encode api"
> 
> This reverts commit 41ed7f3379.
> 
> Reason for revert: Need this in temporarily to navigate Flutter and Fuchsia rolls.
> 
> Original change's description:
> > remove dead code for legacy image encode api
> > 
> > Bug: skia:
> > Change-Id: Ia90d776946281473c56cd93006df1b523475696a
> > Reviewed-on: https://skia-review.googlesource.com/23022
> > Reviewed-by: Leon Scroggins <scroggo@google.com>
> > Commit-Queue: Mike Reed <reed@google.com>
> 
> TBR=scroggo@google.com,reed@google.com
> 
> # Not skipping CQ checks because original CL landed > 1 day ago.
> 
> Bug: skia:
> Change-Id: I078762fc13de0c455dc6f8a5725d9529af03bffc
> Reviewed-on: https://skia-review.googlesource.com/23385
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>

TBR=scroggo@google.com,brianosman@google.com,reed@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: skia:
Change-Id: I2b45facf21a97d01a81c7f311252d2f45eb1f61e
Reviewed-on: https://skia-review.googlesource.com/24281
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
2017-07-18 21:08:35 +00:00
Brian Salomon
0f01b2e8b5 Revert "Revert "Improvements to GPU dither.""
This reverts commit 38fb308f31.

Reason for revert: Reland with SkSL caps fix for vulkan

Original change's description:
> Revert "Improvements to GPU dither."
> 
> This reverts commit 1806e33e6a.
> 
> Reason for revert: <INSERT REASONING HERE>
> 
> Original change's description:
> > Improvements to GPU dither.
> > 
> > 1) Makes the range of the offset dependent on the config.
> > 
> > 2) Uses an ordered dither on GPUs that support integers in shaders.
> > 
> > 3) Enables dithering for all paints with dither flag when the color type of the dst is 4444
> > 
> > 4) Dithers r,g,b and clamps to 0,a rather than dithering all four channels (same as CPU backend).
> > 
> > Bug: skia:
> > Change-Id: Ie22c3adc38c6d1dbbcd97e4b7d16fc843e392c2e
> > Reviewed-on: https://skia-review.googlesource.com/23485
> > Commit-Queue: Brian Salomon <bsalomon@google.com>
> > Reviewed-by: Robert Phillips <robertphillips@google.com>
> 
> TBR=bsalomon@google.com,robertphillips@google.com
> 
> Change-Id: Ie82e88bd9032bf8eee745d32d9b57c335a8997c9
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/24325
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>

TBR=bsalomon@google.com,robertphillips@google.com

Change-Id: Ic38ac276c8b88b8d993a29d1fcbfe37e84becd2a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/24282
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-07-18 20:45:35 +00:00
Ravi Mistry
312f4b24f9 Copy over private SKPs during SKP asset create command
Bug: skia:6850
Change-Id: Idaa92d2b4233b9f03a15d70cc185261f0090bab4
Reviewed-on: https://skia-review.googlesource.com/24404
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
2017-07-18 19:59:33 +00:00
Hal Canary
4f29c20f20 SkPDF: Re-use Jpeg Image Shaders
Also, de-dup shader better.

  - SkBitmapKeyFromImage function factors out image de-dup code.
  - SkPDFUtils::ToBitmap funtion factors out to-bitmap code
  - make_image_shader function now takes Image rather than Bitmap.

All tests render the same.  Some are significantly smaller PDFs.

Change-Id: Id8dd36b31c8e573f44a5e9f6058d5a1d622b6385
Reviewed-on: https://skia-review.googlesource.com/24081
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Hal Canary <halcanary@google.com>
2017-07-18 19:33:34 +00:00
Ethan Nicholas
e46828675c sksl now sees vulkan caps
Bug: skia:
Change-Id: I41714d80685427a7711b000e61f7fc7e70371253
Reviewed-on: https://skia-review.googlesource.com/24182
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2017-07-18 18:39:08 +00:00
Jim Van Verth
b55eb28a17 Add some convexity checks to shadow code.
To address https://github.com/flutter/flutter/issues/11221.

Change-Id: I5ccd7f9eb2f3ee0d168aa4ca5474bfdfba14ca9c
Reviewed-on: https://skia-review.googlesource.com/24124
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
2017-07-18 18:37:38 +00:00