wgpu: Switch to WGPU 26

Author: tronical

.github/workflows/build_docs.yaml

@@ -35,7 +35,7 @@ jobs:
             - name: Set up crate rustdoc link
               run: |
                   rgb_version=`grep 'rgb = '  internal/core/Cargo.toml | sed 's/^.*"\(.*\)"/\1/'`
-                  echo "RUSTDOCFLAGS=$RUSTDOCFLAGS --extern-html-root-url rgb=https://docs.rs/rgb/$rgb_version/ --extern-html-root-url android_activity=https://docs.rs/android-activity/0.5/ --extern-html-root-url raw_window_handle=https://docs.rs/raw_window_handle/0.6 --extern-html-root-url winit=https://docs.rs/winit/0.30 --extern-html-root-url wgpu=https://docs.rs/wgpu/25" >> $GITHUB_ENV
+                  echo "RUSTDOCFLAGS=$RUSTDOCFLAGS --extern-html-root-url rgb=https://docs.rs/rgb/$rgb_version/ --extern-html-root-url android_activity=https://docs.rs/android-activity/0.5/ --extern-html-root-url raw_window_handle=https://docs.rs/raw_window_handle/0.6 --extern-html-root-url winit=https://docs.rs/winit/0.30 --extern-html-root-url wgpu=https://docs.rs/wgpu/26" >> $GITHUB_ENV
             - uses: actions/setup-node@v4
               with:
                 node-version: 20

CHANGELOG.md

