mirror of
https://github.com/slint-ui/slint.git
synced 2025-10-22 16:22:17 +00:00
bevy example: Upgrade to a newer Bevy snapshot
This commit is contained in:
parent
e4ba013b4d
commit
a9f728bc11
2 changed files with 14 additions and 31 deletions
|
@ -21,8 +21,8 @@ path = "main.rs"
|
||||||
[dependencies]
|
[dependencies]
|
||||||
slint = { path = "../../api/rs/slint", features = ["unstable-wgpu-26", "renderer-skia"] }
|
slint = { path = "../../api/rs/slint", features = ["unstable-wgpu-26", "renderer-skia"] }
|
||||||
spin_on = { version = "0.1" }
|
spin_on = { version = "0.1" }
|
||||||
bevy = { git = "https://github.com/bevyengine/bevy.git", rev = "7fa4f740db158a4cda5fce96447ba7887f7f2884", 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", "reflect_auto_register", "debug"] }
|
bevy = { git = "https://github.com/bevyengine/bevy.git", rev = "cbf989c9dab5ce8152ab9407e0d4cb42b0138003", 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", "reflect_auto_register", "debug"] }
|
||||||
bevy_image = { git = "https://github.com/bevyengine/bevy.git", rev = "7fa4f740db158a4cda5fce96447ba7887f7f2884", version = "0.17.0-dev", features = ["zstd_rust"] }
|
bevy_image = { git = "https://github.com/bevyengine/bevy.git", rev = "cbf989c9dab5ce8152ab9407e0d4cb42b0138003", version = "0.17.0-dev", features = ["zstd_rust"] }
|
||||||
smol = { version = "2.0.0" }
|
smol = { version = "2.0.0" }
|
||||||
async-compat = { version = "0.2.4" }
|
async-compat = { version = "0.2.4" }
|
||||||
reqwest = { version = "0.12", features = ["stream"] }
|
reqwest = { version = "0.12", features = ["stream"] }
|
||||||
|
|
|
@ -7,8 +7,6 @@
|
||||||
//! bevy [`App`] in a thread separate from the main thread and supply textures of the rendered
|
//! bevy [`App`] in a thread separate from the main thread and supply textures of the rendered
|
||||||
//! scenes via channels.
|
//! scenes via channels.
|
||||||
|
|
||||||
use std::sync::Arc;
|
|
||||||
|
|
||||||
use slint::wgpu_26::wgpu;
|
use slint::wgpu_26::wgpu;
|
||||||
|
|
||||||
use bevy::{
|
use bevy::{
|
||||||
|
@ -50,36 +48,23 @@ pub async fn run_bevy_app_with_slint(
|
||||||
slint::PlatformError,
|
slint::PlatformError,
|
||||||
> {
|
> {
|
||||||
let backends = wgpu::Backends::from_env().unwrap_or_default();
|
let backends = wgpu::Backends::from_env().unwrap_or_default();
|
||||||
let dx12_shader_compiler = wgpu::Dx12Compiler::from_env().unwrap_or_default();
|
|
||||||
let gles_minor_version = wgpu::Gles3MinorVersion::from_env().unwrap_or_default();
|
|
||||||
|
|
||||||
let instance = wgpu::util::new_instance_with_webgpu_detection(&wgpu::InstanceDescriptor {
|
let bevy::render::settings::RenderResources(
|
||||||
|
render_device,
|
||||||
|
render_queue,
|
||||||
|
adapter_info,
|
||||||
|
adapter,
|
||||||
|
instance,
|
||||||
|
) = bevy::render::renderer::initialize_renderer(
|
||||||
backends,
|
backends,
|
||||||
flags: wgpu::InstanceFlags::from_build_config().with_env(),
|
|
||||||
backend_options: wgpu::BackendOptions {
|
|
||||||
dx12: wgpu::Dx12BackendOptions { shader_compiler: dx12_shader_compiler },
|
|
||||||
gl: wgpu::GlBackendOptions {
|
|
||||||
gles_minor_version,
|
|
||||||
fence_behavior: wgpu::GlFenceBehavior::default(),
|
|
||||||
},
|
|
||||||
noop: wgpu::NoopBackendOptions::default(),
|
|
||||||
},
|
|
||||||
memory_budget_thresholds: wgpu::MemoryBudgetThresholds::default(),
|
|
||||||
})
|
|
||||||
.await;
|
|
||||||
|
|
||||||
let (render_device, render_queue, adapter_info, adapter) =
|
|
||||||
bevy::render::renderer::initialize_renderer(
|
|
||||||
&instance,
|
|
||||||
&bevy::render::settings::WgpuSettings::default(),
|
|
||||||
&wgpu::RequestAdapterOptions::default(),
|
|
||||||
None,
|
None,
|
||||||
|
&bevy::render::settings::WgpuSettings::default(),
|
||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
let selector =
|
let selector =
|
||||||
slint::BackendSelector::new().require_wgpu_26(slint::wgpu_26::WGPUConfiguration::Manual {
|
slint::BackendSelector::new().require_wgpu_26(slint::wgpu_26::WGPUConfiguration::Manual {
|
||||||
instance: instance.clone(),
|
instance: (**instance.0).clone(),
|
||||||
adapter: (**adapter.0).clone(),
|
adapter: (**adapter.0).clone(),
|
||||||
device: render_device.wgpu_device().clone(),
|
device: render_device.wgpu_device().clone(),
|
||||||
queue: (**render_queue.0).clone(),
|
queue: (**render_queue.0).clone(),
|
||||||
|
@ -190,9 +175,7 @@ pub async fn run_bevy_app_with_slint(
|
||||||
render_queue,
|
render_queue,
|
||||||
adapter_info,
|
adapter_info,
|
||||||
adapter,
|
adapter,
|
||||||
bevy::render::renderer::RenderInstance(Arc::new(
|
instance,
|
||||||
bevy::render::WgpuWrapper::new(instance),
|
|
||||||
)),
|
|
||||||
),
|
),
|
||||||
..default()
|
..default()
|
||||||
}), //.disable::<bevy::winit::WinitPlugin>(),
|
}), //.disable::<bevy::winit::WinitPlugin>(),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue