From 61eda14256b1649e42eaf161b76ba1be7ee54c2b Mon Sep 17 00:00:00 2001 From: Erich Gubler Date: Thu, 6 Mar 2025 21:06:03 -0500 Subject: [PATCH] fix(android,vulkan): forcibly convert to `u64` in `*devid` checks --- wgpu-hal/src/vulkan/drm.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/wgpu-hal/src/vulkan/drm.rs b/wgpu-hal/src/vulkan/drm.rs index 0a37d86996..fdbda04618 100644 --- a/wgpu-hal/src/vulkan/drm.rs +++ b/wgpu-hal/src/vulkan/drm.rs @@ -73,7 +73,13 @@ impl super::Instance { let render_devid = libc::makedev(drm_props.render_major as _, drm_props.render_minor as _); - if [primary_devid, render_devid].contains(&drm_stat.st_rdev) { + // Various platforms use different widths between `dev_t` and `c_int`, so just + // force-convert to `u64` to keep things portable. + #[allow(clippy::useless_conversion)] + if [primary_devid, render_devid] + .map(u64::from) + .contains(&drm_stat.st_rdev) + { physical_device = Some(device) } }