Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
gpui_wgpu: Fix WebGL surface reconfiguration panics (#66190)
Ben Kunkle24a2823456f1
diff --git a/Cargo.lock b/Cargo.lockindex 70ffd0928a8..0be2cb5ce23 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -11096,7 +11096,7 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"[[package]]name = "naga"version = "30.0.0"-source = "git+https://github.com/gfx-rs/wgpu?rev=3b3506ea31154edc04de64debda0e780cba2639c#3b3506ea31154edc04de64debda0e780cba2639c"+source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007"dependencies = ["arrayvec","bit-set 0.11.1",@@ -11121,7 +11121,7 @@ dependencies = [[[package]]name = "naga-types"version = "30.0.0"-source = "git+https://github.com/gfx-rs/wgpu?rev=3b3506ea31154edc04de64debda0e780cba2639c#3b3506ea31154edc04de64debda0e780cba2639c"+source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007"dependencies = ["hashbrown 0.17.1","indexmap 2.14.0",@@ -20477,7 +20477,7 @@ checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3"[[package]]name = "wgpu"version = "30.0.0"-source = "git+https://github.com/gfx-rs/wgpu?rev=3b3506ea31154edc04de64debda0e780cba2639c#3b3506ea31154edc04de64debda0e780cba2639c"+source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007"dependencies = ["arrayvec","bitflags 2.13.1",@@ -20505,7 +20505,7 @@ dependencies = [[[package]]name = "wgpu-core"version = "30.0.0"-source = "git+https://github.com/gfx-rs/wgpu?rev=3b3506ea31154edc04de64debda0e780cba2639c#3b3506ea31154edc04de64debda0e780cba2639c"+source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007"dependencies = ["arrayvec","bit-set 0.11.1",@@ -20540,7 +20540,7 @@ dependencies = [[[package]]name = "wgpu-core-deps-apple"version = "30.0.0"-source = "git+https://github.com/gfx-rs/wgpu?rev=3b3506ea31154edc04de64debda0e780cba2639c#3b3506ea31154edc04de64debda0e780cba2639c"+source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007"dependencies = ["wgpu-hal",]@@ -20548,7 +20548,7 @@ dependencies = [[[package]]name = "wgpu-core-deps-emscripten"version = "30.0.0"-source = "git+https://github.com/gfx-rs/wgpu?rev=3b3506ea31154edc04de64debda0e780cba2639c#3b3506ea31154edc04de64debda0e780cba2639c"+source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007"dependencies = ["wgpu-hal",]@@ -20556,7 +20556,7 @@ dependencies = [[[package]]name = "wgpu-core-deps-linux-android-bsd"version = "30.0.0"-source = "git+https://github.com/gfx-rs/wgpu?rev=3b3506ea31154edc04de64debda0e780cba2639c#3b3506ea31154edc04de64debda0e780cba2639c"+source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007"dependencies = ["wgpu-hal",]@@ -20564,7 +20564,7 @@ dependencies = [[[package]]name = "wgpu-core-deps-wasm"version = "30.0.0"-source = "git+https://github.com/gfx-rs/wgpu?rev=3b3506ea31154edc04de64debda0e780cba2639c#3b3506ea31154edc04de64debda0e780cba2639c"+source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007"dependencies = ["wgpu-hal",]@@ -20572,7 +20572,7 @@ dependencies = [[[package]]name = "wgpu-core-deps-windows"version = "30.0.0"-source = "git+https://github.com/gfx-rs/wgpu?rev=3b3506ea31154edc04de64debda0e780cba2639c#3b3506ea31154edc04de64debda0e780cba2639c"+source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007"dependencies = ["wgpu-hal",]@@ -20580,7 +20580,7 @@ dependencies = [[[package]]name = "wgpu-hal"version = "30.0.0"-source = "git+https://github.com/gfx-rs/wgpu?rev=3b3506ea31154edc04de64debda0e780cba2639c#3b3506ea31154edc04de64debda0e780cba2639c"+source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007"dependencies = ["android_system_properties","arrayvec",@@ -20632,7 +20632,7 @@ dependencies = [[[package]]name = "wgpu-naga-bridge"version = "30.0.0"-source = "git+https://github.com/gfx-rs/wgpu?rev=3b3506ea31154edc04de64debda0e780cba2639c#3b3506ea31154edc04de64debda0e780cba2639c"+source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007"dependencies = ["naga","wgpu-types",@@ -20641,7 +20641,7 @@ dependencies = [[[package]]name = "wgpu-sync"version = "30.0.0"-source = "git+https://github.com/gfx-rs/wgpu?rev=3b3506ea31154edc04de64debda0e780cba2639c#3b3506ea31154edc04de64debda0e780cba2639c"+source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007"dependencies = ["cfg-if","lock_api",@@ -20654,7 +20654,7 @@ dependencies = [[[package]]name = "wgpu-types"version = "30.0.0"-source = "git+https://github.com/gfx-rs/wgpu?rev=3b3506ea31154edc04de64debda0e780cba2639c#3b3506ea31154edc04de64debda0e780cba2639c"+source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007"dependencies = ["bitflags 2.13.1","bytemuck",diff --git a/Cargo.toml b/Cargo.tomlindex 298fc8a809c..67db639795d 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -999,8 +999,8 @@ web-sys = "0.3"web-time = "1.1.0"webpki-roots = "1.0.10"webrtc-sys = "0.3.23"-# 30.0.1 lacks the Vulkan surface-drop panic fix: https://github.com/gfx-rs/wgpu/pull/10230.-wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "3b3506ea31154edc04de64debda0e780cba2639c", default-features = false }+# 30.0.1 lacks the Vulkan surface-drop fix (wgpu#10230) and WebGL resize fix (wgpu#10348).+wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "cddb2f5d80dc0009b2ef6767635140cacf90a007", default-features = false }which = "8"windows-core = "0.62"windows-registry = "0.6.0"diff --git a/crates/gpui_wgpu/Cargo.toml b/crates/gpui_wgpu/Cargo.tomlindex 3ce9dcecc4a..600d0083d86 100644--- a/crates/gpui_wgpu/Cargo.toml+++ b/crates/gpui_wgpu/Cargo.toml@@ -56,7 +56,7 @@ criterion.workspace = truegpui = { workspace = true, features = ["bench-support"] }image.workspace = true# Validate shaders with the same Naga revision that wgpu uses at runtime.-naga = { git = "https://github.com/gfx-rs/wgpu", rev = "3b3506ea31154edc04de64debda0e780cba2639c", features = ["wgsl-in"] }+naga = { git = "https://github.com/gfx-rs/wgpu", rev = "cddb2f5d80dc0009b2ef6767635140cacf90a007", features = ["wgsl-in"] }[[bench]]name = "layout_line"