vrr/zed
2
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-05-27 00:08:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Fix handling of surface.configure on Linux (#50640)

Browse source 
Closes #50574

Release Notes:

- Fixed Zed not being responsive on some Linux configurations

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
This commit is contained in:
John Tur 2026-03-03 16:47:57 -05:00 • committed by GitHub
parent 4dd42a0f77
commit c1cbcb612d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/gpui_wgpu/src/wgpu_renderer.rs
View file

@ -98,7 +98,6 @@ pub struct WgpuRenderer {
queue: Arc<wgpu::Queue>,
surface: wgpu::Surface<'static>,
surface_config: wgpu::SurfaceConfiguration,
surface_configured: bool,
pipelines: WgpuPipelines,
bind_group_layouts: WgpuBindGroupLayouts,
atlas: Arc<WgpuAtlas>,
@ -381,7 +380,6 @@ impl WgpuRenderer {
queue,
surface,
surface_config,
surface_configured: true,
pipelines,
bind_group_layouts,
atlas,
@ -875,9 +873,7 @@ impl WgpuRenderer {
self.surface_config.width = clamped_width.max(1);
self.surface_config.height = clamped_height.max(1);
if self.surface_configured {
self.surface.configure(&self.device, &self.surface_config);
}
self.surface.configure(&self.device, &self.surface_config);
// Invalidate intermediate textures - they will be lazily recreated
// in draw() after we confirm the surface is healthy. This avoids
@ -928,9 +924,7 @@ impl WgpuRenderer {
if new_alpha_mode != self.surface_config.alpha_mode {
self.surface_config.alpha_mode = new_alpha_mode;
if self.surface_configured {
self.surface.configure(&self.device, &self.surface_config);
}
self.surface.configure(&self.device, &self.surface_config);
self.pipelines = Self::create_pipelines(
&self.device,
&self.bind_group_layouts,
@ -991,7 +985,7 @@ impl WgpuRenderer {
let frame = match self.surface.get_current_texture() {
Ok(frame) => frame,
Err(wgpu::SurfaceError::Lost | wgpu::SurfaceError::Outdated) => {
self.surface_configured = false;
self.surface.configure(&self.device, &self.surface_config);
return;
}
Err(e) => {