From fab3f76e63331a4a282b599000e84f6cf364616e Mon Sep 17 00:00:00 2001 From: marc0246 <40955683+marc0246@users.noreply.github.com> Date: Sun, 9 Feb 2025 20:33:42 +0100 Subject: [PATCH] `std::mem::{size_of[val],align_of[val]}` are in the prelude now; use 'em --- examples/dynamic-buffers/main.rs | 2 +- examples/ray-tracing-auto/scene.rs | 2 +- examples/ray-tracing/scene.rs | 2 +- .../src/command_buffer/commands/bind_push.rs | 4 ++-- .../src/command_buffer/commands/clear.rs | 4 ++-- .../commands/acceleration_structure.rs | 2 +- vulkano/src/command_buffer/commands/bind_push.rs | 2 +- vulkano/src/command_buffer/commands/clear.rs | 2 +- vulkano/src/command_buffer/commands/copy.rs | 1 - vulkano/src/command_buffer/commands/pipeline.rs | 2 +- vulkano/src/command_buffer/commands/query.rs | 4 ++-- vulkano/src/memory/alignment.rs | 10 +++++----- vulkano/src/memory/allocator/layout.rs | 3 +-- .../src/pipeline/graphics/vertex_input/collection.rs | 12 +++--------- vulkano/src/query.rs | 2 +- 15 files changed, 23 insertions(+), 31 deletions(-) diff --git a/examples/dynamic-buffers/main.rs b/examples/dynamic-buffers/main.rs index 9b3cb5b1f9..08e000b6bf 100644 --- a/examples/dynamic-buffers/main.rs +++ b/examples/dynamic-buffers/main.rs @@ -4,7 +4,7 @@ // Each draw or dispatch call can specify an offset into the buffer to read object data from, // without having to rebind descriptor sets. -use std::{iter::repeat, mem::size_of, sync::Arc}; +use std::{iter::repeat, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferCreateInfo, BufferUsage}, command_buffer::{ diff --git a/examples/ray-tracing-auto/scene.rs b/examples/ray-tracing-auto/scene.rs index 3576fc8a0c..8f8e146749 100644 --- a/examples/ray-tracing-auto/scene.rs +++ b/examples/ray-tracing-auto/scene.rs @@ -1,6 +1,6 @@ use crate::App; use glam::{Mat4, Vec3}; -use std::{iter, mem::size_of, sync::Arc}; +use std::{iter, sync::Arc}; use vulkano::{ acceleration_structure::{ AccelerationStructure, AccelerationStructureBuildGeometryInfo, diff --git a/examples/ray-tracing/scene.rs b/examples/ray-tracing/scene.rs index 26847c4d77..e3b1020374 100644 --- a/examples/ray-tracing/scene.rs +++ b/examples/ray-tracing/scene.rs @@ -1,6 +1,6 @@ use crate::{App, RenderContext}; use glam::{Mat4, Vec3}; -use std::{iter, mem::size_of, sync::Arc}; +use std::{iter, sync::Arc}; use vulkano::{ acceleration_structure::{ AccelerationStructure, AccelerationStructureBuildGeometryInfo, diff --git a/vulkano-taskgraph/src/command_buffer/commands/bind_push.rs b/vulkano-taskgraph/src/command_buffer/commands/bind_push.rs index 9262a5ced9..2729d5e08a 100644 --- a/vulkano-taskgraph/src/command_buffer/commands/bind_push.rs +++ b/vulkano-taskgraph/src/command_buffer/commands/bind_push.rs @@ -4,7 +4,7 @@ use crate::{ }; use ash::vk; use smallvec::SmallVec; -use std::{ffi::c_void, mem, ptr, sync::Arc}; +use std::{ffi::c_void, ptr, sync::Arc}; use vulkano::{ self, buffer::{Buffer, BufferContents, IndexType}, @@ -244,7 +244,7 @@ impl RecordingCommandBuffer<'_> { layout, offset, <*const _>::cast(values), - mem::size_of_val(values) as u32, + size_of_val(values) as u32, ) } } diff --git a/vulkano-taskgraph/src/command_buffer/commands/clear.rs b/vulkano-taskgraph/src/command_buffer/commands/clear.rs index 1622ee4dba..cf9c464b63 100644 --- a/vulkano-taskgraph/src/command_buffer/commands/clear.rs +++ b/vulkano-taskgraph/src/command_buffer/commands/clear.rs @@ -4,7 +4,7 @@ use crate::{ Id, }; use smallvec::SmallVec; -use std::{ffi::c_void, mem}; +use std::ffi::c_void; use vulkano::{ buffer::{Buffer, BufferContents}, device::DeviceOwned, @@ -186,7 +186,7 @@ impl RecordingCommandBuffer<'_> { dst_buffer, dst_offset, <*const _>::cast(data), - mem::size_of_val(data) as DeviceSize, + size_of_val(data) as DeviceSize, ) } } diff --git a/vulkano/src/command_buffer/commands/acceleration_structure.rs b/vulkano/src/command_buffer/commands/acceleration_structure.rs index 6c1cf18035..33a2feda47 100644 --- a/vulkano/src/command_buffer/commands/acceleration_structure.rs +++ b/vulkano/src/command_buffer/commands/acceleration_structure.rs @@ -21,7 +21,7 @@ use crate::{ DeviceSize, Requires, RequiresAllOf, RequiresOneOf, ValidationError, VulkanObject, }; use smallvec::SmallVec; -use std::{mem::size_of, sync::Arc}; +use std::sync::Arc; /// # Commands to do operations on acceleration structures. impl AutoCommandBufferBuilder { diff --git a/vulkano/src/command_buffer/commands/bind_push.rs b/vulkano/src/command_buffer/commands/bind_push.rs index d8bc8f7e1a..0d38f804ec 100644 --- a/vulkano/src/command_buffer/commands/bind_push.rs +++ b/vulkano/src/command_buffer/commands/bind_push.rs @@ -17,7 +17,7 @@ use crate::{ }; use ash::vk; use smallvec::SmallVec; -use std::{cmp::min, ffi::c_void, mem::size_of, ptr, sync::Arc}; +use std::{cmp::min, ffi::c_void, ptr, sync::Arc}; /// # Commands to bind or push state for pipeline execution commands. /// diff --git a/vulkano/src/command_buffer/commands/clear.rs b/vulkano/src/command_buffer/commands/clear.rs index 9c0d169807..53a6295603 100644 --- a/vulkano/src/command_buffer/commands/clear.rs +++ b/vulkano/src/command_buffer/commands/clear.rs @@ -12,7 +12,7 @@ use crate::{ }; use ash::vk; use smallvec::{smallvec, SmallVec}; -use std::{mem::size_of_val, sync::Arc}; +use std::sync::Arc; /// # Commands to fill resources with new data. impl AutoCommandBufferBuilder { diff --git a/vulkano/src/command_buffer/commands/copy.rs b/vulkano/src/command_buffer/commands/copy.rs index d3e852699b..01dd0d1da8 100644 --- a/vulkano/src/command_buffer/commands/copy.rs +++ b/vulkano/src/command_buffer/commands/copy.rs @@ -16,7 +16,6 @@ use ash::vk; use smallvec::{smallvec, SmallVec}; use std::{ cmp::{max, min}, - mem::size_of, sync::Arc, }; diff --git a/vulkano/src/command_buffer/commands/pipeline.rs b/vulkano/src/command_buffer/commands/pipeline.rs index dbb1cacc09..589b1acbd0 100644 --- a/vulkano/src/command_buffer/commands/pipeline.rs +++ b/vulkano/src/command_buffer/commands/pipeline.rs @@ -30,7 +30,7 @@ use crate::{ sync::{PipelineStageAccess, PipelineStageAccessFlags}, DeviceSize, Requires, RequiresAllOf, RequiresOneOf, ValidationError, Version, VulkanObject, }; -use std::{mem::size_of, sync::Arc}; +use std::sync::Arc; macro_rules! vuids { ($vuid_type:ident, $($id:literal),+ $(,)?) => { diff --git a/vulkano/src/command_buffer/commands/query.rs b/vulkano/src/command_buffer/commands/query.rs index 7b020ed44f..a3d1f357df 100644 --- a/vulkano/src/command_buffer/commands/query.rs +++ b/vulkano/src/command_buffer/commands/query.rs @@ -957,7 +957,7 @@ impl RecordingCommandBuffer { // VUID-vkCmdCopyQueryPoolResults-flags-00822 // VUID-vkCmdCopyQueryPoolResults-flags-00823 - debug_assert!(destination.offset() % std::mem::size_of::() as DeviceSize == 0); + debug_assert!(destination.offset() % size_of::() as DeviceSize == 0); if queries.end < queries.start { return Err(Box::new(ValidationError { @@ -1031,7 +1031,7 @@ impl RecordingCommandBuffer { T: QueryResultElement, { let per_query_len = query_pool.result_len(flags); - let stride = per_query_len * std::mem::size_of::() as DeviceSize; + let stride = per_query_len * size_of::() as DeviceSize; let fns = self.device().fns(); unsafe { diff --git a/vulkano/src/memory/alignment.rs b/vulkano/src/memory/alignment.rs index d7e62f4d1d..c3f3593514 100644 --- a/vulkano/src/memory/alignment.rs +++ b/vulkano/src/memory/alignment.rs @@ -16,10 +16,10 @@ use std::{ #[repr(transparent)] pub struct DeviceAlignment(AlignmentEnum); -const _: () = assert!(mem::size_of::() == mem::size_of::()); -const _: () = assert!(mem::align_of::() == mem::align_of::()); +const _: () = assert!(size_of::() == size_of::()); +const _: () = assert!(align_of::() == align_of::()); -const _: () = assert!(mem::size_of::() >= mem::size_of::()); +const _: () = assert!(size_of::() >= size_of::()); impl DeviceAlignment { /// The smallest possible alignment, 1. @@ -32,14 +32,14 @@ impl DeviceAlignment { #[inline] pub const fn of() -> Self { // SAFETY: rustc guarantees that the alignment of types is a power of two. - unsafe { DeviceAlignment::new_unchecked(mem::align_of::() as DeviceSize) } + unsafe { DeviceAlignment::new_unchecked(align_of::() as DeviceSize) } } /// Returns the alignment for a value. #[inline] pub fn of_val(value: &T) -> Self { // SAFETY: rustc guarantees that the alignment of types is a power of two. - unsafe { DeviceAlignment::new_unchecked(mem::align_of_val(value) as DeviceSize) } + unsafe { DeviceAlignment::new_unchecked(align_of_val(value) as DeviceSize) } } /// Tries to create a `DeviceAlignment` from a [`DeviceSize`], returning [`None`] if it's not a diff --git a/vulkano/src/memory/allocator/layout.rs b/vulkano/src/memory/allocator/layout.rs index f73918bbbf..b4a4df77d1 100644 --- a/vulkano/src/memory/allocator/layout.rs +++ b/vulkano/src/memory/allocator/layout.rs @@ -5,7 +5,6 @@ use std::{ error::Error, fmt::{Debug, Display, Formatter, Result as FmtResult}, hash::Hash, - mem, num::NonZero, }; @@ -18,7 +17,7 @@ pub struct DeviceLayout { alignment: DeviceAlignment, } -const _: () = assert!(mem::size_of::() >= mem::size_of::()); +const _: () = assert!(size_of::() >= size_of::()); const _: () = assert!(DeviceLayout::MAX_SIZE >= isize::MAX as DeviceSize); impl DeviceLayout { diff --git a/vulkano/src/pipeline/graphics/vertex_input/collection.rs b/vulkano/src/pipeline/graphics/vertex_input/collection.rs index 442af66455..e135cffa3d 100644 --- a/vulkano/src/pipeline/graphics/vertex_input/collection.rs +++ b/vulkano/src/pipeline/graphics/vertex_input/collection.rs @@ -1,5 +1,5 @@ use crate::buffer::Subbuffer; -use std::mem::{self, ManuallyDrop}; +use std::mem::ManuallyDrop; /// A collection of vertex buffers. pub trait VertexBuffersCollection { @@ -23,14 +23,8 @@ impl VertexBuffersCollection for Subbuffer { impl VertexBuffersCollection for Vec> { fn into_vec(self) -> Vec> { - assert_eq!( - mem::size_of::>(), - mem::size_of::>(), - ); - assert_eq!( - mem::align_of::>(), - mem::align_of::>(), - ); + assert_eq!(size_of::>(), size_of::>()); + assert_eq!(align_of::>(), align_of::>()); let mut this = ManuallyDrop::new(self); let cap = this.capacity(); diff --git a/vulkano/src/query.rs b/vulkano/src/query.rs index 3a1f5bb02b..03b305b23b 100644 --- a/vulkano/src/query.rs +++ b/vulkano/src/query.rs @@ -265,7 +265,7 @@ impl QueryPool { T: QueryResultElement, { let per_query_len = self.result_len(flags); - let stride = per_query_len * std::mem::size_of::() as DeviceSize; + let stride = per_query_len * size_of::() as DeviceSize; let fns = self.device.fns(); let result = unsafe {