Roll vulkan-deps to a9e2ca3b #176322

jason-simmons · 2025-09-30T23:11:36Z

The build script for this version of the Vulkan headers defines VK_USE_PLATFORM_XLIB_KHR. This brings in some X11 headers that define macros with commonly used names.

Files that include Vulkan headers may need to undefine some of these macros to prevent conflicts with other code that uses the same names.

gemini-code-assist

Code Review

This pull request updates Vulkan dependencies and addresses macro conflicts introduced by X11 headers. It undefines conflicting macros like Bool, None, Status, and Success in common Vulkan headers. Additionally, it improves error handling by checking the return value of vkResetCommandPool and removes an unnecessary Vulkan header from a GL test file. My review includes a suggestion to refactor the command pool reset logic for better readability and to reduce duplication.

gemini-code-assist · 2025-09-30T23:12:40Z

engine/src/flutter/impeller/renderer/backend/vulkan/command_pool_vk.cc

+  vk::Result result;
  if (should_trim) {
    buffers.clear();
-    device.resetCommandPool(pool.get(),
-                            vk::CommandPoolResetFlagBits::eReleaseResources);
+    result = device.resetCommandPool(
+        pool.get(), vk::CommandPoolResetFlagBits::eReleaseResources);
  } else {
-    device.resetCommandPool(pool.get(), {});
+    result = device.resetCommandPool(pool.get(), {});
+  }


To reduce code duplication, you could determine the flags first and then make a single call to resetCommandPool.

vk::CommandPoolResetFlags flags = {}; if (should_trim) { buffers.clear(); flags = vk::CommandPoolResetFlagBits::eReleaseResources; } const auto result = device.resetCommandPool(pool.get(), flags);

not a bad call gem gem

jason-simmons · 2025-10-02T20:16:17Z

@chinmaygarde PTAL at the changes that were required by the latest Vulkan validation layers:

Creating a presentation semaphore for each swapchain image (instead of each frame in flight).
- See https://docs.vulkan.org/guide/latest/swapchain_semaphore_reuse.html
Aligning data based on minUniformBufferOffsetAlignment in RuntimeEffectContents::EmplaceVulkanUniform
Aligning data based on minStorageBufferOffsetAlignment for shaders that write color data to a storage buffer

chinmaygarde · 2025-10-02T20:14:52Z

engine/src/flutter/vulkan/procs/vulkan_interface.h


 #include <vulkan/vulkan.h>

+// The Vulkan headers may bring in X11 headers which define some macros that


Maybe and ifdef-undef pair instead? I am pretty sure this would cause errors in TUs that dont suppress the "undefining an unknown macro".

Ditto elsewhere.

The language spec says that #undef can safely be used for a macro with no previous definition

chinmaygarde · 2025-10-02T20:15:11Z

engine/src/flutter/impeller/renderer/capabilities.h

  virtual size_t GetMinimumUniformAlignment() const = 0;

