Commit Graph

48890 Commits

Author SHA1 Message Date
Ben Wagner
5c14d63297 Split out coretext fontmgr factory.
There can be only one SkFontMgr::Factory, so each should go in its own
translation unit. In addition, the name SkFontHost_mac is now rather out
of date and should now be SkFontMgr_mac_ct. Since the additional burden
of additional build changes after the first is minimal, also split out
SkTypeface_mac_ct and SkScalerContext_mac_ct. The original
SkFontHost_mac.cpp is kept as a shell which #includes the cpp files
which are replacing it. Once references to it are removed from all
builds it can be removed.

This is intended to be a reorganization without much code change. Most
changes are simple renaming of functions which are now shared between
translation units. However, there are a few behavior changes here.
  * Drop SkTypefaceCache global for SkTypeface_Mac 'local' global.
  * SkCTFontCTWidthForCSSWidth returns CGFloat instead of 'int'.
  * SkFontMgr_New_CoreText takes a CTFontCollectionRef.

Change-Id: Iaf58a0371667f266ada20c918941fab6bc27d9df
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294456
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
2020-06-05 19:22:38 +00:00
Ben Wagner
ea765a3329 Remove 'public' from disabled optional target.
An 'optional' target my wish to define public includes. When the target
is not enabled those public includes should not be present.

Change-Id: I1d0fc4553df100adf9178ad3f57bc0f5bb8f0fcb
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294658
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
2020-06-05 18:23:52 +00:00
Stephen White
9f7485b4bb Dawn: fix unsupported writePixels mode and test.
Dawn does not support writePixels to a TextureAsRenderTarget, so update its caps to reflect that.
Also update the WritePixelsNonTexture_Gpu test to check the caps.

Bug: skia:10333
Change-Id: I4dcf2e0fecc34cba9586e5cab71739e427301efb
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294597
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Stephen White <senorblanco@chromium.org>
2020-06-05 18:07:43 +00:00
John Stiles
0af87fe263 Pass input stage color to child processors.
This will allow multi-stage draw operations which use these FPs to
honor the input color.

Change-Id: I96ba3ff8720ed9fbd58b07bbe6315ffbbc7cf5b6
Bug: skia:10217
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294656
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
2020-06-05 18:07:34 +00:00
Stephen White
37a46d2536 Dawn: fix for crash on GrContextFactory_sharedContexts unit test.
Like Vulkan, Dawn requires "early abandon", so that the wgpu::Device is
freed before the dawn_native::Instance which created it.

Bug: skia:10334
Change-Id: I72346b724868790ede69c3cb09641e9054ef738e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294602
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Stephen White <senorblanco@chromium.org>
2020-06-05 18:00:44 +00:00
Herb Derby
692e59dca2 remove forceW system
The SkAtlasTextTarget forced W for drawing using 3D vertices. Since it
is gone, the force W system is not needed.

Change-Id: Ic70b2f9aa5fd845dcfa7b06b5905afeb72f96441
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294600
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
2020-06-05 17:00:19 +00:00
Kevin Lubick
530fedf893 [canvaskit] Add MacOS specific notes for setup
Change-Id: Ie42f6c7c980f952bb18b4444716cbe4681507e9f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294601
Reviewed-by: Leon Scroggins <scroggo@google.com>
2020-06-05 16:58:20 +00:00
Nathaniel Nifong
cd75b17943 Unit test of drawAtlas and fixes for bugs uncovered by it
Change-Id: I3583a5b3930aba03ae843daade50223e87c4ac6f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294338
Commit-Queue: Nathaniel Nifong <nifong@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
2020-06-05 16:02:29 +00:00
Brian Osman
43f443f086 Fix caching of GL program binaries
Our "header" reading and writing code didn't agree, so we always failed
to recognize cached program binaries. The asserts in the testing sink
failed to notice, because we did get a 100% cache hit rate, but we
immediately discarded the data we received.

We now also check that we didn't insert anything into the cache, as a
proxy for doing any shader compile work. That change, plus the tweak to
set cached=false when the header fields are invalid (like we do if we
encounter problems further in the blob) detected the problem. Adding the
version tag to the start of the encoded blob fixes the test, and means
that program binary caching is actually working again.

This code still looks (and is) fragile. The next CL is going to rewrite
things to use SkReadBuffer and SkWriteBuffer, make the parsing code less
brittle, and give us a more robust way to detect failure anywhere in the
stream.

