Manually roll ANGLE, vulkan-deps, SwiftShader #38650

loic-sharma · 2023-01-04T23:13:12Z

This updates our dependencies so that the engine can be built using Visual Studio 17.4 and newer.

Depends on: flutter/buildroot#669
Part of: flutter/flutter#117932

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.

loic-sharma · 2023-01-18T01:17:24Z

tools/licenses/lib/patterns.dart

@@ -118,6 +118,7 @@ final List<RegExp> copyrightStatementPatterns = <RegExp>[
  RegExp(r'^(?:[^ ]+ )?Modifications:$', caseSensitive: false),
  RegExp(r'^ *Modifications for', caseSensitive: false),
  RegExp(r'^ *Modifications of', caseSensitive: false),
+  RegExp(r'^Modifications Copyright \(C\) .+', caseSensitive: false),


Needed for: https://github.com/search?q=repo%3AKhronosGroup%2FVulkan-ValidationLayers+%22Modifications+Copyright+%28C%29+2022+RasterGrid+Kft.%22&type=code

loic-sharma · 2023-01-18T01:17:45Z

tools/licenses/lib/patterns.dart

@@ -868,7 +869,7 @@ final List<RegExp> csTemplateLicenses = <RegExp>[
    kIndent +

    // Some files in ANGLE prefix the license with a description of the license.
-    r'(?:BSD 2-Clause License \(http://www.opensource.org/licenses/bsd-license.php\))?' +
+    r'(?:BSD 2-Clause License \(https?://www.opensource.org/licenses/bsd-license.php\))?' +


Needed for: https://github.com/search?q=repo%3AKhronosGroup%2FVulkan-ValidationLayers+%22BSD+2-Clause+License+%28https%22&type=code

loic-sharma · 2023-01-23T22:37:09Z

impeller/compiler/spirv_sksl.cc

-  declare_undefined_values();
+  if (emit_undefined_values()) {
+    statement("");
+  }


For SPIRV's GLSL compiler, undefined values are emitted by CompilerGLSL::emit_resources: previously it called CompilerGLSL::declare_undefined_values, now, it emits undefined values without any helpers.

Since CompilerGLSL::declare_undefined_values was removed (see KhronosGroup/SPIRV-Cross@5547b25), our SkSL compiler has two options to emit undefined values:

Copy the old logic from CompilerGLSL::declare_undefined_values into SkSL, or...

Refactor CompilerSkSL to call CompilerGLSL::emit_resources

I went with the first option as that's the easiest.

DEPS

loic-sharma · 2023-01-23T22:55:28Z

tools/gn

+    # ANGLE and SwiftShader share build flags to enable X11 and Wayland,
+    # but we only need these enabled for SwiftShader.
+    gn_args['angle_use_x11'] = False
+    gn_args['angle_use_wayland'] = False


Our tests depend on the Xcb and Wayland Vulkan extensions that are provided by SwiftShader. The latest version of SwiftShader now requires you to opt-in to these extensions through build flags, which we did in flutter/buildroot#669.

Unfortunately, those build flags also enable stuff in ANGLE that we don't need. See: https://github.com/google/angle/blob/057997e4f646c834ea9ef38ead6a7fd14f392115/gni/angle.gni#L61-L68

cbracken

🎉🎉🎉

iskakaushik · 2023-01-24T18:56:31Z

looks like the fixtures have changed, the gradients look a little off, is that expected?

chinmaygarde · 2023-01-24T19:07:50Z

the gradients look a little off

Could you actually spot the difference? If we can't eyeball it, then it's fine IMO.

iskakaushik · 2023-01-24T19:16:39Z

Could you actually spot the difference? If we can't eyeball it, then it's fine IMO.

Looking at them again, I thought the difference was bigger than it actually is.

LGTM!

loic-sharma · 2023-01-24T21:03:00Z

FYI it's hard to compare the fixtures side-by-side, I recommend using GitHub's Swipe mode and moving the slider across. I personally could not eyeball any differences either:

Our tests depend on the Xcb and Wayland Vulkan extensions that are provided by SwiftShader. The latest version of SwiftShader now requires you to opt-in to these extensions through build flags. See: flutter/engine#38650 Part of: flutter/flutter#117932

…ne#38650)

…ne#38650) (#119097)

…tter/engine#38650) (#119097) Commit: 6414c36041eb89d867eec0e8f251d504773007fd

…ter/engine#38650) (flutter/flutter#119097)

* 3735231 Cleanup old Dart SDK layout compatibility (flutter/flutter#118819) * 4d25030 Add leak_tracker as dev_dependency. (flutter/flutter#118952) * e3c51a2 Add Windows unit tests to plugin template (flutter/flutter#118638) * d20dd9e Roll Flutter Engine from 7d3233d26d09 to 71ee5f19bc16 (15 revisions) (flutter/flutter#119081) * 5dabe10 Fix path name to discover debug apk on add2app builds (flutter/flutter#117999) * 50ed8a3 Enable `unnecessary_null_comparison` check (flutter/flutter#118849) * 455e6ac Test integration test apps' runner files against current template app (flutter/flutter#118646) * a788e1b Roll Flutter Engine from 71ee5f19bc16 to 59ea78bfabda (2 revisions) (flutter/flutter#119087) * c35370c Roll Flutter Engine from 59ea78bfabda to 2499a5d9fca7 (2 revisions) (flutter/flutter#119089) * 2f0dd56 Refactor highlight handling in FocusManager (flutter/flutter#119075) * 2759f3f Roll Flutter Engine from 2499a5d9fca7 to d98926c32ee7 (2 revisions) (flutter/flutter#119090) * 760fb21 Roll Flutter Engine from d98926c32ee7 to bec40654a5d7 (2 revisions) (flutter/flutter#119093) * bbca694 Roll Flutter Engine from bec40654a5d7 to 5405f2c26e85 (2 revisions) (flutter/flutter#119095) * 6414c36 f1464b49c Manually roll ANGLE, vulkan-deps, SwiftShader (flutter/engine#38650) (flutter/flutter#119097) * 426cdd9 55bb8deaf [Impeller] Linear sample atlas glyphs when the CTM isn't translation/scale only (flutter/engine#39112) (flutter/flutter#119098) * 83c3a61 Only emit image painting events in debug & profile modes. (flutter/flutter#118872) * b113df2 bffb98352 Roll Skia from b72fececbdcc to 8ffd5c20d634 (3 revisions) (flutter/engine#39114) (flutter/flutter#119099) * 351466a Add Decoding Flutter videos to API docs (flutter/flutter#116454) * 318f875 Pass through magnifierConfiguration (flutter/flutter#118270) * eced23e d39ab638b Roll Fuchsia Mac SDK from MUvFS0baOnigVUIND... to _H53AyDxR9Pm2TbwN... (flutter/engine#39122) (flutter/flutter#119126) * 29ab437 Add Material 3 `CheckboxListTile` example and update existing examples (flutter/flutter#118792) * a815ee6 8efc7183b Roll Skia from 8ffd5c20d634 to da5034f9d117 (4 revisions) (flutter/engine#39123) (flutter/flutter#119129)

loic-sharma changed the title ~~Roll ANGLE from 094b49d to 32175d~~ Manually roll ANGLE, vulkan-deps, SwiftShader Jan 5, 2023

flutter-dashboard bot added the embedder Related to the embedder API label Jan 5, 2023

loic-sharma force-pushed the roll-angle branch from 0a7cddc to 896b031 Compare January 13, 2023 20:01

loic-sharma commented Jan 18, 2023

View reviewed changes

loic-sharma mentioned this pull request Jan 20, 2023

Update build configs for ANGLE, vulkan-deps, and SwiftShader roll flutter/buildroot#669

Merged

8 tasks

loic-sharma force-pushed the roll-angle branch 2 times, most recently from 0507bff to 87335e7 Compare January 23, 2023 22:06

loic-sharma commented Jan 23, 2023

View reviewed changes

DEPS Outdated Show resolved Hide resolved

loic-sharma commented Jan 23, 2023

View reviewed changes

loic-sharma requested review from iskakaushik, yaakovschectman, cbracken, chinmaygarde and dnfield January 23, 2023 23:09

loic-sharma marked this pull request as ready for review January 23, 2023 23:09

chinmaygarde approved these changes Jan 24, 2023

View reviewed changes

yaakovschectman approved these changes Jan 24, 2023

View reviewed changes

cbracken approved these changes Jan 24, 2023

View reviewed changes

loic-sharma force-pushed the roll-angle branch from 87335e7 to d18c1f8 Compare January 24, 2023 21:23

Manually roll ANGLE, vulkan-deps, SwiftShader

5254160

loic-sharma force-pushed the roll-angle branch from 41572ce to 5254160 Compare January 24, 2023 23:20

loic-sharma added the autosubmit Merge PR when tree becomes green via auto submit App label Jan 25, 2023

auto-submit bot merged commit f1464b4 into flutter:main Jan 25, 2023

engine-flutter-autoroll mentioned this pull request Jan 25, 2023

Roll Flutter Engine from 5405f2c26e85 to f1464b49c4ff (1 revision) flutter/flutter#119097

Merged

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

f1464b49c Manually roll ANGLE, vulkan-deps, SwiftShader (flutter/engi…

b57c097

…ne#38650)

auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Jan 25, 2023

f1464b49c Manually roll ANGLE, vulkan-deps, SwiftShader (flutter/engi…

6414c36

…ne#38650) (#119097)

sourcegraph-bot pushed a commit to sgtest/megarepo that referenced this pull request Jan 25, 2023

flutter: f1464b49c Manually roll ANGLE, vulkan-deps, SwiftShader (flu…

2097f94

…tter/engine#38650) (#119097) Commit: 6414c36041eb89d867eec0e8f251d504773007fd

This was referenced Jan 25, 2023

Roll Flutter from c35efdaa6854 to a815ee634202 (22 revisions) flutter/plugins#7025

Merged

Roll Flutter from c35efdaa6854 to a815ee634202 (22 revisions) flutter/packages#3089

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 25, 2023

6414c36 f1464b49c Manually roll ANGLE, vulkan-deps, SwiftShader (flut…

e5de4a5

…ter/engine#38650) (flutter/flutter#119097)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Jan 25, 2023

6414c36 f1464b49c Manually roll ANGLE, vulkan-deps, SwiftShader (flut…

d54c777

…ter/engine#38650) (flutter/flutter#119097)

ricardoamador pushed a commit to ricardoamador/engine that referenced this pull request Jan 25, 2023

Manually roll ANGLE, vulkan-deps, SwiftShader (flutter#38650)

fdeb1a9

gaaclarke mentioned this pull request Apr 7, 2023

[Impeller] impcllerc uses a SPIRV-Cross API that has been removed. flutter/flutter#115785

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Manually roll ANGLE, vulkan-deps, SwiftShader #38650

Manually roll ANGLE, vulkan-deps, SwiftShader #38650

Uh oh!

loic-sharma commented Jan 4, 2023 •

edited

Loading

Uh oh!

loic-sharma Jan 18, 2023

Uh oh!

loic-sharma Jan 18, 2023

Uh oh!

loic-sharma Jan 23, 2023 •

edited

Loading

Uh oh!

Uh oh!

loic-sharma Jan 23, 2023 •

edited

Loading

Uh oh!

cbracken left a comment

Uh oh!

iskakaushik commented Jan 24, 2023

Uh oh!

chinmaygarde commented Jan 24, 2023

Uh oh!

iskakaushik commented Jan 24, 2023

Uh oh!

loic-sharma commented Jan 24, 2023

Uh oh!

Uh oh!

Manually roll ANGLE, vulkan-deps, SwiftShader #38650

Manually roll ANGLE, vulkan-deps, SwiftShader #38650

Uh oh!

Conversation

loic-sharma commented Jan 4, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

loic-sharma Jan 18, 2023

Choose a reason for hiding this comment

Uh oh!

loic-sharma Jan 18, 2023

Choose a reason for hiding this comment

Uh oh!

loic-sharma Jan 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

loic-sharma Jan 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cbracken left a comment

Choose a reason for hiding this comment

Uh oh!

iskakaushik commented Jan 24, 2023

Uh oh!

chinmaygarde commented Jan 24, 2023

Uh oh!

iskakaushik commented Jan 24, 2023

Uh oh!

loic-sharma commented Jan 24, 2023

Uh oh!

Uh oh!

loic-sharma commented Jan 4, 2023 •

edited

Loading

loic-sharma Jan 23, 2023 •

edited

Loading

loic-sharma Jan 23, 2023 •

edited

Loading