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

Ensure Vulkan when including Skia Vulkan headers #55126

Merged
merged 1 commit into from
Sep 12, 2024

Conversation

bungeman
Copy link
Contributor

Skia is changing how it handles its internal copy of Vulkan headers to prevent them from accidentally leaking to users and potentially overriding the user's Vulkan headers. Users of Skia are responsible for providing the Vulkan headers when including Skia's public Vk headers. This change only includes Skia's public Vk headers when Flutter is providing the Vulkan headers.

Skia is changing how it handles its internal copy of Vulkan headers to
prevent them from accidentally leaking to users and potentially
overriding the user's Vulkan headers. Users of Skia are responsible for
providing the Vulkan headers when including Skia's public Vk headers.
This change only includes Skia's public Vk headers when Flutter is
providing the Vulkan headers.
@flutter-dashboard
Copy link

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption, contact "@test-exemption-reviewer" in the #hackers channel in Discord (don't just cc them here, they won't see it!).

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. The test exemption team is a small volunteer group, so all reviewers should feel empowered to ask for tests, without delegating that responsibility entirely to the test exemption group.

@brianosman brianosman merged commit 48ddaf5 into flutter:main Sep 12, 2024
27 checks passed
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
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]>
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