Bug: skia:9402
Change-Id: I0329f088e0afce3998494d91ef2206e5eb9cac42
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294599
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
2020-06-05 15:54:19 +00:00
Greg Daniel
288ecf60bd Use main command buffer for updateBackendTexture in vulkan.
Deletes support for the "side" temp command buffer

Bug: chromium:1087124
Change-Id: I97cda4e98faddd2d65f257613e19a825f52402c1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294518
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
2020-06-05 15:42:49 +00:00
Michael Ludwig
de00dc9004 Detect empty clip when difference op clips everything
Change-Id: Ifbe0f3ae6e01d65f18351903da8aef63170ce6c7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294457
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Auto-Submit: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
2020-06-05 15:34:59 +00:00
Chris Dalton
b96995d05f Handle tessellated paths that require more segments than are supported
Adds a method to determine the worst-case number of tessellated line
segments that a path might require, and disables hardware tessellation
if it is more segments than are supported (falling back on indirect
draw shaders).

If the path requires even more segments than are supported by the
indirect draw shaders (1024), we crop the path to the viewport. The
required number of segments is proportional to the square root of the
bounding box's diagonal, so we won't start cropping paths until their
device-space bounding box diagonal is nearly 175,000 pixels long.

Change-Id: I8a9435e70bb93dda3464cc11a3e44fbe511744ae
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293691
Reviewed-by: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
2020-06-05 15:33:19 +00:00
Mike Klein
a9026da425 tiny fixup: depend on :skx
Change-Id: I792f79eb99106b36b8a53af01ee55898bd2041ac
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294566
Auto-Submit: Mike Klein <mtklein@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Herb Derby <herb@google.com>
2020-06-05 15:10:09 +00:00
Mike Klein
ad56c4c143 add structure for normal SKX opts
My experience porting the old opts over to the current SKX opts setup
was so bad that I don't want to try any more, and think it's probably
safer to port the SKX code to the old setup.

Need to hook up dependents (Chromium and Google3 I think) before we can
move the actual SXK opts code over.

Change-Id: Ibb8bc4a083cb104cd39f27cbfbc16e9eedd9bd46
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294495
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
2020-06-05 13:48:39 +00:00
Stephen White
e780a590ba Dawn: fix for abandoned contexts.
The AbandonedContextImage test destroys the GrContextFactory (and the
DawnTestContext) before destroying the GrDawnGpu, which leaves its wgpu::Device
alive after the dawn_native::Instance which created it is freed.

The fix is to drop the ref to the Queue and Device in GrDawnGpu::disconnect().

Bug: skia:10332
Change-Id: I757d0f6e902f700d67d1d3e0d5b2d28487528b6e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294517
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Stephen White <senorblanco@chromium.org>
2020-06-05 13:36:10 +00:00
Kevin Lubick
69e46da716 [canvaskit] Fix infrequent crash in SkFontMgr.FromData
The bug here is very subtle, as is the mitigation.