+  /// @brief The minimum alignment of storage buffer value offsets in bytes.
+  virtual size_t GetMinimumStorageAlignment() const {


OOL virtuals please.

chinmaygarde · 2025-10-02T20:15:59Z

engine/src/flutter/impeller/renderer/capabilities.h

  virtual size_t GetMinimumUniformAlignment() const = 0;

+  /// @brief The minimum alignment of storage buffer value offsets in bytes.
+  virtual size_t GetMinimumStorageAlignment() const {


GetMinimumStorageBuffer alignment? Or even GetMinimumSSBO alignment? I wasn't sure what storage was without a lot of context.

Changed to GetMinimumStorageBufferAlignment

chinmaygarde · 2025-10-02T20:16:35Z

engine/src/flutter/impeller/renderer/backend/vulkan/capabilities_vk.cc


  minimum_uniform_alignment_ =
      device_properties_.limits.minUniformBufferOffsetAlignment;
+  minimum_storage_alignment_ =


Dang. I didn't know these were different. TIL.

chinmaygarde · 2025-10-02T20:19:29Z

engine/src/flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_impl_vk.cc

                                    swapchain_info.imageExtent.height);

  std::vector<std::shared_ptr<KHRSwapchainImageVK>> swapchain_images;
+  std::vector<vk::UniqueSemaphore> present_semaphores;


Thanks for the context. TIL.

chinmaygarde · 2025-10-02T20:21:51Z

engine/src/flutter/impeller/renderer/backend/vulkan/capabilities_vk.h

  vk::PhysicalDevice physical_device_;
  vk::PhysicalDeviceProperties device_properties_;
  size_t minimum_uniform_alignment_ = 256;
+  size_t minimum_storage_alignment_ = 256;


In a later patch, we should add a comment for each of these to the GPU info page so its easier to tell whats out there in the wild. For instance, for this one, I had to look up https://vulkan.gpuinfo.org/displaydevicelimit.php?name=minStorageBufferOffsetAlignment&platform=all.

chinmaygarde · 2025-10-02T20:22:40Z

engine/src/flutter/impeller/renderer/backend/vulkan/command_pool_vk.cc

+  vk::Result result;
  if (should_trim) {
    buffers.clear();
-    device.resetCommandPool(pool.get(),
-                            vk::CommandPoolResetFlagBits::eReleaseResources);
+    result = device.resetCommandPool(
+        pool.get(), vk::CommandPoolResetFlagBits::eReleaseResources);
  } else {
-    device.resetCommandPool(pool.get(), {});
+    result = device.resetCommandPool(pool.get(), {});
+  }


not a bad call gem gem

The build script for this version of the Vulkan headers defines VK_USE_PLATFORM_XLIB_KHR. This brings in some X11 headers that define macros with commonly used names. Files that include Vulkan headers may need to undefine some of these macros to prevent conflicts with other code that uses the same names.

See https://docs.vulkan.org/guide/latest/swapchain_semaphore_reuse.html

…ation rules

erock2112 · 2025-10-07T17:02:22Z

DEPS

  Var('swiftshader_git') + '/SwiftShader.git' + '@' + 'd040a5bab638bf7c226235c95787ba6288bb6416',

  'engine/src/flutter/third_party/angle':
-  Var('chromium_git') + '/angle/angle.git' + '@' + '6a09e41ce6ea8c93524faae1a925eb01562f53b1',


This broke the angle -> flutter roller. Was it intentional? Does the roller configuration need to be updated?

The ANGLE->Flutter roller has been stopped for a long time and I don't think it will be reactivated in the near future.

The version of ANGLE used in Flutter now requires patches for compatibility with the Flutter engine source tree and is hosted in a branch on https://flutter.googlesource.com/. For now I expect that any future rolls of ANGLE will be done manually.

The build script for this version of the Vulkan headers defines VK_USE_PLATFORM_XLIB_KHR. This brings in some X11 headers that define macros with commonly used names. Files that include Vulkan headers may need to undefine some of these macros to prevent conflicts with other code that uses the same names.

Roll Flutter from 908012d58baa to e11e2c11288b (39 revisions) flutter/flutter@908012d...e11e2c1 2025-10-08 [email protected] Configure FfiNative resolver on dart:io (flutter/flutter#176621) 2025-10-08 [email protected] Marks Linux_pixel_7pro service_extensions_test to be unflaky (flutter/flutter#176700) 2025-10-08 [email protected] Keyboard Animation Fix (flutter/flutter#176418) 2025-10-08 [email protected] Feat: Add carousel view builder (flutter/flutter#172837) 2025-10-08 [email protected] Roll Skia from d10a0d877ff4 to ea7cdbc6b986 (15 revisions) (flutter/flutter#176686) 2025-10-08 [email protected] Roll Fuchsia Linux SDK from jJr3my9C6TwYWPygi... to xrIAL91ngrd-wNr9S... (flutter/flutter#176682) 2025-10-08 [email protected] Fix InputDecoration helper/error padding is not compliant (flutter/flutter#176353) 2025-10-08 [email protected] Fix PopupMenu does not update when PopupMenuTheme in Theme changes. (flutter/flutter#175513) 2025-10-07 [email protected] Roll Dart SDK to 3.10.0-290.1.beta (flutter/flutter#176629) 2025-10-07 [email protected] [ Tool ] Output `app.dtd` and `app.devTools` in machine mode (flutter/flutter#176655) 2025-10-07 [email protected] Rename UIScene integration test projects and fix Xcode compatibility (flutter/flutter#176635) 2025-10-07 [email protected] Selecting an implementation widget with the on-device inspector opens the code location for the nearest project widget (flutter/flutter#176530) 2025-10-07 [email protected] Migrate to `WidgetStateInputBorder` (flutter/flutter#176386) 2025-10-07 [email protected] Make it clear that you need to install clangd in VSCode intellisense c++ config (flutter/flutter#176609) 2025-10-07 [email protected] Bump the customer tests to pick up an update to Zulip's tests. (flutter/flutter#176463) 2025-10-07 [email protected] Roll Packages from d3ef88b to 8ca6416 (2 revisions) (flutter/flutter#176633) 2025-10-07 [email protected] Add fallback for 'scene:willConnectToSession:options' (flutter/flutter#176580) 2025-10-07 [email protected] Roll Skia from d09786dfb854 to d10a0d877ff4 (11 revisions) (flutter/flutter#176616) 2025-10-07 [email protected] [ Widget Preview ] Rework UI and theming (flutter/flutter#176581) 2025-10-07 [email protected] Handle FlutterEngine registration when embedded in Multi-Scene apps (flutter/flutter#176490) 2025-10-07 [email protected] Fix code style in Linux embedder template (flutter/flutter#176256) 2025-10-07 [email protected] Add tooling to migrate to UIScene (flutter/flutter#176427) 2025-10-06 [email protected] Bump customer tests.version to 986c4326b4e4bb4e37bc963c2cc2aaa10b943859 (flutter/flutter#176594) 2025-10-06 [email protected] Fix typo in pages.dart (flutter/flutter#176438) 2025-10-06 [email protected] Fix: Update anchorRect for overlayBuilder when anchor moves (flutter/flutter#169814) 2025-10-06 [email protected] Roll Fuchsia Linux SDK from Zm6K_3gP3VCaMy9rH... to jJr3my9C6TwYWPygi... (flutter/flutter#176591) 2025-10-06 [email protected] Fix deprecated configureStatusBarForFullscreenFlutterExperience for Android 15+ (flutter/flutter#175501) 2025-10-06 [email protected] updates docs for flutter engine footprint (flutter/flutter#176217) 2025-10-06 [email protected] [ Widget Preview ] Fix `WidgetInspectorService` override (flutter/flutter#176550) 2025-10-06 [email protected] Fix NavigatorBar lacks visual feedback (flutter/flutter#175182) 2025-10-06 [email protected] Roll Packages from e401aeb to d3ef88b (4 revisions) (flutter/flutter#176582) 2025-10-06 [email protected] Roll Dart SDK from 898380a41c90 to 6b0193498f09 (2 revisions) (flutter/flutter#176576) 2025-10-06 [email protected] Roll Skia from bc7cf194f4ee to d09786dfb854 (1 revision) (flutter/flutter#176577) 2025-10-06 [email protected] Roll vulkan-deps to a9e2ca3b (flutter/flutter#176322) 2025-10-06 [email protected] Add an AppDelegate callback for implicit FlutterEngines (flutter/flutter#176240) 2025-10-06 [email protected] Roll Skia from 45191c22b15c to bc7cf194f4ee (2 revisions) (flutter/flutter#176572) 2025-10-06 [email protected] [ Widget Preview ] Fix type error when retrieving flags from persistent preferences (flutter/flutter#176546) 2025-10-06 [email protected] Roll Skia from 1fd0ca1f2120 to 45191c22b15c (3 revisions) (flutter/flutter#176556) 2025-10-05 [email protected] Roll Dart SDK from 016a8c0045fd to 898380a41c90 (1 revision) (flutter/flutter#176549) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. ...

The build script for this version of the Vulkan headers defines VK_USE_PLATFORM_XLIB_KHR. This brings in some X11 headers that define macros with commonly used names. Files that include Vulkan headers may need to undefine some of these macros to prevent conflicts with other code that uses the same names.

jason-simmons requested a review from jtmcdole September 30, 2025 23:11

github-actions bot added engine flutter/engine related. See also e: labels. e: impeller Impeller rendering backend issues and features requests labels Sep 30, 2025

gemini-code-assist bot reviewed Sep 30, 2025

View reviewed changes

jason-simmons requested a review from chinmaygarde October 2, 2025 20:12

chinmaygarde reviewed Oct 2, 2025

View reviewed changes

chinmaygarde approved these changes Oct 3, 2025

View reviewed changes

jtmcdole approved these changes Oct 3, 2025

View reviewed changes

jason-simmons mentioned this pull request Oct 3, 2025

Remove the C99 flag from the compiler configuration for C sources on Mac/iOS #176481

Closed

jason-simmons added 7 commits October 3, 2025 13:53

update ANGLE mirror URL

8db7268

update validation layer sources

9f9e498

Create a presentation semaphore for each swapchain image

420fefc

See https://docs.vulkan.org/guide/latest/swapchain_semaphore_reuse.html

Fix uniform and storage buffer alignments to comply with Vulkan valid…

04adcc5

…ation rules

review

fb0ca7e

Compile C source files in C11 mode on all platforms

bb3971f

jason-simmons force-pushed the roll_vulkan_deps_092625 branch from 13e2d69 to bb3971f Compare October 3, 2025 20:53

licenses

bd9016e

jason-simmons added the autosubmit Merge PR when tree becomes green via auto submit App label Oct 6, 2025

auto-submit bot added this pull request to the merge queue Oct 6, 2025

Merged via the queue into flutter:master with commit 003eb65 Oct 6, 2025
188 checks passed

flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Oct 6, 2025

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 6, 2025

003eb6523 Roll vulkan-deps to a9e2ca3b (flutter/flutter#176322)

4f42e6c

engine-flutter-autoroll mentioned this pull request Oct 6, 2025

Roll Flutter from 908012d58baa to 003eb6523ce8 (6 revisions) flutter/packages#10179

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 6, 2025

003eb6523 Roll vulkan-deps to a9e2ca3b (flutter/flutter#176322)

7e636c1

engine-flutter-autoroll mentioned this pull request Oct 6, 2025

Roll Flutter from 908012d58baa to 4fc08edcbba4 (7 revisions) flutter/packages#10180

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 6, 2025

003eb6523 Roll vulkan-deps to a9e2ca3b (flutter/flutter#176322)

9f00b07

engine-flutter-autoroll mentioned this pull request Oct 6, 2025

Roll Flutter from 908012d58baa to 04f323450df4 (11 revisions) flutter/packages#10181

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 7, 2025

003eb6523 Roll vulkan-deps to a9e2ca3b (flutter/flutter#176322)

0db8808

engine-flutter-autoroll mentioned this pull request Oct 7, 2025

Roll Flutter from 908012d58baa to e20c5f5594a3 (22 revisions) flutter/packages#10182

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 7, 2025

003eb6523 Roll vulkan-deps to a9e2ca3b (flutter/flutter#176322)

683f4cf

engine-flutter-autoroll mentioned this pull request Oct 7, 2025

Roll Flutter from 908012d58baa to 884512c06f7e (23 revisions) flutter/packages#10183

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 7, 2025

003eb6523 Roll vulkan-deps to a9e2ca3b (flutter/flutter#176322)

e4754ea

engine-flutter-autoroll mentioned this pull request Oct 7, 2025

Roll Flutter from 908012d58baa to 9e97c5893ef0 (24 revisions) flutter/packages#10184

Closed

erock2112 reviewed Oct 7, 2025

View reviewed changes

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 7, 2025

003eb6523 Roll vulkan-deps to a9e2ca3b (flutter/flutter#176322)

0383174

engine-flutter-autoroll mentioned this pull request Oct 7, 2025

Roll Flutter from 908012d58baa to 08def364d21b (25 revisions) flutter/packages#10185

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 8, 2025

003eb6523 Roll vulkan-deps to a9e2ca3b (flutter/flutter#176322)

9375044

engine-flutter-autoroll mentioned this pull request Oct 8, 2025

Roll Flutter from 908012d58baa to 7100df24f611 (36 revisions) flutter/packages#10189

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 8, 2025

003eb6523 Roll vulkan-deps to a9e2ca3b (flutter/flutter#176322)

66a9e12

engine-flutter-autoroll mentioned this pull request Oct 8, 2025

Roll Flutter from 908012d58baa to 3379c7f0654b (37 revisions) flutter/packages#10190

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 8, 2025

003eb6523 Roll vulkan-deps to a9e2ca3b (flutter/flutter#176322)

bf58e0d

engine-flutter-autoroll mentioned this pull request Oct 8, 2025

Roll Flutter from 908012d58baa to 44c77df80a87 (38 revisions) flutter/packages#10191

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 8, 2025

003eb6523 Roll vulkan-deps to a9e2ca3b (flutter/flutter#176322)

6a4d6c0

engine-flutter-autoroll mentioned this pull request Oct 8, 2025

Roll Flutter from 908012d58baa to e11e2c11288b (39 revisions) flutter/packages#10192

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 8, 2025

003eb6523 Roll vulkan-deps to a9e2ca3b (flutter/flutter#176322)

86f375c

engine-flutter-autoroll mentioned this pull request Oct 8, 2025

Roll Flutter from 908012d58baa to c56e52be0710 (40 revisions) flutter/packages#10194

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 12, 2025

003eb6523 Roll vulkan-deps to a9e2ca3b (flutter/flutter#176322)

82f33f3


		#include <vulkan/vulkan.h>

		// The Vulkan headers may bring in X11 headers which define some macros that

Roll vulkan-deps to a9e2ca3b #176322

Roll vulkan-deps to a9e2ca3b #176322

Uh oh!

Conversation

jason-simmons commented Sep 30, 2025

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist bot Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jason-simmons commented Oct 2, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants