aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-22Roll external/skia f4c057af0..90019be56 (2 commits)android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-releaseandroid-autoroll
am: ebe3c5a8b3 Change-Id: Ib596ea06d0bfd5fa61c5f61879a4c097149c69a1
2019-05-20Roll external/skia f4c057af0..90019be56 (2 commits)android10-devandroid-autoroll
https://skia.googlesource.com/skia.git/+log/f4c057af0..90019be56 2019-05-01 reed@google.com Fixes for saveBehind/drawBehind 2019-05-01 reed@google.com Add secret draw-behind method The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-next-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. Bug: 132354626 Bug: 129117085 Test: Presubmit checks will test this change. Merged-In: I5b45b4581e20082a9875e6ee10ec51f24a7701db Change-Id: Ifa794096cfcc6909256cb7f52627eaf9be0c10a8 Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
2019-05-01Fixes for saveBehind/drawBehindMike Reed
- fixes bug in device restore (was passing the wrong matrix) - use drawbehind for the clear, to avoid rounding differences between canvas and gpu Change-Id: I9c130e38437d8d34242620750f11a6ae7e62ff97 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209801 Commit-Queue: Mike Reed <reed@google.com> Reviewed-by: Derek Sollenberger <djsollen@google.com> (cherry picked from commit 9adc82c73df0ef25b708cae8aa48ef9c39ed4c67) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/211642 Auto-Submit: Derek Sollenberger <djsollen@google.com> Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Derek Sollenberger <djsollen@google.com>
2019-05-01Add secret draw-behind methodMike Reed
This is a variant of drawPaint but is automatically clipped to the bounds of the most recent saveBehind buffer (axis-aligned bounds). No public exposure. Impl is pretty simple (its a variant of drawPaint) - find the most recent saveBehind device bounds - if there is none, draw nothing, else - temporarily intersect the device's clip with that bounds - drawPaint - restore the clip See https://buganizer.corp.google.com/issues/129117085 Change-Id: I7c532e63a80b118fb2416c572b8e0d2abf8cf59a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209166 Commit-Queue: Mike Reed <reed@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/211600 Commit-Queue: Derek Sollenberger <djsollen@google.com> Reviewed-by: Derek Sollenberger <djsollen@google.com>
2019-04-30Roll external/skia e5d7107f6..f4c057af0 (1 commits)android-autoroll
https://skia.googlesource.com/skia.git/+log/e5d7107f6..f4c057af0 2019-04-29 jvanverth@google.com Clean out stale shadow vertices from the SkResourceCache The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-next-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. Test: Presubmit checks will test this change. Exempt-From-Owner-Approval: The autoroll bot does not require owner approval. Bug: 130757982 Merged-In: I48b225a2801844e1265ac2181eb02fcf2cd71c39 Change-Id: If8838e268b1267115c6f35f3021b6c4805c714cc
2019-04-29Clean out stale shadow vertices from the SkResourceCacheJim Van Verth
Bug: b/130757982 Change-Id: Iddfd41bcd494e1bf2d39baf6f2dc5e95a1819798 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/210629 Commit-Queue: Jim Van Verth <jvanverth@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/210634 Commit-Queue: Leon Scroggins <scroggo@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com> Auto-Submit: Jim Van Verth <jvanverth@google.com>
2019-04-24Roll external/skia 4c4a47e56..e5d7107f6 (1 commits)android-autoroll
https://skia.googlesource.com/skia.git/+log/4c4a47e56..e5d7107f6 2019-04-23 ethannicholas@google.com reworked SPIR-V binary operations and added support for VectorTimesScalar The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-next-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. Test: Presubmit checks will test this change. Exempt-From-Owner-Approval: The autoroll bot does not require owner approval. Bug: 131080966 Merged-In: Ia0c3c288813eb6e13a0b82094cad36f62a0ed6df Change-Id: I744b3d0c076b6a083f58a4d56a4ef3e7ff24c8af
2019-04-23reworked SPIR-V binary operations and added support for VectorTimesScalarEthan Nicholas
No-Tree-Checks: true No-Presubmit: true Bug: b/131080966 Change-Id: I03b8a1ed3cf78060c5b9a5ede8d0371998116744 Reviewed-On: https://skia-review.googlesource.com/c/skia/+/208677 Reviewed-By: Greg Daniel <egdaniel@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209411
2019-04-23Roll external/skia c8b3f7617..4c4a47e56 (3 commits)android-autoroll
https://skia.googlesource.com/skia.git/+log/c8b3f7617..4c4a47e56 2019-04-23 rmistry@google.com Remove auto adding CQ keywords for non-master branches 2019-04-23 egdaniel@google.com Add wait function on GrContext to wait on semaphores. 2019-04-23 ethannicholas@google.com Revert "Revert "added more SPIR-V RelaxedPrecision decorations"" The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-next-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. Test: Presubmit checks will test this change. Exempt-From-Owner-Approval: The autoroll bot does not require owner approval. Bug: 130643604 Bug: 131080966 Bug: 127235421 Merged-In: I55ac8774170578e417fbb60db1aa6d26ecce7d14 Merged-In: Ib524de9e3c5e2001a113d07e9e8e85691e7b8543 Change-Id: Ibf88739b28afe391b2ca752b192f75f0731d135b
2019-04-23Remove auto adding CQ keywords for non-master branchesRavi Mistry
Bug: skia: Change-Id: I03e5ceff326d38f96ce6fea699248b0232e39a63 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/202701 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Ravi Mistry <rmistry@google.com> (cherry picked from commit 6bb809a60530b8e05e1f0b0cbfa4a9e614cc5697) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209820
2019-04-23Add wait function on GrContext to wait on semaphores.Greg Daniel
This behaves like the SkSurface::wait call but is not tied to a specific surface. Change-Id: Ic572296e0f581204bf69a7178645d99e365c0692 Reviewed-On: https://skia-review.googlesource.com/c/skia/+/209648 Reviewed-By: Brian Salomon <bsalomon@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com> Bug: b/130643604 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209800
2019-04-23Revert "Revert "added more SPIR-V RelaxedPrecision decorations""Ethan Nicholas
This reverts commit 5155e09d146665be078494247092fa990d5ae4a7. No-Tree-Checks: true No-Presubmit: true Bug: b/131080966 Change-Id: I83808c62c9d0629196fdcab9fff0a655aad48225 Reviewed-On: https://skia-review.googlesource.com/c/skia/+/208678 Reviewed-By: Greg Daniel <egdaniel@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209649 Commit-Queue: Greg Daniel <egdaniel@google.com> Auto-Submit: Ethan Nicholas <ethannicholas@google.com>
2019-04-23Roll external/skia 40e7cb1a7..c8b3f7617 (2 commits)android-autoroll
https://skia.googlesource.com/skia.git/+log/40e7cb1a7..c8b3f7617 2019-04-23 bsalomon@google.com SkClipStack::isRRect succeeds if stack is an intersection of rects. 2019-04-22 ethannicholas@google.com fixed constructing matrices in SPIR-V when arguments cross column boundaries The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-next-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. Test: Presubmit checks will test this change. Exempt-From-Owner-Approval: The autoroll bot does not require owner approval. Bug: 122296071 Bug: 131080966 Merged-In: Ia0c3c288813eb6e13a0b82094cad36f62a0ed6df Change-Id: I36b1a45fe345306119a93a4d4e4e82110d0e87a9
2019-04-23SkClipStack::isRRect succeeds if stack is an intersection of rects.Brian Salomon
This helps enable optimizations that rely on the entire clip reducing to a single rectangle, such as converting a drawRect to a clear. Bug: b/122296071 Change-Id: I1fea4565644280d57610f8585b76babb557301d8 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209382 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> (cherry picked from commit 1c0b05afdef8c0366926d3a5cdbe828ff122cfe2) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209414 Commit-Queue: Derek Sollenberger <djsollen@google.com> Reviewed-by: Derek Sollenberger <djsollen@google.com>
2019-04-22fixed constructing matrices in SPIR-V when arguments cross column boundariesEthan Nicholas
Bug: b/131080966 Change-Id: I20550c0ebf2c4ee225552b66f41ad9dc886d5fc3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/203161 Reviewed-by: Chris Dalton <csmartdalton@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> (cherry picked from commit 5c46b72c86271c1a8fb9368f1fb0c2a904ade3e1) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209646 Auto-Submit: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
2019-04-22Roll external/skia f1275c6fa..40e7cb1a7 (5 commits)android-autoroll
https://skia.googlesource.com/skia.git/+log/f1275c6fa..40e7cb1a7 2019-04-22 ethannicholas@google.com Reland "Revert "added more SPIR-V RelaxedPrecision decorations"" 2019-04-22 ethannicholas@google.com Revert "Revert "added more SPIR-V RelaxedPrecision decorations"" 2019-04-22 egdaniel@google.com Adjust vulkan memory allocation block size knobs to better match the type of draws we do. 2019-04-22 brianosman@google.com Add shader based blending of kPlus for configs that need clamping 2019-04-22 brianosman@google.com Ganesh: Clamp blend inputs when using F16_Clamped pixel config The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-next-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. Test: Presubmit checks will test this change. Exempt-From-Owner-Approval: The autoroll bot does not require owner approval. Bug: 116505627 Bug: 131080966 Bug: 130753257 Merged-In: Ia0c3c288813eb6e13a0b82094cad36f62a0ed6df Change-Id: Icd6402bf5706c9fdf33136fa92c79adffdc9a14a
2019-04-22Reland "Revert "added more SPIR-V RelaxedPrecision decorations""Ethan Nicholas
This reverts commit 8f92cc67adbbd03732c8a3239d29d787f36c3243. Reason for revert: breaking the world Original change's description: > Revert "Revert "added more SPIR-V RelaxedPrecision decorations"" > > This reverts commit 5155e09d146665be078494247092fa990d5ae4a7. > > No-Tree-Checks: true > No-Try: true > No-Presubmit: true > Bug: b/131080966 > Change-Id: Ie2df5d64a0f4f76806f3edc9c934ec81d16ee128 > Reviewed-On: https://skia-review.googlesource.com/c/skia/+/208678 > Reviewed-By: Greg Daniel <egdaniel@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209416 TBR=egdaniel@google.com,ethannicholas@google.com Change-Id: I8473dd2653cc456303d102a36f13d2e0cd1198a9 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: b/131080966 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209642 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2019-04-22Revert "Revert "added more SPIR-V RelaxedPrecision decorations""Ethan Nicholas
This reverts commit 5155e09d146665be078494247092fa990d5ae4a7. No-Tree-Checks: true No-Try: true No-Presubmit: true Bug: b/131080966 Change-Id: Ie2df5d64a0f4f76806f3edc9c934ec81d16ee128 Reviewed-On: https://skia-review.googlesource.com/c/skia/+/208678 Reviewed-By: Greg Daniel <egdaniel@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209416
2019-04-22Adjust vulkan memory allocation block size knobs to better match the type of ↵Greg Daniel
draws we do. We were allocating blocks significantly larger than the amount of memory we actually using which caused us to end up wasting a lot of unused memory. This brings our allocation sizes more inline with our uses. Bug: b/116505627 Change-Id: I1b00670cfdfdb21884a4a203a1c35e183d83dbcf Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209402 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com> (cherry picked from commit 865dc5604dcfd7921b0ce8e273825228e7f2bc1d) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209410
2019-04-22Roll external/skia 057939b4d..f1275c6fa (2 commits)android-autoroll
https://skia.googlesource.com/skia.git/+log/057939b4d..f1275c6fa 2019-04-17 egdaniel@google.com Fix calling of finishedProc to make unit test happy in android-next branch. 2019-04-17 bsalomon@google.com Avoid multiplication by alpha in fragment shader when known to be 1. The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-next-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. Bug: 124277299 Bug: 130643604 Test: Presubmit checks will test this change. Merged-In: Ibf3c0a0aa7031c98f7976f914a1f86cc078bb7aa Change-Id: I69ee00446f01d4caf5a9cc20bf416747e2df351e Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
2019-04-22Add shader based blending of kPlus for configs that need clampingBrian Osman
This effectively reverts https://skia-review.googlesource.com/c/skia/+/140500 and relands https://skia-review.googlesource.com/c/skia/+/48183. Second of two F16 clamping fix cherry-picks to android/next-release. No-Tree-Checks: true No-Try: true No-Presubmit: true Bug: skia:8871 b/130753257 Change-Id: I6b1d5daa3d319e0c078e553926ed9166cca9a24a Reviewed-On: https://skia-review.googlesource.com/c/skia/+/199930 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-By: Brian Salomon <bsalomon@google.com> Reviewed-By: Robert Phillips <robertphillips@google.com> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209383 Reviewed-by: Derek Sollenberger <djsollen@google.com>
2019-04-22Ganesh: Clamp blend inputs when using F16_Clamped pixel configBrian Osman
This ensures that we stay in [0,1], except for plus mode, which requires a larger and more invasive change. First of two F16 clamping fix cherry-picks to android/next-release. Bugs: b/130753257 No-Tree-Checks: true No-Try: true No-Presubmit: true Change-Id: I97f6bcea8b10e70e55ba24bcff759ddbb1761794 Reviewed-On: https://skia-review.googlesource.com/c/skia/+/201460 Reviewed-By: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209404 Reviewed-by: Derek Sollenberger <djsollen@google.com>
2019-04-17Fix calling of finishedProc to make unit test happy in aroid-next branch.Greg Daniel
No-Tree-Checks: true No-Try: true No-Presubmit: true Change-Id: I56a6354d3b3fdf63a3b47fb2a4da7349004858ea Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209104 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
2019-04-17Avoid multiplication by alpha in fragment shader when known to be 1.Brian Salomon
Implemented for image shaders, image draws, and gradient shaders. Reimplement GrFragmentProcessor::OverrideInput as GrOverrideInputFragmentProcessor.fp. It allows specification of whether the replacement input color should be a literal in the shader code or a uniform. For above use case use with literal white. Make key in variables in fp files work for 4f colors. Fix issue in CPP code gen from .fp where when + key vars that pushed multiple values into the shader key only skipped the first key value when the when condition is not true. CHERRY-PICK to android/next-release. This includes the generated .h/.cpp from the .fp but not the .fp itself. The .fp relies on SkSL features not present in android/next-release. Bug: skia:7722 No-Tree-Checks: true No-Try: true No-Presubmit: true Change-Id: Id7c865132d620e8cdea8b00f2a627103eef171ac Reviewed-On: https://skia-review.googlesource.com/c/skia/+/201985 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-By: Brian Osman <brianosman@google.com> Reviewed-By: Ethan Nicholas <ethannicholas@google.com> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/208673 Reviewed-by: Stan Iliev <stani@google.com>
2019-04-17RESTRICT AUTOMERGE: Roll external/skia fc6e072bd..057939b4d (1 commits)android-autoroll
https://skia.googlesource.com/skia.git/+log/fc6e072bd..057939b4d 2019-04-16 egdaniel@google.com Cherry-Pick for adding callback to flush for knowing when gpu is finished work. The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-next-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. Test: Presubmit checks will test this change. Exempt-From-Owner-Approval: The autoroll bot does not require owner approval. Bug: 130643604 Change-Id: Ifb11e6bb703c455b902d9fe7261d0582d1dc50a7
2019-04-16Cherry-Pick for adding callback to flush for knowing when gpu is finished work.Greg Daniel
Add callback to flush for knowing when gpu is finished work. Bug: skia:8802 Change-Id: I093c2a4e879b635b169a849d9af3e9f7a3d84a88 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/207870 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Add more general flush call to GrContext. This is to match the current features of SkSurface::flush and to prepare for adding additional features to flush. Bug: skia:8802 Change-Id: I5d68272e1277b416af357e6ffaf426841ceda943 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/207301 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> No-Tree-Checks: true No-Try: true No-Presubmit: true Bug: b/130643604 Change-Id: Idd924c79f71a294fc959dbc27e5968eef98eade0 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/208700 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
2019-04-16Roll external/skia ec57b917b..fc6e072bd (1 commits)android-autoroll
https://skia.googlesource.com/skia.git/+log/ec57b917b..fc6e072bd 2019-04-15 scroggo@google.com Implement SkHeifCodec::onRewind The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-next-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. Test: Presubmit checks will test this change. Exempt-From-Owner-Approval: The autoroll bot does not require owner approval. Bug: 130458015 Test: Id2d70e95d2d879d2ff5e2cb985d3542731108909 Change-Id: I9a967a1a367707be576bb48633f82894fe12c14d
2019-04-15Implement SkHeifCodec::onRewindLeon Scroggins III
Bug: 130458015 Test: Id2d70e95d2d879d2ff5e2cb985d3542731108909 SkHeifCodec needs to reset some of its state between decoding calls. Do so in onRewind. This mimics SkJpegCodec, on which SkHeifCodec is modelled. Change-Id: I380a8ed88c98eaedc6f6ff1ff115bb2dea68bd56 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/208180 Auto-Submit: Leon Scroggins <scroggo@google.com> Reviewed-by: Derek Sollenberger <djsollen@google.com> Commit-Queue: Leon Scroggins <scroggo@google.com> (cherry picked from commit bcc75323f9df3d1fa44e2935b366c52cd475da72) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/208224 Reviewed-by: Leon Scroggins <scroggo@google.com>
2019-04-09Roll external/skia 066f005c1..ec57b917b (1 commits)android-autoroll
https://skia.googlesource.com/skia.git/+log/066f005c1..ec57b917b 2019-04-09 egdaniel@google.com Remove read access flags from src of memory barriers. The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-next-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. Test: Presubmit checks will test this change. Bug:130237578 Change-Id: I5e52d18e6a9a1e1ec0665e90ca3ace7ccecd0e34 Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
2019-04-09Remove read access flags from src of memory barriers.Greg Daniel
The src access flags on memory barriers are used to make writes to a specific memory location by a specific agent and reference object available to the entire domain (device in this case). When the previous operation done on a reference was a read, we don't not need to make changes to that memory available. Bug: skia:8933 Change-Id: I756b391f02cb8bf47bbe386a0b9e3b7ba788098e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/204960 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com> (cherry picked from commit ab79ff989e8a0a9b98cf28c1dd8d774756c9492a) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/206915 Commit-Queue: Derek Sollenberger <djsollen@google.com> Auto-Submit: Greg Daniel <egdaniel@google.com> Reviewed-by: Derek Sollenberger <djsollen@google.com>
2019-04-03Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur
am: 6d15e5c6d8 Change-Id: I1b569e205fefa7c0500985021171c6f480d56703
2019-04-03Roll external/skia cd749e013..066f005c1 (1 commits)android-autoroll
https://skia.googlesource.com/skia.git/+log/cd749e013..066f005c1 2019-04-03 brianosman@google.com Fix the GLSL persistent cache The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-next-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. Test: Presubmit checks will test this change. Change-Id: If240f3434d37cb808164ab678f45cb3cc147b76c Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
2019-04-03Fix the GLSL persistent cacheBrian Osman
Store (up to) three GLSL strings in the cache entry, along with the bookkeeping top reconstruct them. This is a Cherry-Pick (minus testing changes that don't merge) of: https://skia-review.googlesource.com/c/skia/+/205823 No-Tree-Checks: true No-Try: true No-Presubmit: true Change-Id: I93dca43e7e7395e54c1c71abaf0af7576734526b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/205920 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-04-03add flag to stage api change in skia tilemodesMike Reed
Test: make Change-Id: I97106e3ad18c21b6be57669443f2ce30292a54fe
2019-04-01Roll external/skia 12f2883b9..cd749e013 (1 commits)android-autoroll
https://skia.googlesource.com/skia.git/+log/12f2883b9..cd749e013 2019-04-01 jvanverth@google.com Reland "Reland "Fix blurry edges on large ovals."" The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-next-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. Test: Presubmit checks will test this change. Change-Id: I6a807d308c9f2d0c203e376d9f23283321b667e4 Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
2019-04-01Reland "Reland "Fix blurry edges on large ovals.""Jim Van Verth
This is a reland of 4dd7c1dae12c8e3b0d7777910b9ab8b29efe5ebf Original change's description: > Reland "Fix blurry edges on large ovals." > > This is a reland of c7aed036c341eff661de2ccc3a728a9b68635159 > > Changes the precision for the GrOvalOpFactory shaders to be float rather than half. > In the medium-precision case, adds a scale factor to the shaders to ensure that the > denominator of the distance calculation stays within range. If enough precision isn't > available, falls back to a path renderer. > > Original change's description: > > Fix blurry edges on large ovals. > > > > Changes the precision for the GrOvalOpFactory shaders to be float rather than half. In the > > low-precision case, it falls back to a path renderer for large ovals. > > > > Bug: b/110380864, skia:8873 > > Change-Id: I89e8dd067a2e0cab35b1bb515adaab4a2fb4f222 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201615 > > Commit-Queue: Jim Van Verth <jvanverth@google.com> > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > Bug: b/110380864, skia:8873 > Change-Id: Ic72d819f589ffebf9c5250bb4df4de22ab23f282 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/202718 > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Brian Salomon <bsalomon@google.com> > Commit-Queue: Jim Van Verth <jvanverth@google.com> Bug: b/110380864, skia:8873 Change-Id: I026d943f4ac005e04ef7350c5af67fda6865ae92 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/203729 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com> (cherry picked from commit 20ae25ce11f74753ed042295b3b7016e3460a404) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/204768 Auto-Submit: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-03-29Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: Ia92e124d6cc5c8255675a5a4318302f2866ae588 BUG: 129345239
2019-03-29Roll external/skia 888125a4d..12f2883b9 (1 commits)android-autoroll
https://skia.googlesource.com/skia.git/+log/888125a4d..12f2883b9 2019-03-29 stani@google.com Add API to get canvas wrapped by SkPaintFilterCanvas The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-next-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. Test: Presubmit checks will test this change. Exempt-From-Owner-Approval: The autoroll bot does not require owner approval. Test: Built and ran with Android Bug: 128792554 Change-Id: If972047b34bf210198cb5d9ce5c5edda1126b2a3
2019-03-29Add API to get canvas wrapped by SkPaintFilterCanvasStan Iliev
Implement SkAndroidFrameworkUtil::getBaseWrappedCanvas, which gets the real canvas behind SkPaintFilterCanvas. This is useful, because SkCanvas::drawDrawable works differently on a GPU backed canvas. Test: Built and ran with Android Bug: b/128792554 Change-Id: I5b75d42256d7a4efca987d55be2ce064c10fb4e7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/204442 Commit-Queue: Stan Iliev <stani@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org> (cherry picked from commit b0a8684e619e71c89da4b9b5677e4cc2d7fa256a) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/204722 Reviewed-by: Stan Iliev <stani@google.com> Reviewed-by: Derek Sollenberger <djsollen@google.com>
2019-03-26Roll external/skia d664f59c2..888125a4d (1 commits)android-autoroll
https://skia.googlesource.com/skia.git/+log/d664f59c2..888125a4d 2019-03-26 bsalomon@google.com Avoid special shader for opaque alpha when drawing simple rectangles. The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-next-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. Test: Presubmit checks will test this change. Change-Id: I2bd18000491139311c4100d117537e4bec8684a9 Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
2019-03-26Avoid special shader for opaque alpha when drawing simple rectangles.Brian Salomon
It's a wasted shader compiler and also seems to cause a rendering bug in Windows Chrome on ANGLE. Bug: chromium:942565 Change-Id: I56373ac596d4d1548d6c86cda7127bf12190a0ae Reviewed-on: https://skia-review.googlesource.com/c/skia/+/203383 Reviewed-by: Michael Ludwig <michaelludwig@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com> (cherry picked from commit 41f9c3cde9eac4a9d142b2c1fc86124988038262) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/203707
2019-03-26Roll external/skia 47d268ce1..d664f59c2 (2 commits)android-autoroll
https://skia.googlesource.com/skia.git/+log/47d268ce1..d664f59c2 2019-03-26 egdaniel@google.com Fix up readPixels, writePixels, and copies when dealing with ycbcr textures in vulkan. 2019-03-26 michaelludwig@google.com Respect stroke width in Android rrect clip optimization The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-next-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. Test: Presubmit checks will test this change. Exempt-From-Owner-Approval: The autoroll bot does not require owner approval. Bug: 113636985, 129037735 Change-Id: I9cdf16513b2d1f109b4c7370e556aacf3f8e6a14
2019-03-26Fix up readPixels, writePixels, and copies when dealing with ycbcr textures ↵Greg Daniel
in vulkan. In general this makes sure we never directly read or write pixels or use one of the vk image copy functions if we are dealing with a VkImage that requires a Ycbcr texture. Bug: b/129037735 Change-Id: Ib3bbac8bcddb643942e08d2b2ae3381fda6758a7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/203388 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com> (cherry picked from commit a51e93c9a0a52a90fe31c8eaebceedd6ea4f3635) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/203701
2019-03-26Respect stroke width in Android rrect clip optimizationMichael Ludwig
Bug: b/113636985 Change-Id: I80df664a077751e9ce5c735694e7ba283e93bcc1 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/203170 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Michael Ludwig <michaelludwig@google.com> (cherry picked from commit 2839884b792fb592adc08fcde9f9c99445b72246) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/203385 Auto-Submit: Leon Scroggins <scroggo@google.com> Reviewed-by: Derek Sollenberger <djsollen@google.com>
2019-03-22Roll external/skia 80061590f..47d268ce1 (1 commits)android-autoroll
https://skia.googlesource.com/skia.git/+log/80061590f..47d268ce1 2019-03-22 bungeman@google.com Always draw emoji with GPU. The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-next-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. Test: Presubmit checks will test this change. Change-Id: If510d20fd267ab257cdec1a6a814b4de03abe674 Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
2019-03-22Always draw emoji with GPU.Ben Wagner
Remove some illogical code which prevents large font size requests for color fonts from working, and add a large mask fallback when drawing with masks and there are no paths available. Change-Id: I3e8c1dfc124cd315278b42cfcfebb39fc32212b8 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/202420 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Herb Derby <herb@google.com> (cherry picked from commit 3e685ea1648d3c0f687b2f329658266295f2c2ea) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/202946 Reviewed-by: Ben Wagner <bungeman@google.com>
2019-03-22Roll external/skia 45ab903d3..80061590f (7 commits)android-autoroll
https://skia.googlesource.com/skia.git/+log/45ab903d3..80061590f 2019-03-21 herb@google.com Fallback for source should not use sub-pixel positioning. 2019-03-21 herb@google.com Use bulk api in direct-to-screen fallback 2019-03-21 herb@google.com Introduce bulk strike api for glyph metrics for one draw case 2019-03-21 herb@google.com Move GlyphAndPos and PathAndPos to interface and rename. 2019-03-21 benjaminwagner@google.com [android/next-release] Relax OS dimensions on non-master branches 2019-03-21 ethannicholas@google.com Revert "Revert "more relaxed precision decorations for SPIR-V output"" 2019-03-21 ethannicholas@google.com re-re-fixed RelaxedPrecision The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-next-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. Test: Presubmit checks will test this change. Change-Id: I0e9a2a1d0d16fbd22308aeaf81e3cef121f3982a Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
2019-03-21Fallback for source should not use sub-pixel positioning.Herb Derby
Current bad behavior, the code asks for a glyph that is sub-pixel position in source space. It later renders the glyph using the actual sub-pixel positioning in device space. This changes the behavior to ask for an non-sub-pixel positioned glyph in source space. Change-Id: Idf29a82f79cb551ced2db5ffd7774c526147ccac Reviewed-on: https://skia-review.googlesource.com/c/skia/+/200937 Auto-Submit: Herb Derby <herb@google.com> Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Ben Wagner <bungeman@google.com> (cherry picked from commit 4e6073662b1bbf5b5e18ce8df244723d43a1ddda) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/202945
2019-03-21Use bulk api in direct-to-screen fallbackHerb Derby
Change-Id: If1fa6118a9c6c9f7d4589942d890257f1fb581ba Reviewed-on: https://skia-review.googlesource.com/c/skia/+/200936 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Herb Derby <herb@google.com> (cherry picked from commit 36f660818365bef3b62122b4469f2f2658b6a4b0) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/202944 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Ben Wagner <bungeman@google.com>
2019-03-21Introduce bulk strike api for glyph metrics for one draw caseHerb Derby
The strike system can determine which glyphs are important, and will only put the important glyphs into the result. This is only used in the draw mask case now. I will expand it to the other cases. I'm leaving the existing abi inteact until all cases are converted. Change-Id: I8c5e785ccd4341adfb09888532bf7b690ffb91d4 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/200048 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Herb Derby <herb@google.com> (cherry picked from commit e8d2d013a15c8a925c0db302a32fbc7f89a6d814) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/202943 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Ben Wagner <bungeman@google.com>