[Impeller] Makes validation layers flag work for android #42625

gaaclarke · 2023-06-07T17:11:53Z

This builds and links in the validation layers for android. They then can be turned on or off with a manifest field.

fixes flutter/flutter#123788
depends on flutter/buildroot#741

Pre-launch Checklist

I read the Contributor Guide and followed the process outlined there for submitting PRs.
I read the Tree Hygiene wiki page, which explains my responsibilities.
I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
I listed at least one issue that this PR fixes in the description above.
I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
I updated/added relevant documentation (doc comments with ///).
I signed the CLA.
All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

flutter-dashboard · 2023-06-07T22:55:32Z

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat (don't just cc him here, he won't see it! He's on Discord!).

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

zanderso · 2023-06-08T02:37:30Z

shell/config.gni

@@ -10,6 +10,7 @@ declare_args() {
  shell_enable_vulkan = false

  shell_enable_software = true
+  enable_vulkan_validation_layers = false


It looks like there's a convention here to prefix the argument names with shell_.

Moved it back to vulkan/config.gni

zanderso · 2023-06-08T02:39:12Z

tools/gn

-      )
-      sys.exit(1)
+    if args.target_os == 'android':
+      gn_args['android_api_level'] = int(26)


Is the int() needed?

nope, just residual, removed

zanderso · 2023-06-08T02:40:33Z

vulkan/config.gni

@@ -3,10 +3,4 @@
 # found in the LICENSE file.

 declare_args() {
-  # Whether to include vulkan validation layers, if available.


Probably also useful to retain this comment when copying the arg to the new location.

Can this file be deleted?

Alternately, why not just leave the arg here and include this config.gni where it's needed?

Moved it back, that area of the code is fuchsia specific so I thought shell might make more sense. By name alone though it should be relevant.

gaaclarke · 2023-06-08T18:20:01Z

Note: this is going to conflict with #42669

zanderso

cc @jonahwilliams @dnfield

zanderso · 2023-06-08T19:45:35Z

testing/scenario_app/android/gradle.properties

@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx2048M


What's this for?

I was just running into it. I'm not 100% sure it caused by this change. My theory is that having those extra .so files in the flutter.jar file somehow requires more memory when the build is happening.

(this increases the JVM heap that gradle uses. It's probably fine to increase this)

This builds and links in the validation layers for android. They then can be turned on or off with a manifest field. fixes flutter/flutter#123788 depends on flutter/buildroot#741 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [ ] I read and followed the [Flutter Style Guide] and the [C++, Objective-C, Java style guides]. - [x] I listed at least one issue that this PR fixes in the description above. - [ ] I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt. See [testing the engine] for instructions on writing and running engine tests. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I signed the [CLA]. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord].  [Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene [Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style [testing the engine]: https://github.com/flutter/flutter/wiki/Testing-the-engine [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/wiki/Chat

…lutter/engine#42625)

…128612) flutter/engine@071e1fb...488876e 2023-06-09 skia-flutter-autoroll@skia.org Roll ANGLE from a185cb8c8924 to 3e4f4caebcb0 (2 revisions) (flutter/engine#42701) 2023-06-09 bdero@google.com [Impeller] Add CPU implementations for all color filters (flutter/engine#42692) 2023-06-09 jonahwilliams@google.com [Impeller] add explicit VMA flush to device memory writes. (flutter/engine#42685) 2023-06-09 30870216+gaaclarke@users.noreply.github.com [Impeller] Makes validation layers flag work for android (flutter/engine#42625) 2023-06-09 jmccandless@google.com Platform channel for predictive back (flutter/engine#39208) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC jacksongardner@google.com,rmistry@google.com,zra@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose 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

gaaclarke force-pushed the vulkan-validation-on-device branch from 6ff65e3 to 0a19d83 Compare June 7, 2023 20:30

github-actions bot added the platform-android label Jun 7, 2023

gaaclarke force-pushed the vulkan-validation-on-device branch from 0a19d83 to ad01407 Compare June 7, 2023 22:17

github-actions bot added the platform-fuchsia label Jun 7, 2023

gaaclarke marked this pull request as ready for review June 7, 2023 22:51

gaaclarke requested a review from zanderso June 7, 2023 22:51

flutter-dashboard bot added the needs tests label Jun 7, 2023

zanderso reviewed Jun 8, 2023

View reviewed changes

gaaclarke added 5 commits June 8, 2023 11:10

[Impeller] made a switch for turning on validation layers

ab0ade1

swaped out fuchsias arg

462ae8c

format android build

e4ba216

removed stray logs

4236be3

zach feedback

83879f6

gaaclarke force-pushed the vulkan-validation-on-device branch from c202c78 to 2cc91ae Compare June 8, 2023 18:12

fixed rebase errors

73f4eaf

gaaclarke force-pushed the vulkan-validation-on-device branch from 2cc91ae to 73f4eaf Compare June 8, 2023 18:19

gaaclarke requested a review from zanderso June 8, 2023 18:20

zanderso approved these changes Jun 8, 2023

View reviewed changes

gaaclarke merged commit 06d0adb into flutter:main Jun 9, 2023

engine-flutter-autoroll mentioned this pull request Jun 9, 2023

Roll Flutter Engine from 071e1fb21c7a to 488876ed26c6 (5 revisions) flutter/flutter#128612

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 9, 2023

06d0adb88 [Impeller] Makes validation layers flag work for android (f…

2e0ee60

…lutter/engine#42625)

stuartmorgan mentioned this pull request Nov 16, 2023

ANDROID Execution failed for task ':app:mergeDebugNativeLibs' - A failure occurred while executing com.android.build.gradle.internal.tasks.MergeNativeLibsTask$MergeNativeLibsTaskWorkAction flutter/flutter#138535

Closed

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Impeller] Makes validation layers flag work for android #42625

[Impeller] Makes validation layers flag work for android #42625

gaaclarke commented Jun 7, 2023 •

edited

Loading

flutter-dashboard bot commented Jun 7, 2023

zanderso Jun 8, 2023

gaaclarke Jun 8, 2023

zanderso Jun 8, 2023

gaaclarke Jun 8, 2023

zanderso Jun 8, 2023

gaaclarke Jun 8, 2023

gaaclarke commented Jun 8, 2023

zanderso left a comment

zanderso Jun 8, 2023

gaaclarke Jun 8, 2023

dnfield Jun 8, 2023

		@@ -1,4 +1,4 @@
		org.gradle.jvmargs=-Xmx1536M
		org.gradle.jvmargs=-Xmx2048M

[Impeller] Makes validation layers flag work for android #42625

[Impeller] Makes validation layers flag work for android #42625

Conversation

gaaclarke commented Jun 7, 2023 • edited Loading

Pre-launch Checklist

flutter-dashboard bot commented Jun 7, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gaaclarke commented Jun 8, 2023

zanderso left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gaaclarke commented Jun 7, 2023 •

edited

Loading