Quick background on WASM memory, there is an object
called wasmMemory (which might be hoisted into scope for
CanvasKit's pre-js functions), of type WebAssembly.Memory
which is a resizable ArrayBuffer. Emscripten provides the
JS code to initialize this and handle size increases.
Emscripten also provides TypedArray "views" into this buffer.
These are called CanvasKit.HEAPU8, CanvasKit.HEAPF32, etc.

When there is a call to CanvasKit._malloc, wasmMemory may
be resized. If that happens, the previous TypedArray views
become invalid. However, in the same call to _malloc,
emscripten will refresh the views [1]. So, dealing with
CanvasKit.HEAPU8 directly (quick aside, we never expect clients
to mess with these views, only us in our glue JS code
[e.g. interface.js]), should always be safe because if they
were to be invalidated in a call to _malloc, the views would
be refreshed before _malloc continues.

The problem that existed before was when we were passing
CanvasKit.HEAP* as a parameter to a function, in which the
function would call _malloc before using the typed array
parameter:
  //... let us suppose wasmMemory is backed by ArrayBuffer D
  copy1dArray(arr, HEAPU32);
  // The HEAPU32 TypedArray (backed by ArrayBuffer D) is stored
  // to a function parameter "dest"
    function copy1dArray(arr, dest, ptr) {
    // ...
    if (!ptr) {
      ptr = CanvasKit._malloc(arr.length * dest.BYTES_PER_ELEMENT);
      // Suppose _malloc needs to resize wasmMemory and is
      // now backed by ArrayBuffer E.
      // Note: The field CanvasKit.HEAPU32 is correctly backed
      // by ArrayBuffer E, but variable dest still points to a
      // TypedArray backed by ArrayBuffer D.
    }
    // dest.set will fail with a "neutered ArrayBuffer" error
    // because ArrayBuffer D is effectively gone (replaced by E).
    dest.set(arr, ptr / dest.BYTES_PER_ELEMENT);

The fix here is to pass in the field name indicating the TypedArray
view we want to write our data into instead of using the
view itself as the parameter.

[1] e427159553/src/preamble.js (L344)


Change-Id: I46cfb98f8bdf928b61690a5ced034a5961356398
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294516
Reviewed-by: Nathaniel Nifong <nifong@google.com>
2020-06-05 13:32:46 +00:00
Mike Klein
746473b904 remove sse4.1 opts level
This has become a weird target to optimize for.  It's not hugely better
than SSE2, and AVX2 is common nowadays, so SSE4.1's sweet spot is small.

Change-Id: I31c62fb371a4902f084f78309e7a43955f1fc0c2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294320
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Herb Derby <herb@google.com>
2020-06-05 12:00:09 +00:00
skia-recreate-skps
ddb6fc24f3 Update Go Deps
Change-Id: I3760f9a0993a9541d9a18560fc524f5336e66d98
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294481
Reviewed-by: <skia-recreate-skps@skia-swarming-bots.iam.gserviceaccount.com>
Commit-Queue: <skia-recreate-skps@skia-swarming-bots.iam.gserviceaccount.com>
2020-06-05 05:40:49 +00:00
skia-autoroll
1e561ae31a Roll ANGLE from 989c790d4b8b to b10f4b94aa17 (11 revisions)
989c790d4b..b10f4b94aa

2020-06-04 ynovikov@chromium.org doc: Chromium branch autorollers
2020-06-04 etienneb@chromium.org Add trace event to angle Program compilation API
2020-06-04 syoussefi@chromium.org Allow lines up to 72 characters in commit messages
2020-06-04 jmadill@chromium.org Roll third_party/vulkan_memory_allocator/ dac952eb0..431d6e572 (4 commits)
2020-06-04 jmadill@chromium.org Rename Platform.h to PlatformMethods.h.
2020-06-04 nguyenmh@google.com Allow line formats to pass description body's line length check
2020-06-04 spang@chromium.org Re-enable ShouldClearOpaqueFdRGBA8 on Pixel2 Vulkan
2020-06-04 xiaoxuan.liu@arm.com Vulkan: Cleanup unused variable in submitFrame()
2020-06-04 angle-autoroll@skia-public.iam.gserviceaccount.com Roll glslang from 78a3c915a1d7 to 232ba0d848d1 (1 revision)
2020-06-04 angle-autoroll@skia-public.iam.gserviceaccount.com Roll Vulkan-ValidationLayers from d43f5107400d to 4685ffce93ad (5 revisions)
2020-06-04 angle-autoroll@skia-public.iam.gserviceaccount.com Roll SwiftShader from 3ad285a60d82 to 0711869b5f20 (1 revision)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/angle-skia-autoroll
Please CC tdenniston@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Cq-Include-Trybots: skia/skia.primary:Build-Debian10-Clang-x86_64-Release-ANGLE;skia/skia.primary:Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia/skia.primary:Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE;skia/skia.primary:Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE;skia/skia.primary:Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia/skia.primary:Test-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Debug-All-ANGLE;skia/skia.primary:Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE
Bug: chromium:1064662
Tbr: tdenniston@google.com
Change-Id: I6403b64bac593b5fe3daa2acce8afdcd7af7c00a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294453
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
2020-06-05 04:54:59 +00:00
skia-autoroll
a903f4885b Roll Chromium from 2f74454086a5 to b7bb5840cba2 (462 revisions)
2f74454086..b7bb5840cb

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/chromium-skia-autoroll
Please CC tdenniston@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Cq-Include-Trybots: skia/skia.primary:Perf-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-CommandBuffer;skia/skia.primary:Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-CommandBuffer
Tbr: tdenniston@google.com
Change-Id: I929015ffa35c35d65eb79bd9f57c4e236a77f882
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294450
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
2020-06-05 04:51:19 +00:00
skia-autoroll
5ba8cbda81 Roll SwiftShader from 0711869b5f20 to e3eb327e8c3c (1 revision)
https://swiftshader.googlesource.com/SwiftShader.git/+log/0711869b5f20..e3eb327e8c3c

2020-06-05 caio.oliveira@intel.com Convert Vulkan headers from CRLF to LF endings

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/swiftshader-skia-autoroll
Please CC tdenniston@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Cq-Include-Trybots: skia/skia.primary:Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader
Bug: None
Tbr: tdenniston@google.com
Change-Id: Idf27c2e833f7862435a58282b83579ed58a85fc2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294451
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
2020-06-05 04:49:29 +00:00
skia-autoroll
ab4b215658 Roll dawn from 783cd5a79c8a to 0a6a9d86926e (1 revision)
https://dawn.googlesource.com/dawn.git/+log/783cd5a79c8a..0a6a9d86926e

2020-06-05 jiawei.shao@intel.com Test all formats used as readonly storage texture in StorageTextureTests

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/dawn-skia-autoroll
Please CC cwallez@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Cq-Include-Trybots: skia/skia.primary:Build-Debian10-Clang-x86_64-Debug-Dawn
Bug: None
Tbr: cwallez@google.com
Change-Id: I584dc8f6f9212abf97de53252f6cded2828e90b1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294452
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
2020-06-05 04:40:49 +00:00
Julia Lavrova
149f22d447 ICU optimization
Mainly rearranging the code to perform all ICU iterations once
and cache the results for the next text layouts.

Change-Id: I514d04229d04778c1f2238064acccddf6b548c00
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294400
Commit-Queue: Ben Wagner <bungeman@google.com>
Commit-Queue: Julia Lavrova <jlavrova@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
2020-06-04 23:46:24 +00:00
Brian Salomon
59f31b143c Revert "Add 2x2 bilinear downscale steps to GrSurfaceContext::rescale."
This reverts commit 9c6f6bf031.

Reason for revert: likely hurt flutter perf
https://github.com/flutter/flutter/issues/58716

Original change's description:
> Add 2x2 bilinear downscale steps to GrSurfaceContext::rescale.
>
> Currently just uses 2x2 configuration but could be adapted easily
> to support other sample position layouts.
>
> Change-Id: If857bac5d1fab1b6ee04694e445d0f19431646f1
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/292079
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Michael Ludwig <michaelludwig@google.com>

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

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

Change-Id: I8c322c02e22622ab61b99e4a8c241b30a2a31b12
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294399
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
2020-06-04 23:19:24 +00:00
John Stiles
cdc39bda92 Update GrBlurredEdgeFragmentProcessor to use a child FP.
We are updating FPs to receive their input via a child FP where
possible, instead of relying on the input color.

Change-Id: Ib2bac2c7865d4285fbbf45c9de29bbd4d139d04b
Bug: skia:10217
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294396
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
2020-06-04 21:03:30 +00:00
Michael Ludwig
d1d997e11f Reland "Improve scissor state tracking in GrRTC"
This reverts commit 4926b07217.

Reason for revert: fix wip

Original change's description:
> Revert "Improve scissor state tracking in GrRTC"
> 
> This reverts commit 3b923a880b.
> 
> Reason for revert: GrAppliedHardClip isn't tracking scissor state properly
> 
> Original change's description:
> > Improve scissor state tracking in GrRTC
> > 
> > At a low level, this changes GrScissorState from a rect+bool to a rect+size.
> > The scissor test is considered enablebd if the rect does not fill the
> > device bounds rect specified by the size. This has a number of benefits:
> > 
> > 1. We can always access the scissor rect and know that it will be
> > restricted to the render target dimensions.
> > 2. It helps consolidate code that previously had to test the scissor rect
> > and render target bounds separately.
> > 3. The clear operations can now match the proper backing store dimensions
> > of the render target.
> > 4. It makes it easier to reason about scissors applying to the logical
> > dimensions of the render target vs. its backing store dimensions.
> > 
> > Originally, I was going to have the extra scissor guards for the logical
> > dimensions be added in a separate CL (with the cleanup for
> > attemptQuadOptimization). However, it became difficult to ensure correct
> > behavior respecting the vulkan render pass bounds without applying this
> > new logic at the same time.
> > 
> > So now, with this CL, GrAppliedClips are sized to the backing store
> > dimensions of the render target. GrOpsTasks also clip bounds to the
> > backing store dimensions instead of the logical dimensions (which seems
> > more correct since that's where the auto-clipping happens). Then when
> > we convert a GrClip to a GrAppliedClip, the GrRTC automatically enforces
> > the logical dimensions scissor if we have stencil settings (to ensure
> > the padded pixels don't get corrupted). It also may remove the scissor
> > if the draw was just a color buffer update.
> > 
> > Change-Id: I75671c9cc921f4696b1dd5231e02486090aa4282
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/290654
> > Commit-Queue: Michael Ludwig <michaelludwig@google.com>
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
> 
> TBR=bsalomon@google.com,csmartdalton@google.com,michaelludwig@google.com
> 
> Change-Id: Ie98d084158e3a537604ab0fecee69bde3e744d1b
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294340
> Reviewed-by: Michael Ludwig <michaelludwig@google.com>
> Commit-Queue: Michael Ludwig <michaelludwig@google.com>

TBR=bsalomon@google.com,csmartdalton@google.com,michaelludwig@google.com

# Not skipping CQ checks because this is a reland.

Change-Id: I2116e52146890ee4b7ea007f3c3d5c3e532e4bdd
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294257
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
2020-06-04 20:52:41 +00:00
Julia Lavrova
c11ab9ac93 Revert "ICU optimization"
This reverts commit cc6349d390.

Reason for revert: Problems with MSAN

Original change's description:
> ICU optimization
> 
> Mainly rearranging the code to perform all ICU iterations once
> and cache the results for the next text layouts.
> 
> Change-Id: I2c2a502c705510eb169bf62efbfcc13b658591e3
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293336
> Commit-Queue: Julia Lavrova <jlavrova@google.com>
> Reviewed-by: Ben Wagner <bungeman@google.com>

TBR=bungeman@google.com,jlavrova@google.com

Change-Id: I7f7f759178c10349b4c879bafc68a7f8e1065b6a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294398
Reviewed-by: Julia Lavrova <jlavrova@google.com>
Commit-Queue: Julia Lavrova <jlavrova@google.com>
2020-06-04 20:34:52 +00:00
skia-autoroll
fcddaf2aa9 Roll skcms from 5404be4a2703 to 403d32176ebc (1 revision)
https://skia.googlesource.com/skcms.git/+log/5404be4a2703..403d32176ebc

2020-06-04 brianosman@google.com Add another test profile, where A2B/B2A and XYZ+TRC disagree strongly

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/skcms-skia-autoroll
Please CC tdenniston@google.com,mtklein@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Change-Id: I407af182ada4a06700b9e113c7c7a447d44f5b0a
Cq-Include-Trybots: luci.chromium.try:linux-blink-rel
Tbr: tdenniston@google.com,mtklein@google.com
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294361
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
2020-06-04 20:09:04 +00:00
Nathaniel Nifong
ed827bcf91 Make shadow in drawShadow test much more prominent
Change-Id: Iea50f4fb6cdd611ceeb77e5ab1dfe6e703ca201d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293681
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Nathaniel Nifong <nifong@google.com>
2020-06-04 20:05:24 +00:00
Mike Klein
a5fc154260 remove AVX raster pipeline stages
It's rare these days to find a CPU with AVX but not AVX2.

The memsets still make sense to leave, as we don't do anything
different there even with AVX2... all the instructions we want
are available with AVX.

Change-Id: I412f95c4548cfcc56c19b72348deceee83ba0610
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294319
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
2020-06-04 19:59:24 +00:00
Julia Lavrova
cc6349d390 ICU optimization
Mainly rearranging the code to perform all ICU iterations once
and cache the results for the next text layouts.

Change-Id: I2c2a502c705510eb169bf62efbfcc13b658591e3
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293336
Commit-Queue: Julia Lavrova <jlavrova@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
2020-06-04 19:43:37 +00:00
Michael Ludwig
4926b07217 Revert "Improve scissor state tracking in GrRTC"
This reverts commit 3b923a880b.

Reason for revert: GrAppliedHardClip isn't tracking scissor state properly

Original change's description:
> Improve scissor state tracking in GrRTC
> 
> At a low level, this changes GrScissorState from a rect+bool to a rect+size.
> The scissor test is considered enablebd if the rect does not fill the
> device bounds rect specified by the size. This has a number of benefits:
> 
> 1. We can always access the scissor rect and know that it will be
> restricted to the render target dimensions.
> 2. It helps consolidate code that previously had to test the scissor rect
> and render target bounds separately.
> 3. The clear operations can now match the proper backing store dimensions
> of the render target.
> 4. It makes it easier to reason about scissors applying to the logical
> dimensions of the render target vs. its backing store dimensions.
> 
> Originally, I was going to have the extra scissor guards for the logical
> dimensions be added in a separate CL (with the cleanup for
> attemptQuadOptimization). However, it became difficult to ensure correct
> behavior respecting the vulkan render pass bounds without applying this
> new logic at the same time.
> 
> So now, with this CL, GrAppliedClips are sized to the backing store
> dimensions of the render target. GrOpsTasks also clip bounds to the
> backing store dimensions instead of the logical dimensions (which seems
> more correct since that's where the auto-clipping happens). Then when
> we convert a GrClip to a GrAppliedClip, the GrRTC automatically enforces
> the logical dimensions scissor if we have stencil settings (to ensure
> the padded pixels don't get corrupted). It also may remove the scissor
> if the draw was just a color buffer update.
> 
> Change-Id: I75671c9cc921f4696b1dd5231e02486090aa4282
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/290654
> Commit-Queue: Michael Ludwig <michaelludwig@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>

TBR=bsalomon@google.com,csmartdalton@google.com,michaelludwig@google.com

Change-Id: Ie98d084158e3a537604ab0fecee69bde3e744d1b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294340
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
2020-06-04 19:39:58 +00:00
Michael Ludwig
3b923a880b Improve scissor state tracking in GrRTC
At a low level, this changes GrScissorState from a rect+bool to a rect+size.
The scissor test is considered enablebd if the rect does not fill the
device bounds rect specified by the size. This has a number of benefits:

1. We can always access the scissor rect and know that it will be
restricted to the render target dimensions.
2. It helps consolidate code that previously had to test the scissor rect
and render target bounds separately.
3. The clear operations can now match the proper backing store dimensions
of the render target.
4. It makes it easier to reason about scissors applying to the logical
dimensions of the render target vs. its backing store dimensions.

Originally, I was going to have the extra scissor guards for the logical
dimensions be added in a separate CL (with the cleanup for
attemptQuadOptimization). However, it became difficult to ensure correct
behavior respecting the vulkan render pass bounds without applying this
new logic at the same time.

So now, with this CL, GrAppliedClips are sized to the backing store
dimensions of the render target. GrOpsTasks also clip bounds to the
backing store dimensions instead of the logical dimensions (which seems
more correct since that's where the auto-clipping happens). Then when
we convert a GrClip to a GrAppliedClip, the GrRTC automatically enforces
the logical dimensions scissor if we have stencil settings (to ensure
the padded pixels don't get corrupted). It also may remove the scissor
if the draw was just a color buffer update.

Change-Id: I75671c9cc921f4696b1dd5231e02486090aa4282
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/290654
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
2020-06-04 18:44:46 +00:00
Mike Klein
f800c1d71b refine __chkstk_darwin() workaround
Apple's Clang has a bug rooted in these three conflicting constraints:

   A) before we save a large amount of state to the stack, call
      __chkstk_darwin() to um, do something to make that safe.  It's
      some sort of debug feature that involves marking various pages
      as writable and unwritable to catch stack overflows.

   B) before calling any function that doesn't use AVX, which includes
      __chkstk_darwin(), call vzeroupper as a performance enhancement

   C) we must save a large amount of state to the stack before it's
      sound to call vzeroupper, so it can be restored after the
      function call.  Otherwise the upper 128 bits of all ymm registers
      will be lost, zeroed.

There's no way to order A,B, and C to make them all happy.

Saving registers before zeroing them (C) is a correctness issue, so it's
got to take precedence.  Zeroing the upper bits of ymm registers before
calling into code that's not ymm-aware (B) is a performance issue only,
and not actually even needed for __chkstk_darwin().  The whole
__chkstk_darwin() thing (A) is nice a safety feature we'll have to live
without.

The best fix would be to make it so that Clang doesn't issue vzeroupper
before __chkstk_darwin(), but we can't do that here.  The next best
thing, since mucking with correctness isn't really viable, is to turn of
the stack checking.

Until now we've been using -O1 to reduce the stack usage down low enough
that the stack check calls are not generated.  Maybe there's a known
safe single page, and the call's only needed when going above that?

Anyway, let's try focusing our workaround on -fstack-check itself.

Bug: skia:9709
Change-Id: Ie236101d2d464526b33e327db1f94574a7a86948
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294326
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
2020-06-04 18:27:16 +00:00
Mike Klein
29b231e87a remove templates from SkSwizzler_opts
Spin off the safer part of the SkOpts CL I had to revert.
Should we try that again, having this in place will make
it easier.

Change-Id: Ic34ce2f23c10466cf1036f9651a544d308f4edec
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294294
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
2020-06-04 17:43:06 +00:00
Herb Derby
4a085a0dda Make vertex structs private
Change-Id: If09866766b4827dd8390094f1481f766f2ea28f7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294301
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Herb Derby <herb@google.com>
2020-06-04 17:38:26 +00:00
Herb Derby
92cc580c27 Remove unused vertex filler
Change-Id: Ie46e1b4cfb76b672eef60a87ea8ca94106052a00
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294296
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Herb Derby <herb@google.com>
2020-06-04 17:36:46 +00:00
John Stiles
eed56f0fe5 Update GrFragmentProcessor::SwizzleOutput to use a child FP.
We are updating FPs to receive their input via a child FP where
possible, instead of relying on the input color.

This CL also adds a GM test for SwizzleOutput, since this did not appear
to be covered by existing unit tests.

Change-Id: I3d8176395bb42eab7ff471c9137597402b5b3a69
Bug: skia:10217
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293884
Commit-Queue: John Stiles <johnstiles@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
2020-06-04 17:31:46 +00:00
John Stiles
5a2a7b3096 Update GrClampFragmentProcessor to use a child FP.
We are updating FPs to receive their input via a child FP where
possible, instead of relying on the input color.

Change-Id: Ic30224a45c6e4dba46c1cbaa27735013e8b3935f
Bug: skia:10217
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293937
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
2020-06-04 16:56:26 +00:00
Ben Wagner
d13487e71b Regularize SkFontMgr for CoreText build.
Move SkFontHost_mac.cpp into an 'optional' like the other fontmgr build
rules. This allows building with other fontmgrs on Mac and makes the lib
dependencies explicit. In the future this helps with splitting the out
the default factory.

Change-Id: Iecef9e428acb69f89b54afa00b4e779f5858c61a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294076
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
2020-06-04 16:45:09 +00:00
John Stiles
06f3d088e1 Fix invalid code generation with @setData and 'in fragmentProcessor?'.
Without this change, the generated code for an FP that includes a
fragment processor and a @setData block will erroneously include:
  auto inputFP = _outer.inputFP;
  (void)inputFP;
This is not a valid member name. (inputFP_index does exist.)
There does not appear to be any reason to generate this line.

Change-Id: I324878c0768959e56be33cfd8a85a2aa42794c7c
Bug: skia:10217
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294039
Commit-Queue: John Stiles <johnstiles@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-06-04 16:21:15 +00:00
Herb Derby
396deb032b Move addToAtlas to GrAtlasManager
Change-Id: I24cee3587da3dabfc618e2c028d37bbdac52cde0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293938
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
2020-06-04 16:16:13 +00:00
Stephen White
b007bb25a1 Dawn: skip PromiseImageShutdownTest and TextureIdleProcTest.
These tests create a wgpu::Texture which outlives the  wgpu::Device
which created it. This is problematic on Dawn, so just skip
the tests for now.

Bug: skia:10326
Change-Id: I29d5328e313baca19a2bbc2eedd80f2768cae77e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293936
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Stephen White <senorblanco@chromium.org>
2020-06-04 16:16:12 +00:00
Kevin Lubick
024d42fdd6 [canvaskit] roll v0.16.1
Change-Id: Ieb00340af7b157efbbbba995fd936ce98465d4ec
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294297
Reviewed-by: Nathaniel Nifong <nifong@google.com>
2020-06-04 14:39:07 +00:00
Jim Van Verth
f278886e1e Direct3D: Create samplers and shaderResourceViews for textures.
Mirrors what we have in Vulkan -- there's a cache of samplers in the
resource provider, and views are associated with their particular
texture resource.

Change-Id: I3751bce0817581a0044a7eea1b0c3ef9cc14d8e1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293537
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
2020-06-04 14:37:54 +00:00
Greg Daniel
7f3408ba99 Update GrVkImage setImageLayout to take a specific queue index.
Change-Id: I570cfa34e06d279f6d718c2cc6ff008c697fd5d1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293849
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
2020-06-04 14:35:45 +00:00
Mike Klein
1faaa97f80 Revert "apply SkOpts_skx approach to SkOpts_hsw"
This reverts commit 08a39c2b5f.

Reason for revert: Flutter roll?

Original change's description:
> apply SkOpts_skx approach to SkOpts_hsw
> 
> Very slightly different build flags, switching from -march=haswell to
> -mavx2 -mfma -mf16c, but there are no diffs.
> 
> Left some TODOs for the next ones, but _hsw being so common I figured
> I'd do this one stand alone and make sure it shakes down before doing
> the rest.
> 
> clang-cl (but not clang) barfs when we've got a lambda using an AVX
> intrinsic inside a templated static helper function. Luckily they're
> all non-type template parameters, so we can just pass them as normal
> arguments, and it'll optimize the same as the templated code anyway.
> 
> This was weird, but since we're covering almost all the SkFoo_opts.h
> headers with HSW here, I don't anticipate this being a problem in the
> future.  (And I'm sure I'll never look back on this statement as naive.)
> 
> Change-Id: I2f84db356cafa5e158bcc3724fb1c3f58aca7f1e
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293599
> Reviewed-by: Herb Derby <herb@google.com>
> Commit-Queue: Mike Klein <mtklein@google.com>

TBR=mtklein@google.com,herb@google.com,reed@google.com

Change-Id: If3a75158d6e017f180d9e38d9ba296a0d72e1384
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294281
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
2020-06-04 14:20:36 +00:00
Mike Klein
7f5b734505 Revert "finish new-style opts"
This reverts commit 4272d071d9.

Reason for revert: Flutter roll?

Original change's description:
> finish new-style opts
> 
> Nothing super interesting.
> 
> SkOpts_crc32.cpp is worth looking at
> as the only non-x86 code.
> 
> I marked a few places I think we can
> trim to save code size as follow ups.
> 
> Change-Id: Ifdc8f4d1495ff56df5d2cdde39f7e9a6ac2b1277
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294019
> Auto-Submit: Mike Klein <mtklein@google.com>
> Commit-Queue: Herb Derby <herb@google.com>
> Reviewed-by: Herb Derby <herb@google.com>

TBR=mtklein@google.com,herb@google.com

Change-Id: Idbb914788489bdc5941f7fed23bf26d35d90dca4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294280
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
2020-06-04 14:20:17 +00:00
Ben Wagner
bfe44b6974 Don't leak ref returned by SkFontMgr::matchFamilyStyle.
The current code does an extra ref on the SkTypeface returned from
SkFontMgr::matchFamilyStyle. This old API needs to be updated to return
sk_sp<SkTypeface> instead of a ref'ed bare SkTypeface*.

Bug: skia:10325
Change-Id: I191b494fb86b99fc53b6eb850d65ba73e60dc489
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294038
Auto-Submit: Ben Wagner <bungeman@google.com>
Commit-Queue: Julia Lavrova <jlavrova@google.com>
Reviewed-by: Julia Lavrova <jlavrova@google.com>
2020-06-04 13:46:10 +00:00
Geoff Lang
c3320be506 Reland "Request specific ANGLE context versions."
This is a reland of 8eeff5ccf3

Original change's description:
> Request specific ANGLE context versions.
> 
> Using the ANGLE_create_context_backwards_compatible extension, request
> explicit ANGLE context versions to make sure test coverage of context
> versions matches Chrome.
> 
> BUG=skia:10309
> 
> Change-Id: Ifa4a36851a0517b369d094e5707348a20eaf3879
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293339
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Auto-Submit: Geoff Lang <geofflang@google.com>

Bug: skia:10309
Change-Id: Ida0f226a693354211f35c391bdc0b5bb285a2d3d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293761
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
2020-06-04 12:49:20 +00:00