Skip to content

Commit 5209165

Browse files
committed
difftest runner: update wgpu 29 -> 30
1 parent 6d3b07d commit 5209165

4 files changed

Lines changed: 117 additions & 69 deletions

File tree

tests/difftests/tests/Cargo.lock

Lines changed: 104 additions & 52 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/difftests/tests/lib/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spirv-builder.workspace = true
2424
difftest-types.workspace = true
2525
serde = { version = "1.0", features = ["derive"] }
2626
serde_json = "1.0"
27-
wgpu = { version = "29.0.1", default-features = false, features = ["std", "parking_lot", "spirv", "wgsl", "vulkan", "vulkan-portability", "metal"] }
27+
wgpu = { version = "30.0.0", default-features = false, features = ["std", "parking_lot", "spirv", "wgsl", "vulkan", "vulkan-portability", "metal"] }
2828
ash = { version = "0.38" }
2929
tempfile = "3.5"
3030
futures = "0.3.31"

tests/difftests/tests/lib/src/scaffold/compute/wgpu_runner.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,9 @@ where
5858

5959
pub fn run(&self) -> anyhow::Result<Vec<Option<Vec<u8>>>> {
6060
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor::new_without_display_handle());
61-
let adapter = block_on(instance.request_adapter(&wgpu::RequestAdapterOptions {
62-
power_preference: wgpu::PowerPreference::HighPerformance,
63-
compatible_surface: None,
64-
force_fallback_adapter: false,
65-
}))
61+
let adapter = block_on(wgpu::util::initialize_adapter_from_env_or_default(
62+
&instance, None,
63+
))
6664
.context("Failed to find a suitable GPU adapter")?;
6765
let (device, queue) = block_on(adapter.request_device(&wgpu::DeviceDescriptor {
6866
label: Some("wgpu Device"),
@@ -218,7 +216,7 @@ where
218216
// copy data from buffers into Vecs
219217
let results = download_buffers
220218
.into_iter()
221-
.map(|buffer| buffer.map(|buffer| buffer.get_mapped_range(..).to_vec()))
219+
.map(|buffer| buffer.map(|buffer| buffer.get_mapped_range(..).unwrap().to_vec()))
222220
.collect::<Vec<_>>();
223221
Ok(results)
224222
}

0 commit comments

Comments
 (0)