Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Update Skia build for Vulkan headers #55143

Merged
merged 1 commit into from
Sep 12, 2024
Merged

Conversation

bungeman
Copy link
Contributor

Skia has its own set of Vulkan headers which Skia Vulkan sources expect to be compiled against. This internal set of Vulkan headers should not be seen by any users. Instead, users provide their own set of Vulkan headers and Skia's public Vk headers will use the user's Vulkan headers when included in user sources. Unfortunately, this has not been well enforced and Skia is making changes to ensure that Skia's set of Vulkan headers does not leak. This change updates Flutter's build of Skia to be compatible with these Skia changes.

Skia-Change: https://skia-review.googlesource.com/c/skia/+/898139

Skia has its own set of Vulkan headers which Skia Vulkan sources expect
to be compiled against. This internal set of Vulkan headers should not
be seen by any users. Instead, users provide their own set of Vulkan
headers and Skia's public Vk headers will use the user's Vulkan headers
when included in user sources. Unfortunately, this has not been well
enforced and Skia is making changes to ensure that Skia's set of Vulkan
headers does not leak. This change updates Flutter's build of Skia to be
compatible with these Skia changes.

Skia-Change: https://skia-review.googlesource.com/c/skia/+/898139
@kjlubick kjlubick merged commit 0a61043 into flutter:main Sep 12, 2024
25 checks passed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 12, 2024
hubot pushed a commit to google/skia that referenced this pull request Sep 12, 2024
Skia has its own set of vulkan headers which it compiles against
internally, but the user may specify a different set of vulkan headers
when compiling against Skia. Ensure that the internal vulkan headers do
not leak by using implementation_deps.

Pre-Fix: https://chromium-review.googlesource.com/c/chromium/src/+/5854646
Pre-Fix: https://chromium-review.googlesource.com/c/chromium/src/+/5854994
Pre-Fix: flutter/engine#55126
Pre-Fix: flutter/engine#55143
Change-Id: Ic11c0920c20e4aeb537c607ec5879a93144276a5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/898139
Reviewed-by: Kaylee Lubick <[email protected]>
Commit-Queue: Ben Wagner <[email protected]>
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 12, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 12, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 12, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Sep 12, 2024
…155128)

flutter/engine@48ddaf5...8609af6

2024-09-12 [email protected] Revert "Update Color to do all calculations with floating point components" (flutter/engine#55153)
2024-09-12 [email protected] Migrate more tests from `litetest` to `package:test` (flutter/engine#55119)
2024-09-12 [email protected] Roll Skia from acff7f24ddbe to 26b048c6a53b (1 revision) (flutter/engine#55151)
2024-09-12 [email protected] Roll Dart SDK from a438066d634f to aa27c61f5859 (8 revisions) (flutter/engine#55147)
2024-09-12 [email protected] Update Skia build for Vulkan headers (flutter/engine#55143)
2024-09-12 [email protected] Roll Skia from 2b40b50ea423 to acff7f24ddbe (1 revision) (flutter/engine#55144)
2024-09-12 [email protected] Update Color to do all calculations with floating point components (flutter/engine#54981)
2024-09-12 [email protected] Roll Fuchsia Linux SDK from fKNT8lbGh8JzxjE6m... to 3YH1DEYJ-s93fHBw5... (flutter/engine#55142)
2024-09-12 [email protected] Migrate `const_finder_test` to use `package:test` (flutter/engine#55132)
2024-09-12 [email protected] [engine] make UI thread the platform thread for Android. Still allows opt out as g3 escape hatch. (flutter/engine#55111)
2024-09-12 [email protected] Roll Skia from b750cbedc114 to 2b40b50ea423 (1 revision) (flutter/engine#55141)

Also rolling transitive DEPS:
  fuchsia/sdk/core/linux-amd64 from fKNT8lbGh8Jz to 3YH1DEYJ-s93

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 [email protected],[email protected],[email protected] 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://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants