Skip to content

Commit 6d39a50

Browse files
committed
[fix] warnings with tests.
1 parent d434c3e commit 6d39a50

File tree

4 files changed

+67
-21
lines changed

4 files changed

+67
-21
lines changed

crates/lambda-rs-platform/tests/wgpu_bind_layout_and_group_texture_sampler.rs

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,28 @@
22

33
// Integration tests for `lambda-rs-platform::wgpu::bind` with textures/samplers
44

5-
fn create_test_device() -> lambda_platform::wgpu::gpu::Gpu {
5+
fn create_test_device() -> Option<lambda_platform::wgpu::gpu::Gpu> {
66
let instance = lambda_platform::wgpu::instance::InstanceBuilder::new()
77
.with_label("platform-bind-itest")
88
.build();
9-
return lambda_platform::wgpu::gpu::GpuBuilder::new()
9+
let result = lambda_platform::wgpu::gpu::GpuBuilder::new()
1010
.with_label("platform-bind-itest-device")
11-
.build(&instance, None)
12-
.expect("create offscreen device");
11+
.build(&instance, None);
12+
13+
match result {
14+
Ok(gpu) => return Some(gpu),
15+
Err(lambda_platform::wgpu::gpu::GpuBuildError::AdapterUnavailable) => {
16+
return None;
17+
}
18+
Err(err) => panic!("create offscreen device: {:?}", err),
19+
}
1320
}
1421

1522
#[test]
1623
fn wgpu_bind_layout_and_group_texture_sampler() {
17-
let gpu = create_test_device();
24+
let Some(gpu) = create_test_device() else {
25+
return;
26+
};
1827

1928
let (w, h) = (4u32, 4u32);
2029
let pixels = vec![255u8; (w * h * 4) as usize];

crates/lambda-rs-platform/tests/wgpu_bind_layout_dim3_and_group.rs

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,28 @@
22

33
// Bind group layout and group test for 3D texture dimension
44

5-
#[test]
6-
fn wgpu_bind_layout_dim3_and_group() {
5+
fn create_test_device() -> Option<lambda_platform::wgpu::gpu::Gpu> {
76
let instance = lambda_platform::wgpu::instance::InstanceBuilder::new()
87
.with_label("p-itest-3d-bind")
98
.build();
10-
let gpu = lambda_platform::wgpu::gpu::GpuBuilder::new()
9+
let result = lambda_platform::wgpu::gpu::GpuBuilder::new()
1110
.with_label("p-itest-3d-bind-device")
12-
.build(&instance, None)
13-
.expect("create device");
11+
.build(&instance, None);
12+
13+
match result {
14+
Ok(gpu) => return Some(gpu),
15+
Err(lambda_platform::wgpu::gpu::GpuBuildError::AdapterUnavailable) => {
16+
return None;
17+
}
18+
Err(err) => panic!("create device: {:?}", err),
19+
}
20+
}
21+
22+
#[test]
23+
fn wgpu_bind_layout_dim3_and_group() {
24+
let Some(gpu) = create_test_device() else {
25+
return;
26+
};
1427

1528
let (w, h, d) = (2u32, 2u32, 2u32);
1629
let pixels = vec![255u8; (w * h * d * 4) as usize];

crates/lambda-rs-platform/tests/wgpu_texture3d_build_and_upload.rs

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,28 @@
22

33
// Integration tests for 3D textures in the platform layer
44

5-
#[test]
6-
fn wgpu_texture3d_build_and_upload() {
5+
fn create_test_device() -> Option<lambda_platform::wgpu::gpu::Gpu> {
76
let instance = lambda_platform::wgpu::instance::InstanceBuilder::new()
87
.with_label("p-itest-3d")
98
.build();
10-
let gpu = lambda_platform::wgpu::gpu::GpuBuilder::new()
9+
let result = lambda_platform::wgpu::gpu::GpuBuilder::new()
1110
.with_label("p-itest-3d-device")
12-
.build(&instance, None)
13-
.expect("create device");
11+
.build(&instance, None);
12+
13+
match result {
14+
Ok(gpu) => return Some(gpu),
15+
Err(lambda_platform::wgpu::gpu::GpuBuildError::AdapterUnavailable) => {
16+
return None;
17+
}
18+
Err(err) => panic!("create device: {:?}", err),
19+
}
20+
}
21+
22+
#[test]
23+
fn wgpu_texture3d_build_and_upload() {
24+
let Some(gpu) = create_test_device() else {
25+
return;
26+
};
1427

1528
let (w, h, d) = (4u32, 4u32, 3u32);
1629
let pixels = vec![180u8; (w * h * d * 4) as usize];

crates/lambda-rs-platform/tests/wgpu_texture_build_and_upload.rs

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,28 @@
22

33
// Integration tests for `lambda-rs-platform::wgpu::texture`
44

5-
fn create_test_device() -> lambda_platform::wgpu::gpu::Gpu {
5+
fn create_test_device() -> Option<lambda_platform::wgpu::gpu::Gpu> {
66
let instance = lambda_platform::wgpu::instance::InstanceBuilder::new()
77
.with_label("platform-itest")
88
.build();
9-
return lambda_platform::wgpu::gpu::GpuBuilder::new()
9+
let result = lambda_platform::wgpu::gpu::GpuBuilder::new()
1010
.with_label("platform-itest-device")
11-
.build(&instance, None)
12-
.expect("create offscreen device");
11+
.build(&instance, None);
12+
13+
match result {
14+
Ok(gpu) => return Some(gpu),
15+
Err(lambda_platform::wgpu::gpu::GpuBuildError::AdapterUnavailable) => {
16+
return None;
17+
}
18+
Err(err) => panic!("create offscreen device: {:?}", err),
19+
}
1320
}
1421

1522
#[test]
1623
fn wgpu_texture_build_and_upload_succeeds() {
17-
let gpu = create_test_device();
24+
let Some(gpu) = create_test_device() else {
25+
return;
26+
};
1827

1928
let (w, h) = (8u32, 8u32);
2029
let mut pixels = vec![0u8; (w * h * 4) as usize];
@@ -41,7 +50,9 @@ fn wgpu_texture_build_and_upload_succeeds() {
4150

4251
#[test]
4352
fn wgpu_texture_upload_with_padding_bytes_per_row() {
44-
let gpu = create_test_device();
53+
let Some(gpu) = create_test_device() else {
54+
return;
55+
};
4556

4657
let (w, h) = (13u32, 7u32);
4758
let pixels = vec![128u8; (w * h * 4) as usize];

0 commit comments

Comments
 (0)