From abb124672e70fdd53d9d1452e151f1776e994df2 Mon Sep 17 00:00:00 2001 From: boralg Date: Fri, 14 Feb 2025 00:35:44 +0200 Subject: [PATCH] chore: update deps --- sursface/Cargo.toml | 24 ++++++++++++------------ sursface/src/display/mod.rs | 3 ++- sursface/src/std/mod.rs | 9 +++++---- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/sursface/Cargo.toml b/sursface/Cargo.toml index ebdb390..78797fd 100644 --- a/sursface/Cargo.toml +++ b/sursface/Cargo.toml @@ -10,20 +10,20 @@ path = "src/lib.rs" [dependencies] console_error_panic_hook = "0.1.7" -pollster = "0.3.0" -wasm-bindgen = "0.2.92" -web-sys = { version = "0.3.69", features = ["Window", "Performance"] } -getrandom = { version = "0.2.15", features = ["js"] } -wgpu = { version = "0.20.0", features = ["webgl"] } -winit = "0.30.0" -fern = "0.6.2" -wasm-bindgen-futures = "0.4.42" +pollster = "0.4.0" +wasm-bindgen = "0.2.100" +web-sys = { version = "0.3.77", features = ["Window", "Performance"] } +getrandom = { version = "0.3.1", features = ["wasm_js"] } +wgpu = { version = "24.0.1", features = ["webgl"] } +winit = "0.30.9" +fern = "0.7.1" +wasm-bindgen-futures = "0.4.50" web-time = "1.1.0" console_log = "1.0.0" -log = "0.4.21" +log = "0.4.25" cgmath = "0.18.0" -image = "0.25.1" -env_logger = "0.11.3" -bytemuck = "1.16.1" +image = "0.25.5" +env_logger = "0.11.6" +bytemuck = "1.21.0" lazy_static = "1.5.0" wasm-timer = "0.2.5" diff --git a/sursface/src/display/mod.rs b/sursface/src/display/mod.rs index 464734b..b764db6 100755 --- a/sursface/src/display/mod.rs +++ b/sursface/src/display/mod.rs @@ -41,7 +41,7 @@ impl<'a> Display<'a> { } pub fn from_window(window: Window) -> Self { - let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { + let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor { #[cfg(not(target_arch = "wasm32"))] backends: wgpu::Backends::PRIMARY, #[cfg(target_arch = "wasm32")] @@ -74,6 +74,7 @@ impl<'a> Display<'a> { } else { wgpu::Limits::default() }, + memory_hints: wgpu::MemoryHints::Performance, }, None, ) diff --git a/sursface/src/std/mod.rs b/sursface/src/std/mod.rs index 288e388..478ef80 100644 --- a/sursface/src/std/mod.rs +++ b/sursface/src/std/mod.rs @@ -64,13 +64,13 @@ pub fn create_render_pipeline<'a>( layout: Some(&pipeline_layout), vertex: wgpu::VertexState { module: &shader, - entry_point: "vs_main", + entry_point: Some("vs_main"), buffers, compilation_options: Default::default(), }, fragment: Some(wgpu::FragmentState { module: &shader, - entry_point: "fs_main", + entry_point: Some("fs_main"), targets: &[Some(display.config.format.into())], compilation_options: Default::default(), }), @@ -86,6 +86,7 @@ pub fn create_render_pipeline<'a>( depth_stencil: None, multisample: wgpu::MultisampleState::default(), multiview: None, + cache: None, }) } @@ -117,14 +118,14 @@ pub fn create_texture_layout_entry_from_image( }); queue.write_texture( - wgpu::ImageCopyTexture { + wgpu::TexelCopyTextureInfo { texture: &texture, mip_level: 0, origin: wgpu::Origin3d::ZERO, aspect: wgpu::TextureAspect::All, }, &rgba, - wgpu::ImageDataLayout { + wgpu::TexelCopyBufferLayout { offset: 0, bytes_per_row: Some(4 * dimensions.0), rows_per_image: Some(dimensions.1),