gpui_wgpu: Release surface resources during destroy#51561
Merged
Veykril merged 1 commit intozed-industries:mainfrom Mar 19, 2026
Merged
gpui_wgpu: Release surface resources during destroy#51561Veykril merged 1 commit intozed-industries:mainfrom
Veykril merged 1 commit intozed-industries:mainfrom
Conversation
Release surface-bound GPU resources eagerly so X11 window teardown does not stall later during final renderer drop. Suggested-by: israelrios <220787+israelrios@users.noreply.github.com>
|
We require contributors to sign our Contributor License Agreement, and we don't have @AxXxB on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'. |
Contributor
Author
|
@cla-bot check |
|
The cla-bot has been summoned, and re-checked this pull request! |
Contributor
Contributor
Author
|
I've added Release Notes, but I'm not sure this PR fully resolves the referenced issue, since users seem to be reporting multiple similar problems there. |
AmaanBilwar
pushed a commit
to AmaanBilwar/zed
that referenced
this pull request
Mar 20, 2026
…1561) ## Summary Implements the fix proposed by @israelrios in zed-industries#50269 (comment). The issue comment narrowed the hang down to X11 window teardown: - when the Settings window is closed on X11, the UI thread can stall while `WgpuRenderer` is dropped during final `X11WindowState` teardown - at that point, the X11 window has already been destroyed - the proposed fix is to make `WgpuRenderer::destroy()` release surface-bound GPU resources eagerly so the native window is destroyed only after the `wgpu::Surface` and related resources are gone This PR applies that change in `crates/gpui_wgpu/src/wgpu_renderer.rs` by calling `self.resources.take()` inside `destroy()`. ## Validation I confirmed this fix locally on Linux Mint 21.3 Cinnamon by applying it to the `v0.227.1` build: - opening and closing Settings no longer causes the main window to hang ## References - Refs zed-industries#50269 - Original analysis and fix proposal by @israelrios: zed-industries#50269 (comment) Release Notes: - Fixed a Linux/X11 issue where closing the Settings window could cause Zed to hang.
toshmukhamedov
pushed a commit
to toshmukhamedov/zed
that referenced
this pull request
Mar 20, 2026
…1561) ## Summary Implements the fix proposed by @israelrios in zed-industries#50269 (comment). The issue comment narrowed the hang down to X11 window teardown: - when the Settings window is closed on X11, the UI thread can stall while `WgpuRenderer` is dropped during final `X11WindowState` teardown - at that point, the X11 window has already been destroyed - the proposed fix is to make `WgpuRenderer::destroy()` release surface-bound GPU resources eagerly so the native window is destroyed only after the `wgpu::Surface` and related resources are gone This PR applies that change in `crates/gpui_wgpu/src/wgpu_renderer.rs` by calling `self.resources.take()` inside `destroy()`. ## Validation I confirmed this fix locally on Linux Mint 21.3 Cinnamon by applying it to the `v0.227.1` build: - opening and closing Settings no longer causes the main window to hang ## References - Refs zed-industries#50269 - Original analysis and fix proposal by @israelrios: zed-industries#50269 (comment) Release Notes: - Fixed a Linux/X11 issue where closing the Settings window could cause Zed to hang.
AmaanBilwar
pushed a commit
to AmaanBilwar/zed
that referenced
this pull request
Mar 23, 2026
…1561) ## Summary Implements the fix proposed by @israelrios in zed-industries#50269 (comment). The issue comment narrowed the hang down to X11 window teardown: - when the Settings window is closed on X11, the UI thread can stall while `WgpuRenderer` is dropped during final `X11WindowState` teardown - at that point, the X11 window has already been destroyed - the proposed fix is to make `WgpuRenderer::destroy()` release surface-bound GPU resources eagerly so the native window is destroyed only after the `wgpu::Surface` and related resources are gone This PR applies that change in `crates/gpui_wgpu/src/wgpu_renderer.rs` by calling `self.resources.take()` inside `destroy()`. ## Validation I confirmed this fix locally on Linux Mint 21.3 Cinnamon by applying it to the `v0.227.1` build: - opening and closing Settings no longer causes the main window to hang ## References - Refs zed-industries#50269 - Original analysis and fix proposal by @israelrios: zed-industries#50269 (comment) Release Notes: - Fixed a Linux/X11 issue where closing the Settings window could cause Zed to hang.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Implements the fix proposed by @israelrios in #50269 (comment).
The issue comment narrowed the hang down to X11 window teardown:
WgpuRendereris dropped during finalX11WindowStateteardownWgpuRenderer::destroy()release surface-bound GPU resources eagerly so the native window is destroyed only after thewgpu::Surfaceand related resources are goneThis PR applies that change in
crates/gpui_wgpu/src/wgpu_renderer.rsby callingself.resources.take()insidedestroy().Validation
I confirmed this fix locally on Linux Mint 21.3 Cinnamon by applying it to the
v0.227.1build:References
Release Notes: