diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82520b8..4f427a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: - label: Stable rust_version: stable - label: MSRV - rust_version: 1.58.0 + rust_version: 1.74 - label: Stable (All Features) rust_version: stable flags: --features test-all-math-libraries @@ -79,4 +79,4 @@ jobs: profile: minimal - name: Run Validation Tests - run: cargo test --package crevice-tests --features wgpu-validation --no-fail-fast --verbose \ No newline at end of file + run: cargo test --package crevice-tests --features wgpu-validation --no-fail-fast --verbose diff --git a/Cargo.toml b/Cargo.toml index 3871671..fcbe2b3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,8 +31,8 @@ bytemuck = "1.12.3" mint = "0.5.9" cgmath = { version = "0.18.0", default-features = false, optional = true } -glam = { version = "^0.27", default-features = false, features = ["mint"], optional = true } -nalgebra = { version = "0.32.3", default-features = false, features = ["mint"], optional = true } +glam = { version = "^0.29", default-features = false, features = ["mint"], optional = true } +nalgebra = { version = "0.33", default-features = false, features = ["mint"], optional = true } [dev-dependencies] insta = "1.21.0" diff --git a/README.md b/README.md index 29ce200..a86110d 100644 --- a/README.md +++ b/README.md @@ -140,7 +140,7 @@ unmap_gpu_buffer(); ### Minimum Supported Rust Version (MSRV) -Crevice supports Rust 1.58.0 and newer due to use of new `const fn` features. +Crevice supports Rust 1.74.0 and newer. [glsl-layout]: https://github.com/rustgd/glsl-layout diff --git a/crevice-tests/Cargo.toml b/crevice-tests/Cargo.toml index 43e6cc1..36438f1 100644 --- a/crevice-tests/Cargo.toml +++ b/crevice-tests/Cargo.toml @@ -14,9 +14,9 @@ crevice-derive = { path = "../crevice-derive", features = ["debug-methods"] } anyhow = "1.0.44" bytemuck = "1.7.2" -memoffset = "0.6.4" +memoffset = "0.9" mint = "0.5.5" futures = { version = "0.3.17", features = ["executor"], optional = true } -naga = { version = "0.9.0", features = ["glsl-in", "wgsl-out"], optional = true } -wgpu = { version = "0.13.0", optional = true } +naga = { version = "22", features = ["glsl-in", "wgsl-out"], optional = true } +wgpu = { version = "22", optional = true } diff --git a/crevice-tests/src/gpu.rs b/crevice-tests/src/gpu.rs index 17ca062..61f0325 100644 --- a/crevice-tests/src/gpu.rs +++ b/crevice-tests/src/gpu.rs @@ -189,6 +189,8 @@ where layout: None, module: &cs_module, entry_point: "main", + cache: None, + compilation_options: Default::default(), }); let bind_group_layout = compute_pipeline.get_bind_group_layout(0); @@ -212,8 +214,7 @@ where .create_command_encoder(&wgpu::CommandEncoderDescriptor { label: None }); { - let mut cpass = - encoder.begin_compute_pass(&wgpu::ComputePassDescriptor { label: None }); + let mut cpass = encoder.begin_compute_pass(&wgpu::ComputePassDescriptor::default()); cpass.set_pipeline(&compute_pipeline); cpass.set_bind_group(0, &bind_group, &[]); cpass.dispatch_workgroups(1, 1, 1); @@ -243,7 +244,7 @@ where } fn setup() -> (wgpu::Device, wgpu::Queue) { - let instance = wgpu::Instance::new(wgpu::Backends::all()); + let instance = wgpu::Instance::new(wgpu::InstanceDescriptor::default()); let adapter = block_on(instance.request_adapter(&wgpu::RequestAdapterOptions::default())).unwrap(); @@ -252,8 +253,9 @@ fn setup() -> (wgpu::Device, wgpu::Queue) { block_on(adapter.request_device( &wgpu::DeviceDescriptor { label: None, - features: wgpu::Features::empty(), - limits: wgpu::Limits::downlevel_defaults(), + required_features: wgpu::Features::empty(), + required_limits: wgpu::Limits::downlevel_defaults(), + memory_hints: wgpu::MemoryHints::Performance, }, None, )) @@ -261,7 +263,7 @@ fn setup() -> (wgpu::Device, wgpu::Queue) { } fn compile(glsl_source: &str) -> anyhow::Result { - let mut parser = naga::front::glsl::Parser::default(); + let mut parser = naga::front::glsl::Frontend::default(); let module = parser .parse( diff --git a/src/lib.rs b/src/lib.rs index d860212..1fcc94c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -152,7 +152,7 @@ unmap_gpu_buffer(); ## Minimum Supported Rust Version (MSRV) -Crevice supports Rust 1.58.0 and newer due to use of new `const fn` features. +Crevice supports Rust 1.74. [glsl-layout]: https://github.com/rustgd/glsl-layout */