Skip to content

Commit

Permalink
Upgrade to winit 0.30.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@ArthurBrussee
ArthurBrussee committed Aug 7, 2024
1 parent 2dac4a4 commit c098aee
Show file tree
Hide file tree
Showing 6 changed files with 103 additions and 30 deletions.
116 changes: 95 additions & 21 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -644,13 +644,39 @@ dependencies = [
"thiserror",
]

[[package]]
name = "calloop"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
dependencies = [
"bitflags 2.6.0",
"log",
"polling 3.3.0",
"rustix 0.38.21",
"slab",
"thiserror",
]

[[package]]
name = "calloop-wayland-source"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02"
dependencies = [
"calloop",
"calloop 0.12.4",
"rustix 0.38.21",
"wayland-backend",
"wayland-client",
]

[[package]]
name = "calloop-wayland-source"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
dependencies = [
"calloop 0.13.0",
"rustix 0.38.21",
"wayland-backend",
"wayland-client",
Expand Down Expand Up @@ -1150,8 +1176,7 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
[[package]]
name = "dpi"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
source = "git+https://github.com/rust-windowing/winit.git?branch=kchibisov/release-0305#95bdaa8bdb8edad3eea5fa11d3d9b0b7f84258ee"

[[package]]
name = "ecolor"
Expand Down Expand Up @@ -3490,14 +3515,14 @@ dependencies = [

[[package]]
name = "sctk-adwaita"
version = "0.9.1"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7555fcb4f753d095d734fdefebb0ad8c98478a21db500492d87c55913d3b0086"
checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec"
dependencies = [
"ab_glyph",
"log",
"memmap2",
"smithay-client-toolkit",
"smithay-client-toolkit 0.19.2",
"tiny-skia",
]

Expand Down Expand Up @@ -3632,8 +3657,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a"
dependencies = [
"bitflags 2.6.0",
"calloop",
"calloop-wayland-source",
"calloop 0.12.4",
"calloop-wayland-source 0.2.0",
"cursor-icon",
"libc",
"log",
Expand All @@ -3644,8 +3669,33 @@ dependencies = [
"wayland-client",
"wayland-csd-frame",
"wayland-cursor",
"wayland-protocols",
"wayland-protocols-wlr",
"wayland-protocols 0.31.2",
"wayland-protocols-wlr 0.2.0",
"wayland-scanner",
"xkeysym",
]

[[package]]
name = "smithay-client-toolkit"
version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
dependencies = [
"bitflags 2.6.0",
"calloop 0.13.0",
"calloop-wayland-source 0.3.0",
"cursor-icon",
"libc",
"log",
"memmap2",
"rustix 0.38.21",
"thiserror",
"wayland-backend",
"wayland-client",
"wayland-csd-frame",
"wayland-cursor",
"wayland-protocols 0.32.3",
"wayland-protocols-wlr 0.3.3",
"wayland-scanner",
"xkeysym",
]
Expand All @@ -3657,7 +3707,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bb62b280ce5a5cba847669933a0948d00904cf83845c944eae96a4738cea1a6"
dependencies = [
"libc",
"smithay-client-toolkit",
"smithay-client-toolkit 0.18.1",
"wayland-backend",
]

Expand Down Expand Up @@ -4332,16 +4382,28 @@ dependencies = [
"wayland-scanner",
]

[[package]]
name = "wayland-protocols"
version = "0.32.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa"
dependencies = [
"bitflags 2.6.0",
"wayland-backend",
"wayland-client",
"wayland-scanner",
]

[[package]]
name = "wayland-protocols-plasma"
version = "0.2.0"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479"
checksum = "f79f2d57c7fcc6ab4d602adba364bf59a5c24de57bd194486bf9b8360e06bfc4"
dependencies = [
"bitflags 2.6.0",
"wayland-backend",
"wayland-client",
"wayland-protocols",
"wayland-protocols 0.32.3",
"wayland-scanner",
]

Expand All @@ -4354,7 +4416,20 @@ dependencies = [
"bitflags 2.6.0",
"wayland-backend",
"wayland-client",
"wayland-protocols",
"wayland-protocols 0.31.2",
"wayland-scanner",
]

[[package]]
name = "wayland-protocols-wlr"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953"
dependencies = [
"bitflags 2.6.0",
"wayland-backend",
"wayland-client",
"wayland-protocols 0.32.3",
"wayland-scanner",
]

Expand Down Expand Up @@ -4849,17 +4924,16 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"

[[package]]
name = "winit"
version = "0.30.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1dc930d6cfbf53c4fe0b95689cdc2e17b8658c3f4214b9953298ccb5a1a15c90"
version = "0.30.5"
source = "git+https://github.com/rust-windowing/winit.git?branch=kchibisov/release-0305#95bdaa8bdb8edad3eea5fa11d3d9b0b7f84258ee"
dependencies = [
"ahash",
"android-activity",
"atomic-waker",
"bitflags 2.6.0",
"block2",
"bytemuck",
"calloop",
"calloop 0.13.0",
"cfg_aliases 0.2.1",
"concurrent-queue",
"core-foundation",
Expand All @@ -4881,15 +4955,15 @@ dependencies = [
"redox_syscall 0.4.1",
"rustix 0.38.21",
"sctk-adwaita",
"smithay-client-toolkit",
"smithay-client-toolkit 0.19.2",
"smol_str",
"tracing",
"unicode-segmentation",
"wasm-bindgen",
"wasm-bindgen-futures",
"wayland-backend",
"wayland-client",
"wayland-protocols",
"wayland-protocols 0.32.3",
"wayland-protocols-plasma",
"web-sys",
"web-time",
Expand Down
5 changes: 3 additions & 2 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,10 @@ wgpu = { version = "22.0.0", default-features = false, features = [
# Make the renderer `Sync` even on wasm32, because it makes the code simpler:
"fragile-send-sync-non-atomic-wasm",
] }
winit = { version = "0.30.5", default-features = false }

# Currently can't upgrade above 0.30.2 due to https://github.com/rust-windowing/winit/issues/3837
winit = { version = "=0.30.2", default-features = false }
[patch.crates-io]
winit = { git = "https://github.com/rust-windowing/winit.git", branch = "kchibisov/release-0305" }

[workspace.lints.rust]
unsafe_code = "deny"
Expand Down
2 changes: 1 addition & 1 deletion crates/eframe/src/native/glow_integration.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1114,7 +1114,7 @@ impl GlutinWindowContext {
viewport_id,
event_loop,
Some(window.scale_factor() as f32),
window.theme(),
event_loop.system_theme(),
self.max_texture_side,
)
});
Expand Down
4 changes: 2 additions & 2 deletions crates/eframe/src/native/wgpu_integration.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ impl WgpuWinitApp {
ViewportId::ROOT,
event_loop,
Some(window.scale_factor() as f32),
window.theme(),
event_loop.system_theme(),
painter.max_texture_side(),
);

Expand Down Expand Up @@ -869,7 +869,7 @@ impl Viewport {
viewport_id,
event_loop,
Some(window.scale_factor() as f32),
window.theme(),
event_loop.system_theme(),
painter.max_texture_side(),
));

Expand Down
3 changes: 1 addition & 2 deletions crates/egui_glow/examples/pure_glow.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,7 @@ impl winit::application::ApplicationHandler<UserEvent> for GlowApp {
let gl = std::sync::Arc::new(gl);
gl_window.window().set_visible(true);

let egui_glow =
egui_glow::EguiGlow::new(event_loop, &gl_window.window, gl.clone(), None, None, true);
let egui_glow = egui_glow::EguiGlow::new(event_loop, gl.clone(), None, None, true);

let event_loop_proxy = egui::mutex::Mutex::new(self.proxy.clone());
egui_glow
Expand Down
3 changes: 1 addition & 2 deletions crates/egui_glow/src/winit.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ impl EguiGlow {
/// For automatic shader version detection set `shader_version` to `None`.
pub fn new(
event_loop: &winit::event_loop::ActiveEventLoop,
window: &winit::window::Window,
gl: std::sync::Arc<glow::Context>,
shader_version: Option<ShaderVersion>,
native_pixels_per_point: Option<f32>,
Expand All @@ -43,7 +42,7 @@ impl EguiGlow {
ViewportId::ROOT,
event_loop,
native_pixels_per_point,
window.theme(),
event_loop.system_theme(),
Some(painter.max_texture_side()),
);

Expand Down

0 comments on commit c098aee

Please sign in to comment.