@@ -10,7 +10,7 @@ All notable changes to this project are documented in this file.
  - winit: Fixed the maximize window not being disabled for fixed-size windows
  - winit: Added support for timer based frame throttling (#8826)
  - Fixed Windows native menu bar in fullscreen mode
- - Switched from WGPU24 to WGPU25
+ - Switched from WGPU24 to WGPU26
  - Qt: Fixed default-font-size not working with PopupWindow
  - LinuxKMS: Added support for overriding the default framebuffer interface selection
  - LinuxKMS: Added support for a wide range of framebuffer formats
@@ -42,8 +42,8 @@ All notable changes to this project are documented in this file.
 ### Rust
 
  - Minimum Supported Rust Version (MSRV) is 1.85
- - Upgraded WGPU dependency to version 25: The `unstable-wgpu-25` Cargo feature replaces the old `unstable-wgpu-24` feature,
-   and the `slint::wgpu_25` module replaces the `slint::wgpu_24` module. There were no further changes to the API.
+ - Upgraded WGPU dependency to version 26: The `unstable-wgpu-26` Cargo feature replaces the old `unstable-wgpu-24` feature,
+   and the `slint::wgpu_26` module replaces the `slint::wgpu_24` module. There were no further changes to the API.
  - Fixed compilation of generated code if the slint code declares a type named `core`
  - Support for live-reload with the `slint/live-reload` feature and `SLINT_LIVE_RELOAD` env variable
  - winit: Added API to await for the existence of the winit window

Cargo.toml

@@ -166,7 +166,7 @@ raw-window-handle-06 = { package = "raw-window-handle", version = "0.6", feature
 unicode-segmentation = { version = "1.12.0" }
 glow = { version = "0.16" }
 tikv-jemallocator = { version = "0.6" }
-wgpu-25 = { package = "wgpu", version = "25", default-features = false }
+wgpu-26 = { package = "wgpu", version = "26", default-features = false }
 
 [profile.release]
 lto = true

api/cpp/cbindgen.rs

@@ -243,7 +243,7 @@ fn default_config() -> cbindgen::Config {
         ("target_arch = wasm32".into(), "SLINT_TARGET_WASM".into()),
         ("target_os = android".into(), "__ANDROID__".into()),
         // Disable Rust WGPU specific API feature
-        ("feature = unstable-wgpu-25".into(), "SLINT_DISABLED_CODE".into()),
+        ("feature = unstable-wgpu-26".into(), "SLINT_DISABLED_CODE".into()),
     ]
     .iter()
     .cloned()

api/rs/slint/Cargo.toml

@@ -199,9 +199,9 @@ backend-android-activity-05 = [
 ## in your `Cargo.toml` when enabling this feature:
 ##
 ## ```toml
-## slint = { version = "~1.13", features = ["unstable-wgpu-25"] }
+## slint = { version = "~1.13", features = ["unstable-wgpu-26"] }
 ## ```
-unstable-wgpu-25 = ["i-slint-core/unstable-wgpu-25", "i-slint-backend-selector/unstable-wgpu-25", "dep:wgpu-25"]
+unstable-wgpu-26 = ["i-slint-core/unstable-wgpu-26", "i-slint-backend-selector/unstable-wgpu-26", "dep:wgpu-26"]
 
 ## APIs guarded with this feature are *NOT* subject to the usual Slint API stability guarantees, because winit releases new major
 ## versions more frequently than Slint. This feature as well as the APIs changed or removed in future minor releases of Slint, likely to be replaced
@@ -236,7 +236,7 @@ raw-window-handle-06 = { workspace = true, optional = true }
 
 unicode-segmentation = { workspace = true }
 
-wgpu-25 = { workspace = true, optional = true }
+wgpu-26 = { workspace = true, optional = true }
 
 i-slint-backend-winit = { workspace = true, optional = true }
 
@@ -271,7 +271,7 @@ features = [
   "renderer-software",
   "renderer-femtovg",
   "raw-window-handle-06",
-  "unstable-wgpu-25",
+  "unstable-wgpu-26",
   "unstable-winit-030",
 ]
 rustdoc-args = ["--generate-link-to-definition"]

api/rs/slint/lib.rs

@@ -446,22 +446,22 @@ mod compile_fail_tests;
 #[cfg(doc)]
 pub mod docs;
 
-#[cfg(feature = "unstable-wgpu-25")]
-pub mod wgpu_25 {
-    //! WGPU 25.x specific types and re-exports.
+#[cfg(feature = "unstable-wgpu-26")]
+pub mod wgpu_26 {
+    //! WGPU 26.x specific types and re-exports.
     //!
     //! *Note*: This module is behind a feature flag and may be removed or changed in future minor releases,
     //!         as new major WGPU releases become available.
     //!
     //! Use the types in this module in combination with other APIs to integrate external, WGPU-based rendering engines
     //! into a UI with Slint.
     //!
-    //! First, ensure that WGPU is used for rendering with Slint by using [`slint::BackendSelector::require_wgpu_25()`](i_slint_backend_selector::api::BackendSelector::require_wgpu_25()).
+    //! First, ensure that WGPU is used for rendering with Slint by using [`slint::BackendSelector::require_wgpu_26()`](i_slint_backend_selector::api::BackendSelector::require_wgpu_26()).
     //! This function accepts a pre-configured WGPU setup or configuration hints such as required features or memory limits.
     //!
     //! For rendering, it's crucial that you're using the same [`wgpu::Device`] and [`wgpu::Queue`] for allocating textures or submitting commands as Slint. Obtain the same queue
     //! by either using [`WGPUConfiguration::Manual`] to make Slint use an existing WGPU configuration, or use [`slint::Window::set_rendering_notifier()`](i_slint_core::api::Window::set_rendering_notifier())
-    //! to let Slint invoke a callback that provides access device, queue, etc. in [`slint::GraphicsAPI::WGPU25`](i_slint_core::api::GraphicsAPI::WGPU25).
+    //! to let Slint invoke a callback that provides access device, queue, etc. in [`slint::GraphicsAPI::WGPU26`](i_slint_core::api::GraphicsAPI::WGPU26).
     //!
     //! To integrate rendering content into a scene shared with a Slint UI, use either [`slint::Window::set_rendering_notifier()`](i_slint_core::api::Window::set_rendering_notifier()) to render an underlay
     //! or overlay, or integrate externally produced [`wgpu::Texture`]s using [`slint::Image::try_from<wgpu::Texture>()`](i_slint_core::graphics::Image::try_from).
@@ -470,13 +470,13 @@ pub mod wgpu_25 {
     //!
     //! `Cargo.toml`:
     //! ```toml
-    //! slint = { version = "~1.13", features = ["unstable-wgpu-25"] }
+    //! slint = { version = "~1.13", features = ["unstable-wgpu-26"] }
     //! ```
     //!
     //! `main.rs`:
     //!```rust,no_run
     //!
-    //! use slint::wgpu_25::wgpu;
+    //! use slint::wgpu_26::wgpu;
     //! use wgpu::util::DeviceExt;
     //!
     //!slint::slint!{
@@ -495,14 +495,14 @@ pub mod wgpu_25 {
     //!}
     //!fn main() -> Result<(), Box<dyn std::error::Error>> {
     //!    slint::BackendSelector::new()
-    //!        .require_wgpu_25(slint::wgpu_25::WGPUConfiguration::default())
+    //!        .require_wgpu_26(slint::wgpu_26::WGPUConfiguration::default())
     //!        .select()?;
     //!    let app = HelloWorld::new()?;
     //!
     //!    let app_weak = app.as_weak();
     //!
     //!    app.window().set_rendering_notifier(move |state, graphics_api| {
-    //!        let (Some(app), slint::RenderingState::RenderingSetup, slint::GraphicsAPI::WGPU25{ device, queue, ..}) = (app_weak.upgrade(), state, graphics_api) else {
+    //!        let (Some(app), slint::RenderingState::RenderingSetup, slint::GraphicsAPI::WGPU26{ device, queue, ..}) = (app_weak.upgrade(), state, graphics_api) else {
     //!            return;
     //!        };
     //!
@@ -540,7 +540,7 @@ pub mod wgpu_25 {
     //!}
     //!```
     //!
-    pub use i_slint_core::graphics::wgpu_25::api::*;
+    pub use i_slint_core::graphics::wgpu_26::api::*;
 }
 
 #[cfg(feature = "unstable-winit-030")]

examples/bevy/Cargo.toml

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 # This example is not part of the Slint Cargo workspace because of the git dependency to bevy. Once bevy
-# releases a version to crates.io that depends on wgpu 25, we can re-insert the example into the workspace.
+# releases a version to crates.io that depends on WGPU 26, we can re-insert the example into the workspace.
 [workspace]
 
 [package]
@@ -19,10 +19,10 @@ name = "bevy_example"
 path = "main.rs"
 
 [dependencies]
-slint = { path = "../../api/rs/slint", features = ["unstable-wgpu-25"] }
+slint = { path = "../../api/rs/slint", features = ["unstable-wgpu-26"] }
 spin_on = { version = "0.1" }
-bevy = { git = "https://github.com/bevyengine/bevy.git", rev = "96dcbc5f8c37753dd854b0902758d0e2030e0df9", version = "0.17.0-dev", default-features = false, features = ["bevy_core_pipeline", "bevy_pbr", "bevy_window", "bevy_scene", "bevy_gltf", "bevy_log", "jpeg", "png", "tonemapping_luts", "multi_threaded"] }
-bevy_utils = { git = "https://github.com/bevyengine/bevy.git", rev = "96dcbc5f8c37753dd854b0902758d0e2030e0df9", version = "0.17.0-dev", default-features = false, features = ["wgpu_wrapper"] }
+bevy = { git = "https://github.com/bevyengine/bevy.git", rev = "e11a9e1167764235819b1803f629b40f9ac5131c", version = "0.17.0-dev", default-features = false, features = ["bevy_core_pipeline", "bevy_pbr", "bevy_window", "bevy_scene", "bevy_gltf", "bevy_log", "jpeg", "png", "tonemapping_luts", "multi_threaded"] }
+bevy_image = { git = "https://github.com/bevyengine/bevy.git", rev = "e11a9e1167764235819b1803f629b40f9ac5131c", version = "0.17.0-dev", features = ["zstd_rust"] }
 smol = { version = "2.0.0" }
 async-compat = { version = "0.2.4" }
 reqwest = { version = "0.12", features = ["stream"] }

examples/bevy/main.rs

@@ -125,7 +125,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         let Some(app) = app2.upgrade() else { return };
         app.window().request_redraw();
         let Ok(new_texture) = new_texture_receiver.try_recv() else { return };
-        if let Some(old_texture) = app.get_texture().to_wgpu_25_texture() {
+        if let Some(old_texture) = app.get_texture().to_wgpu_26_texture() {
             let control_message_sender = control_message_sender.clone();
             slint::spawn_local(async move {
                 control_message_sender

examples/bevy/slint_bevy_adapter.rs

@@ -9,7 +9,7 @@
 
 use std::sync::Arc;
 
-use slint::wgpu_25::wgpu;
+use slint::wgpu_26::wgpu;
 
 use bevy::{
     prelude::*,
@@ -64,6 +64,7 @@ pub async fn run_bevy_app_with_slint(
             },
             noop: wgpu::NoopBackendOptions::default(),
         },
+        memory_budget_thresholds: wgpu::MemoryBudgetThresholds::default(),
     })
     .await;
 
@@ -72,11 +73,12 @@ pub async fn run_bevy_app_with_slint(
             &instance,
             &bevy::render::settings::WgpuSettings::default(),
             &wgpu::RequestAdapterOptions::default(),
+            None,
         )
         .await;
 
     let selector =
-        slint::BackendSelector::new().require_wgpu_25(slint::wgpu_25::WGPUConfiguration::Manual {
+        slint::BackendSelector::new().require_wgpu_26(slint::wgpu_26::WGPUConfiguration::Manual {
             instance: instance.clone(),
             adapter: (**adapter.0).clone(),
             device: render_device.wgpu_device().clone(),
@@ -154,12 +156,12 @@ pub async fn run_bevy_app_with_slint(
                     back_buffer.0 = Some(next_back_buffer.clone());
 
                     let mut manual_texture_views = world
-                        .get_resource_mut::<bevy::render::camera::ManualTextureViews>()
+                        .get_resource_mut::<bevy::render::texture::ManualTextureViews>()
                         .unwrap();
                     manual_texture_views.clear();
                     manual_texture_views.insert(
                         texture_view_handle,
-                        bevy::render::camera::ManualTextureView {
+                        bevy::render::texture::ManualTextureView {
                             texture_view: texture_view.into(),
                             size: (next_back_buffer.width(), next_back_buffer.height()).into(),
                             format: bevy::render::render_resource::TextureFormat::Rgba8UnormSrgb,
@@ -189,9 +191,9 @@ pub async fn run_bevy_app_with_slint(
                     render_queue,
                     adapter_info,
                     adapter,
-                    bevy::render::renderer::RenderInstance(Arc::new(bevy_utils::WgpuWrapper::new(
-                        instance,
-                    ))),
+                    bevy::render::renderer::RenderInstance(Arc::new(
+                        bevy::render::WgpuWrapper::new(instance),
+                    )),
                 ),
                 ..default()
             }), //.disable::<bevy::winit::WinitPlugin>(),

examples/wgpu_texture/Cargo.toml

@@ -15,7 +15,7 @@ path = "main.rs"
 name = "wgpu_texture"
 
 [dependencies]
-slint = { path = "../../api/rs/slint", features = ["unstable-wgpu-25"] }
+slint = { path = "../../api/rs/slint", features = ["unstable-wgpu-26"] }
 bytemuck = { workspace = true }
 
 [build-dependencies]