aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-16Snap for 8598470 from dcb54f29f368b614678a42b880cfef193254cff7 to ↵t_frc_swc_330443040t_frc_swc_330443010android13-frc-media-swcodec-releaseAndroid Build Coastguard Worker
tm-frc-media-swcodec-release Change-Id: I74d103aae29ddf5033a96de56e58001f57be5027
2022-05-13Roll Skia from 47756c2666b2 to 83b3283f01a8 (3 revisions)android13-devandroid-autoroll
https://skia.googlesource.com/skia.git/+log/47756c2666b2..83b3283f01a8 If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://skia-autoroll.corp.goog/r/android-next-autoroll Please CC djsollen@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/main/autoroll/README.md Test: Presubmit checks will test this change. Exempt-From-Owner-Approval: The autoroll bot does not require owner approval. Bug: 231627558 Bug: 224677119 Bug: 232226246 Change-Id: I9299f6a604d0a0df70ecc6b9a030aff4fa00c153 Merged-In: Ib0590f39d833a4a81665147323258d6dc5fdee17
2022-05-13Remove string copies in Skia tracing macrosLeon Scroggins III
ATRACE_ANDROID_FRAMEWORK_ALWAYS and TRACE_EVENT0_ALWAYS create a SkAndroidFrameworkTraceUtilAlways, which formats the input, requiring a string copy. Mimic the split in SkAndroidFrameworkTraceUtil, which has two constructors; one for formatting, and one for static strings. This allows skipping the copy when it's unnecessary. Make TRACE_EVENT0_ALWAYS call the cheaper constructor, since it never has formatted input. ATRACE_ANDROID_FRAMEWORK_ALWAYS has few callers; only one of them forces an unnecessary copy. Bug: b/224677119 Test: perfetto Change-Id: I8e699ae1496c94e08e6f7fce3616254b1a627a7f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/539896 Commit-Queue: Leon Scroggins <scroggo@google.com> Reviewed-by: Herb Derby <herb@google.com> Reviewed-by: Brian Osman <brianosman@google.com> (cherry picked from commit e3772d2cae13ed606403aee8783825840a0dbd94) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/540166 Auto-Submit: Leon Scroggins <scroggo@google.com>
2022-05-13Android: Turn on select Skia tracepointsLeon Scroggins III
In b/224677119, we found that turning on *all* of Skia tracing caused regressions. We are separately turning it off, but we do find some value in select tracepoints. Add back in the ones we care about. The remaining tracepoints can still be turned on manually with the sysprop. All of these tracepoints are already traced on other platforms (e.g. Chrome, Flutter). Convert them to TRACE_EVENT0_ALWAYS, introduced in I13fd77445e0d2a05e46b75629b37bab5f571b02e. (A better long term solution will be to use categories, as tracked in b/232405757.) For GrOps, we had an Android-specific tracepoint, added in I18ac03676da058ba4af5bd6a0c375b3f17c3c399, as well as separate TRACE_EVENT0 tracepoints with basically the same timing and label. Remove the Android-specific version, and make the other one TRACE_EVENT0_ALWAYS. This removes redundant child-parent pairs. Bug: 231627558 Bug: 224677119 Bug: 232226246 Test: manual Change-Id: I03ce62062a0bde723d3b6ac026bd978b249ad9a4 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/540167 Auto-Submit: Leon Scroggins <scroggo@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Leon Scroggins <scroggo@google.com>
2022-05-09Snap for 8558685 from 89e506f7030bacab79e3124f19341f0bedf17a73 to ↵Android Build Coastguard Worker
tm-frc-media-swcodec-release Change-Id: Ic8735fb30eb4651415354173ee2ea4a1ec1460b8
2022-05-05Remove Test-Win10-.*-Golo-.*-Vulcan(_ProcDump)? bots from supported branchesRavi Mistry
They hang while running DM for unknown reasons. Change-Id: I7416240490552c1dbcedc8de2aaf7a39c83b3cb8 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/537796 Commit-Queue: Ravi Mistry <rmistry@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2022-05-05Roll Skia from d71cfa577734 to 47756c2666b2 (2 revisions)android-autoroll
https://skia.googlesource.com/skia.git/+log/d71cfa577734..47756c2666b2 If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://skia-autoroll.corp.goog/r/android-next-autoroll Please CC djsollen@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/main/autoroll/README.md Test: Presubmit checks will test this change. Exempt-From-Owner-Approval: The autoroll bot does not require owner approval. Bug: b/231541856 Merged-In: I7e1fcf16090c7720a63a1650abd602eb9c689723 Change-Id: Ided76885d7d7f4545d6335e8e5122f63a1979f5a
2022-05-05Remove unit test not present in this branch of the code.Derek Sollenberger
Bug: b/231541856 Change-Id: I6791fa6bec5351f4524ccddac1f43e57fb6ace19 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/537457 Commit-Queue: Derek Sollenberger <djsollen@google.com> Commit-Queue: Tyler Denniston <tdenniston@google.com> Auto-Submit: Derek Sollenberger <djsollen@google.com> Reviewed-by: Tyler Denniston <tdenniston@google.com>
2022-05-02[infra] Manual cherrypick to remove Win7 fyi jobsRavi Mistry
Cherrypick of https://skia-review.googlesource.com/c/skia/+/535326 Bug: 1316545 Change-Id: I497576906f0567fd12f7e417052a6f7b68a38736 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/535956 Reviewed-by: Kevin Lubick <kjlubick@google.com> Commit-Queue: Ravi Mistry <rmistry@google.com>
2022-04-30Roll Skia from ae3118459256 to d71cfa577734 (2 revisions)android-autoroll
https://skia.googlesource.com/skia.git/+log/ae3118459256..d71cfa577734 If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://skia-autoroll.corp.goog/r/android-next-autoroll Please CC scroggo@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/main/autoroll/README.md Test: Presubmit checks will test this change. Exempt-From-Owner-Approval: The autoroll bot does not require owner approval. Bug: b/227806494 Bug: b/230879386 Merged-In: I2651dcd57e54d57c5a19992ec2e2e4cc01241f3b Change-Id: I0a83512204b7932bc0e17f6e37314ff437cde72f
2022-04-29Fix bug where SkQP test that are always to be excluded are not.Derek Sollenberger
Also exclude some additional test cases based on data collected from Skia's infrastructure for known problematic GPU test cases. Bug: b/230879386 Bug: b/227806494 Change-Id: Id0bf73828fa04b3139f1e9cb94511db9d62d8d86 (cherry picked from commit 6a810fe45b738ff834dfb57cd8ce3836bf8c1ef8) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/535579 Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Derek Sollenberger <djsollen@google.com>
2022-04-29Roll Skia from 43d175748e29 to ae3118459256 (1 revision)android-autoroll
https://skia.googlesource.com/skia.git/+log/43d175748e29..ae3118459256 If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://skia-autoroll.corp.goog/r/android-next-autoroll Please CC scroggo@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/main/autoroll/README.md Test: Presubmit checks will test this change. Exempt-From-Owner-Approval: The autoroll bot does not require owner approval. Bug: b/230630340 Change-Id: Ice7e0e2e6db14a8806e5e893b96ea82ca349c382 Merged-In: Idaf6613b2191ff8d36e0a1a83fcdf68de99c7280
2022-04-28Remove failing Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASANRavi Mistry
Bot was removed from main in https://skia-review.googlesource.com/c/skia/+/528081 We cannot do a direct cherrypick because of conflicts and backporting all the required changes will be difficult. So this change just removes the failing bot that is on CQ. Change-Id: I6875c98a2c25b1a4fd992601228c10d8ee9715f6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/535122 Reviewed-by: Leon Scroggins <scroggo@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com> Commit-Queue: Ravi Mistry <rmistry@google.com>
2022-04-28Remove vk workaround to do partial clears as draws on adreno.Greg Daniel
Qcomm did some investigations of this workaround, and even though it was giving some cpu savings, it was causing a big hit to GPU performance and power. So we're removing this now to get back the various wins on the GPU. Bug: b/230630340 Change-Id: I01ba4e271dc02ae4ab6155fc794a5a1e3c796341 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/525638 Auto-Submit: Greg Daniel <egdaniel@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com> (cherry picked from commit 6368d39a9e7ce68c35f37b0e550f1b4274edf070) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/534657 Reviewed-by: Greg Daniel <egdaniel@google.com>
2022-04-28Snap for 8512216 from 68e7f49baacfa525929c03bfafabb21bf41a3d4f to ↵Android Build Coastguard Worker
tm-frc-media-swcodec-release Change-Id: I11ae052053a514191b14f888fb43edc72432d5c3
2022-04-28Roll Skia from 9659252ba27a to 43d175748e29 (2 revisions)android-autoroll
https://skia.googlesource.com/skia.git/+log/9659252ba27a..43d175748e29 If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://skia-autoroll.corp.goog/r/android-next-autoroll Please CC scroggo@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/main/autoroll/README.md Test: Presubmit checks will test this change. Exempt-From-Owner-Approval: The autoroll bot does not require owner approval. Bug: b/229804433 Merged-In: Id05505f33eabec8ff16fbdac4c4c8aa9d4a3b4e0 Change-Id: I75913bca0c07a58e45bd67d36cae9d63fc281563
2022-04-28Enable required Android API levels for SkQP test cases.Derek Sollenberger
SkQP tests can now be annotated in unittests.txt as being only enforced when the device's first API level is >= the level associated with the test. This change also ensures that unittests.txt does not contain any out-of-date test names by aborting if an entry in the file no longer has a matching test in the test suite. Bug: b/229804433 Change-Id: I45b2ef5e20e45dadfefbb339b0c65c88c2d6bbf2 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/534666 Commit-Queue: Derek Sollenberger <djsollen@google.com> Reviewed-by: John Stiles <johnstiles@google.com> (cherry picked from commit a02b226410435098316b9d0c30b2d5316435175a) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/534518 Reviewed-by: Derek Sollenberger <djsollen@google.com>
2022-04-06Use ATL golo machinesKevin Lubick
This update the drivers and removes failing jobs (see [1] and [2]), but does not replace them, as that would require backporting more changes to add in the new Skolo GTX 360 machines. [1] https://skia-review.googlesource.com/c/skia/+/525836 [2] https://skia-review.googlesource.com/c/skia/+/524001 Bug: 1289453 Change-Id: I137096cc3bb71d0c1bd8355f4726601fd2504e7d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528081 Reviewed-by: Ravi Mistry <rmistry@google.com>
2022-04-06[automerger skipped] Merge "Tweak linux_glibc properties for musl builds in ↵Treehugger Robot
external/skia" am: 19b26a5488 am: 5c0159b199 am: a2c575e4e9 -s ours am skip reason: Merged-In I5fdb6aaddee72faf6948aedd145b04691c342f97 with SHA-1 9054e93dc7 is already in history Original change: https://android-review.googlesource.com/c/platform/external/skia/+/2019597 Change-Id: I126a1e49159d348dc0e347297313dee24753f14d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "Tweak linux_glibc properties for musl builds in external/skia" am: ↵Treehugger Robot
19b26a5488 am: 5c0159b199 Original change: https://android-review.googlesource.com/c/platform/external/skia/+/2019597 Change-Id: I860b798f5dd2e3c4832576c657b7be227d033fda Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "Tweak linux_glibc properties for musl builds in external/skia" am: ↵Treehugger Robot
19b26a5488 Original change: https://android-review.googlesource.com/c/platform/external/skia/+/2019597 Change-Id: I8ed910274afaaa2bda668ab675e1d1d12bb86343 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "Tweak linux_glibc properties for musl builds in external/skia"Treehugger Robot
2022-04-05Tweak linux_glibc properties for musl builds in external/skiaColin Cross
For convenience, builds against musl libc currently use the linux_glibc properties because they are almost always linux-specific and not glibc-specific. In preparation for removing this hack, tweak the linux_glibc properties by either moving them to host_linux, which will apply to linux_glibc, linux_musl and linux_bionic, or by setting appropriate musl or linux_musl properties. Properties that must not be repeated while musl uses linux_musl and also still uses the linux_glibc properties are moved to glibc properties, which don't apply to musl. Whether these stay as glibc properties or get moved back to linux_glibc later once the musl hack is removed is TBD. Bug: 223257095 Test: m checkbuild Test: m USE_HOST_MUSL=true host-native Change-Id: Ie2067df4271558a0a2dc67e947d027c32f7db9ca Merged-In: I5fdb6aaddee72faf6948aedd145b04691c342f97 Merged-In: I7cfffc3e914e1c66ce9f794139253b4e4eaafbd4
2022-04-04Roll Skia from a357a11f7456 to 9659252ba27a (1 revision)android-autoroll
https://skia.googlesource.com/skia.git/+log/a357a11f7456..9659252ba27a If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://skia-autoroll.corp.goog/r/android-next-autoroll Please CC djsollen@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/main/autoroll/README.md Test: Presubmit checks will test this change. Exempt-From-Owner-Approval: The autoroll bot does not require owner approval. Bug: b/223257095 Change-Id: I5fdb6aaddee72faf6948aedd145b04691c342f97
2022-04-04Tweak linux_glibc properties for musl builds in external/skiaColin Cross
For convenience, builds against musl libc currently use the linux_glibc properties because they are almost always linux-specific and not glibc-specific. In preparation for removing this hack, tweak the linux_glibc properties by either moving them to host_linux, which will apply to linux_glibc, linux_musl and linux_bionic, or by setting appropriate musl or linux_musl properties. Properties that must not be repeated while musl uses linux_musl and also still uses the linux_glibc properties are moved to glibc properties, which don't apply to musl. Whether these stay as glibc properties or get moved back to linux_glibc later once the musl hack is removed is TBD. Bug: b/223257095 Test: m checkbuild Test: m USE_HOST_MUSL=true host-native Change-Id: Ie2067df4271558a0a2dc67e947d027c32f7db9ca Reviewed-on: https://skia-review.googlesource.com/c/skia/+/521361 Reviewed-by: Kevin Lubick <kjlubick@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Leon Scroggins <scroggo@google.com> (cherry picked from commit 350ce03adc5fd61bc6122edb8275319a9125273b) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/527059 Reviewed-by: Derek Sollenberger <djsollen@google.com> Commit-Queue: Derek Sollenberger <djsollen@google.com>
2022-03-29RESTRICT AUTOMERGE Roll Skia from e28fcd178277 to a357a11f7456 (1 revision)android-autoroll
https://skia.googlesource.com/skia.git/+log/e28fcd178277..a357a11f7456 If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://skia-autoroll.corp.goog/r/android-next-autoroll Please CC djsollen@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/main/autoroll/README.md Test: Presubmit checks will test this change. Exempt-From-Owner-Approval: The autoroll bot does not require owner approval. Bug: b/225044541 Change-Id: I98b921403b0c556806437ee3d0071d7b26d43309
2022-03-24Simplify FreeType glyph paths with overlap.Ben Wagner
With variable fonts overlapping glyph contours are now normal. However, these do not stroke well. Simpify the glyph paths which are marked as overlapping. Bug: b/225044541 Change-Id: I9687e28c9274cd189f4ae8e059d8d40dd802ec41 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/521637 Reviewed-by: Herb Derby <herb@google.com> Commit-Queue: Ben Wagner <bungeman@google.com> (cherry picked from commit b3275e1fd64cbbf57a1e9a2ecb2db0812cfba4dc) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/523937 Auto-Submit: Ben Wagner <bungeman@google.com> Reviewed-by: Derek Sollenberger <djsollen@google.com> Commit-Queue: Derek Sollenberger <djsollen@google.com>
2022-03-24Roll Skia from 9f7ddf9a8f67 to e28fcd178277 (9 revisions)android-autoroll
https://skia.googlesource.com/skia.git/+log/9f7ddf9a8f67..e28fcd178277 If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://skia-autoroll.corp.goog/r/android-next-autoroll Please CC djsollen@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/main/autoroll/README.md Test: Presubmit checks will test this change. Exempt-From-Owner-Approval: The autoroll bot does not require owner approval. Change-Id: I92efb5bb8abe79c1e186678845819e8b95c30254
2022-03-24Rename ES2 error tests 'T' through 'Z' to .rts.John Stiles
Bug: skia:13042 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Arman Uguray <armansito@google.com> Commit-Queue: Arman Uguray <armansito@google.com> Change-Id: Ie99476e81e6978269e3f8789da4e1880d9b9119d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/524103 Reviewed-by: Derek Sollenberger <djsollen@google.com>
2022-03-24Rename ES2 error tests starting with 'S' to .rts.John Stiles
Change-Id: I1dd481ca47965e933a110a0f0a8ef7616deb034d Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/523417 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Arman Uguray <armansito@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/524102 Reviewed-by: Derek Sollenberger <djsollen@google.com>
2022-03-24Rename ES2 error tests starting with 'R' to .rts.John Stiles
Bug: skia:13042 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Arman Uguray <armansito@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Change-Id: I3aa94f20ec78a76ab11dde436baeb8ca4c3fff3b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/524101 Reviewed-by: Derek Sollenberger <djsollen@google.com>
2022-03-24Rename ES2 error tests 'O' through 'P' to .rts.John Stiles
A few tests were divided into a Runtime Effect-compatible .rts test, and a Runtime Effect-incompatible .sksl test. Bug: skia:13042 Reviewed-by: Arman Uguray <armansito@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Change-Id: I1e30d6b1af02437f1d1c15c2a043b81bc08a6df4 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/524100 Reviewed-by: Derek Sollenberger <djsollen@google.com>
2022-03-24Rename ES2 error tests from 'H' through 'M' to .rts.John Stiles
In a few cases, this involved splitting a test into two (an ES2- compatible portion and a ES3+ portion). Bug: skia:13042 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Arman Uguray <armansito@google.com> Commit-Queue: Arman Uguray <armansito@google.com> Change-Id: I3a776846a3d7d19cb19fa68c67842f7dbafcb420 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/524099 Reviewed-by: Derek Sollenberger <djsollen@google.com>
2022-03-24Rename ES2 error tests from 'C' through 'G' to .rts.John Stiles
A few tests received minor tweaks to make them Runtime Effect-friendly. Bug: skia:13042 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Arman Uguray <armansito@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Change-Id: I7734390c9fadb53bd74b7b395df611db935fcc0b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/524098 Reviewed-by: Derek Sollenberger <djsollen@google.com>
2022-03-24Rename ES2 error tests starting with 'B' to .rts.John Stiles
A few tests received minor tweaks to make them Runtime Effect-friendly. Bug: skia:13042 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Change-Id: I02a469b241735fa15d86e292eaa4ef4aa9cc8af6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/524097 Reviewed-by: Derek Sollenberger <djsollen@google.com>
2022-03-24Rename Runtime Effect-compatible ES2 error tests to .rts.John Stiles
This is useful because it will allow these tests to be supported in Android CTS, where only Runtime Effects are API-accessible. This CL updates the C++ test harness so that .rts files in the error/ directory are found, and tweaks error tests as necessary to make them Runtime Effect-compatible. For instance, Runtime Effects enforce the parameters on main(), which adds extra errors that we don't want. And some error tests require ES3 (e.g. array constructors) and so those tests remain as .sksl files. In this CL, only tests beginning with A are updated. The remaining tests will be updated in followup CLs. Bug: skia:13042 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Change-Id: Iddba1ea7b51e8928268743ed4b73a1a173759e4f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/524096 Reviewed-by: Derek Sollenberger <djsollen@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-03-24Include the errors/ folder when SkQP searches for SkSL error tests.John Stiles
Bug: skia:13042 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Leon Scroggins <scroggo@google.com> Change-Id: I3cf979160bd8c6ef4d60bc7097ab482b1671b271 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/524015 Reviewed-by: Derek Sollenberger <djsollen@google.com>
2022-03-22RESTRICT AUTOMERGE Roll Skia from 50f35966f52d to 9f7ddf9a8f67 (24 revisions)android-autoroll
https://skia.googlesource.com/skia.git/+log/50f35966f52d..9f7ddf9a8f67 If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://skia-autoroll.corp.goog/r/android-next-autoroll Please CC djsollen@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/main/autoroll/README.md Test: Presubmit checks will test this change. Exempt-From-Owner-Approval: The autoroll bot does not require owner approval. Change-Id: I8c312483e80d51519cbbc50b4c9f6e88cf7f0e98
2022-03-22Add missing import for RuntimeShader class.John Stiles
This appears to be breaking the Android roll: http://screen/8y9uHkRzLssbe4H Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/523376 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Leon Scroggins <scroggo@google.com> Change-Id: Ieeb12974ac90e483ab3a92dcdac0a9d896ad3a1a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/523424 Reviewed-by: John Stiles <johnstiles@google.com>
2022-03-22Add support for conditional unit tests.John Stiles
DEF_CONDITIONAL_TEST and DEF_CONDITIONAL_GPUTEST_FOR_xxxx_CONTEXTS will allow unit tests to be considered or ignored based on a passed-in boolean condition. DEF_TEST_DISABLED is now implemented as a conditional test hard-coded with a "false" condition. This allows macros (such as SKSL_TEST) to add unit tests based on the result of a comparison. Change-Id: Ic5325569009cfce768ba8942907c1d3e7d69ca1c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/517516 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/523184 Reviewed-by: John Stiles <johnstiles@google.com>
2022-03-22Add SkSL error tests that use Android RuntimeShader.John Stiles
`atest` will now properly create a RuntimeShader for each of the SkSL runtime_error tests, and report an SkQP failure if the errors listed within the test's *%%* markers are not thrown. This CL also fixes a string-handling bug in `get_sksl_error_tests` which could cause garbage bytes to appear at the end of shader text. (The code accidentally assumed that an SkData would have a zero terminator.) Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522358 Reviewed-by: Leon Scroggins <scroggo@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Change-Id: Id6adfd9f03f194867453f34b5b1129cc1b118f58 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/523183 Reviewed-by: John Stiles <johnstiles@google.com>
2022-03-22Refactor SkQPTestRunner to support running SkSL error tests.John Stiles
Previously, when we wanted to run multiple test types, we cloned the outer testing loop and had a bunch of duplicated logic for translating test results into TestRunner success/failure. This worked, but maintaining duplicate code can be a chore (see http://cs/h/skia/skia/+/c5d130aac064cd10a04a9b8d1b9e64f9df1e91b5:platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java?l=102 ) Instead of going back to that approach, I've factored out the logic for individual tests into a bare-bones "TestExecutor" interface. The outer work loop takes a TestExecutor and iterates over every test in it. Unit tests and SkSL error tests can each implement this interface as needed. For this CL, actual SkSL error test handling is not yet implemented, so the SkSL tests will all be listed as passing (in 0-1 milliseconds). In a followup CL, SkSLErrorTestExecutor#run will be implemented to match the behavior of the C++ SkSL error tests. Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522101 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Leon Scroggins <scroggo@google.com> Change-Id: I4c596133bd3aec9edbe26ab215a1944871ca46eb Reviewed-on: https://skia-review.googlesource.com/c/skia/+/523182 Reviewed-by: John Stiles <johnstiles@google.com>
2022-03-22Simplify filtering in SkQPRunner.John Stiles
Previously, we had a member variable `mShouldSkipTest` which existed to track the filtered-or-not state of individual unit tests. Now, when a unit test is filtered out, we just replace it with an empty Description in the array of unit test descriptions. `mShouldRunTestCount` was also unnecessary as it should always exactly equal the number of child tests contained in the test-suite. Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/521636 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Leon Scroggins <scroggo@google.com> Change-Id: I89841a3830edc8605fd64c0ea6ccb74528ffdc1e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/523181 Reviewed-by: John Stiles <johnstiles@google.com>
2022-03-22Pass SkSL error tests to SkQP.java via arrays.John Stiles
In a followup CL, we can attempt to compile these shaders via the RuntimeShader API and verify that compilation fails. Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/521536 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Change-Id: I5051504668518be9aed7360d0b4aafb4e2f81917 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/523180 Reviewed-by: John Stiles <johnstiles@google.com>
2022-03-22Add SkQPAssetManager::iterateDir to find files in a directory.John Stiles
We can't use SkOSFile::Iter in the Java version of SkQP--it doesn't find any files. We need to load our assets via the AAssetManager. Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/521841 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Change-Id: I124020d84a6da69f30f3c0b036e1e47a2bd6ceb1 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/523179 Reviewed-by: John Stiles <johnstiles@google.com>
2022-03-22Load the SkSL error tests when SkQP::init is executed.John Stiles
Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/521219 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Change-Id: Ic3e0df00626d639bbaa55f77d057cc8fa231bd23 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/523178 Reviewed-by: John Stiles <johnstiles@google.com>
2022-03-22Factor out SkQP exclusion-list handling into a helper class.John Stiles
This will be used in followup CLs to allow exclusions to the SkSL error tests. Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/521217 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Change-Id: I55700990fcb50413305ec87d4ec11396658d22d2 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/523177 Reviewed-by: John Stiles <johnstiles@google.com>
2022-03-22Remove GM support from Java portions of SkQP.John Stiles
We no longer intend to run visual GMs from SkQP. Bug: skia:13031 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/520546 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Leon Scroggins <scroggo@google.com> Change-Id: I31d29c8c684aadd58290cf7af8763fef0d335ab3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/523176 Reviewed-by: John Stiles <johnstiles@google.com>
2022-03-22Fix atest SkQP crash at startup.John Stiles
Support for GM tests was removed from SkQP at http://review.skia.org/516336. However, the Java harness still expects us to supply a non-null GM array, and will crash if we don't. Reviewed-on: https://skia-review.googlesource.com/c/skia/+/520538 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Change-Id: Ie0de13e97a85c2be4dd8920b43acf679a640b11c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522995 Reviewed-by: John Stiles <johnstiles@google.com>
2022-03-22Add CurrestTestHarness helper method.John Stiles
This lets us differentiate SkQP from other testing harnesses (like DM or Viewer) at runtime. This allows us to change strictness or deactivate tests when SkQP is running. Previously we had a macro SK_BUILD_FOR_SKQP for this, but this did not work on a local skqp binary; it only activated when compiling for Android. Bug: skia:13037 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/518939 Reviewed-by: Derek Sollenberger <djsollen@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Change-Id: I7ea8026a46b0e22299970e17f5612b08c709991c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522994 Reviewed-by: John Stiles <johnstiles@google.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 11:50:58 +0000