Skip to content

Commit 13988ea

Browse files
authored
[Impeller] Order the Vulkan ResizeTexture layout transition after its blit (flutter#195721)
This violation was flagged by the synch validation layers gemini write up: > The barrier that moves the resized texture back to ShaderReadOnlyOptimal used an empty src access mask and the top-of-pipe stage, so the layout transition wasn't ordered after the blit's transfer write (SYNC-HAZARD-WRITE-AFTER-WRITE). Fixes flutter#195598 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [AI contribution guidelines] and understand my responsibilities, or I am not using AI tools. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant in-code documentation (doc comments with `///`). - [x] If this PR introduces a new feature or capability, I created and linked a website documentation issue or PR in [flutter/website] (or verified none is needed). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. If this change needs to override an active code freeze, provide a comment explaining why. The code freeze workflow can be overridden by code reviewers. See pinned issues for any active code freezes with guidance. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [AI contribution guidelines]: https://github.com/flutter/flutter/blob/main/CONTRIBUTING.ai.md [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [flutter/website]: https://github.com/flutter/website [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
1 parent 1c7c4db commit 13988ea

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

‎engine/src/flutter/impeller/renderer/backend/vulkan/blit_pass_vk.cc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -382,13 +382,14 @@ bool BlitPassVK::ResizeTexture(const std::shared_ptr<Texture>& source,
382382

383383
);
384384

385-
// Convert back to shader read
385+
// Convert back to shader read. The layout transition must be ordered after
386+
// the blit's transfer write (SYNC-HAZARD-WRITE-AFTER-WRITE).
386387

387388
BarrierVK barrier;
388389
barrier.cmd_buffer = cmd_buffer;
389390
barrier.new_layout = vk::ImageLayout::eShaderReadOnlyOptimal;
390-
barrier.src_access = {};
391-
barrier.src_stage = vk::PipelineStageFlagBits::eTopOfPipe;
391+
barrier.src_access = vk::AccessFlagBits::eTransferWrite;
392+
barrier.src_stage = vk::PipelineStageFlagBits::eTransfer;
392393
barrier.dst_access = vk::AccessFlagBits::eShaderRead;
393394
barrier.dst_stage = vk::PipelineStageFlagBits::eFragmentShader;
394395

‎engine/src/flutter/testing/run_tests.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,7 @@ def vulkan_validation_env(build_dir: str) -> typing.Dict[str, str]:
217217
VULKAN_SYNC_VALIDATION_TESTS = [
218218
# Blits, readbacks and mipmap generation.
219219
'Play/BlitPassTest.CanBlitSmallRegionToUninitializedTexture/Vulkan',
220-
## TODO(https://github.com/flutter/flutter/issues/195598):
221-
## BlitPassVK::ResizeTexture barrier.
222-
# 'Play/BlitPassTest.CanResizeTextures/Vulkan',
220+
'Play/BlitPassTest.CanResizeTextures/Vulkan',
223221
## TODO(https://github.com/flutter/flutter/issues/194987):
224222
## BlitPassVK::OnCopyTextureToBufferCommand barrier.
225223
# 'Play/RendererTest.CanBlitTextureToBuffer/Vulkan',

0 commit comments

Comments
 (0)