diff --git a/Cargo.toml b/Cargo.toml index 5acff72343..31c0b24ec6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,6 +9,14 @@ members = [ ] resolver = "2" +[workspace.package] +edition = "2021" +rust-version = "1.72.0" +license = "MIT OR Apache-2.0" +homepage = "https://vulkano.rs" +keywords = ["vulkan", "bindings", "graphics", "gpu", "rendering"] +categories = ["rendering::graphics-api"] + [workspace.dependencies.vulkano] version = "0.34" path = "vulkano" diff --git a/vulkano-macros/Cargo.toml b/vulkano-macros/Cargo.toml index b89ec69273..6f94d35181 100644 --- a/vulkano-macros/Cargo.toml +++ b/vulkano-macros/Cargo.toml @@ -1,16 +1,17 @@ [package] name = "vulkano-macros" version = "0.34.0" -edition = "2021" authors = ["The vulkano contributors"] repository = "https://github.com/vulkano-rs/vulkano/tree/master/vulkano-macros" description = "Macros used by vulkano" -license = "MIT OR Apache-2.0" documentation = "https://docs.rs/vulkano-macros" -homepage = "https://vulkano.rs" -keywords = ["vulkan", "bindings", "graphics", "gpu", "rendering"] -categories = ["rendering::graphics-api"] readme = "../README.md" +edition = { workspace = true } +rust-version = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +keywords = { workspace = true } +categories = { workspace = true } [lib] proc-macro = true diff --git a/vulkano-shaders/Cargo.toml b/vulkano-shaders/Cargo.toml index 75b6076e64..e21e1e5a86 100644 --- a/vulkano-shaders/Cargo.toml +++ b/vulkano-shaders/Cargo.toml @@ -1,16 +1,17 @@ [package] name = "vulkano-shaders" version = "0.34.0" -edition = "2021" authors = ["Pierre Krieger ", "The vulkano contributors"] repository = "https://github.com/vulkano-rs/vulkano/tree/master/vulkano-shaders" description = "Macro for generating Rust code from shaders" -license = "MIT OR Apache-2.0" documentation = "https://docs.rs/vulkano-shaders" -homepage = "https://vulkano.rs" -keywords = ["vulkan", "bindings", "graphics", "gpu", "rendering"] -categories = ["rendering::graphics-api"] readme = "../README.md" +edition = { workspace = true } +rust-version = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +keywords = { workspace = true } +categories = { workspace = true } [lib] proc-macro = true diff --git a/vulkano-util/Cargo.toml b/vulkano-util/Cargo.toml index c149d9cb5b..c17a9b1922 100644 --- a/vulkano-util/Cargo.toml +++ b/vulkano-util/Cargo.toml @@ -1,16 +1,17 @@ [package] name = "vulkano-util" version = "0.34.0" -edition = "2021" authors = ["The vulkano contributors"] repository = "https://github.com/vulkano-rs/vulkano/tree/master/vulkano-util" description = "Utility functionality to make usage of vulkano easier" -license = "MIT OR Apache-2.0" documentation = "https://docs.rs/vulkano-util" -homepage = "https://vulkano.rs" -keywords = ["vulkan", "bindings", "graphics", "gpu", "rendering"] -categories = ["rendering::graphics-api"] readme = "../README.md" +edition = { workspace = true } +rust-version = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +keywords = { workspace = true } +categories = { workspace = true } [dependencies] ahash = { workspace = true } diff --git a/vulkano/Cargo.toml b/vulkano/Cargo.toml index 9120f1895c..af9c6d09e3 100644 --- a/vulkano/Cargo.toml +++ b/vulkano/Cargo.toml @@ -1,17 +1,18 @@ [package] name = "vulkano" version = "0.34.0" -edition = "2021" authors = ["Pierre Krieger ", "The vulkano contributors"] repository = "https://github.com/vulkano-rs/vulkano/tree/master/vulkano" description = "Safe wrapper for the Vulkan graphics API" -license = "MIT OR Apache-2.0" documentation = "https://docs.rs/vulkano" -homepage = "https://vulkano.rs" -keywords = ["vulkan", "bindings", "graphics", "gpu", "rendering"] -categories = ["rendering::graphics-api"] readme = "../README.md" build = "build.rs" +edition = { workspace = true } +rust-version = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +keywords = { workspace = true } +categories = { workspace = true } [dependencies] ahash = { workspace = true } diff --git a/vulkano/src/command_buffer/commands/acceleration_structure.rs b/vulkano/src/command_buffer/commands/acceleration_structure.rs index 1d8c9a7021..eaafe2407a 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, ptr, sync::Arc}; +use std::{mem::size_of, sync::Arc}; /// # Commands to do operations on acceleration structures. impl RecordingCommandBuffer { @@ -1568,7 +1568,7 @@ impl RawRecordingCommandBuffer { .collect(); let build_range_info_pointers_vk: SmallVec<[_; 8]> = build_range_info_elements_vk .iter() - .map(ptr::from_ref) + .map(|p| -> *const _ { p }) .collect(); let fns = self.device().fns(); diff --git a/vulkano/src/pipeline/graphics/mod.rs b/vulkano/src/pipeline/graphics/mod.rs index 6a583ea3d7..23ee8abb9e 100644 --- a/vulkano/src/pipeline/graphics/mod.rs +++ b/vulkano/src/pipeline/graphics/mod.rs @@ -855,39 +855,39 @@ impl GraphicsPipeline { p_stages: stages_vk.as_ptr(), p_vertex_input_state: vertex_input_state_vk .as_ref() - .map(ptr::from_ref) + .map(|p| -> *const _ { p }) .unwrap_or(ptr::null()), p_input_assembly_state: input_assembly_state_vk .as_ref() - .map(ptr::from_ref) + .map(|p| -> *const _ { p }) .unwrap_or(ptr::null()), p_tessellation_state: tessellation_state_vk .as_ref() - .map(ptr::from_ref) + .map(|p| -> *const _ { p }) .unwrap_or(ptr::null()), p_viewport_state: viewport_state_vk .as_ref() - .map(ptr::from_ref) + .map(|p| -> *const _ { p }) .unwrap_or(ptr::null()), p_rasterization_state: rasterization_state_vk .as_ref() - .map(ptr::from_ref) + .map(|p| -> *const _ { p }) .unwrap_or(ptr::null()), p_multisample_state: multisample_state_vk .as_ref() - .map(ptr::from_ref) + .map(|p| -> *const _ { p }) .unwrap_or(ptr::null()), p_depth_stencil_state: depth_stencil_state_vk .as_ref() - .map(ptr::from_ref) + .map(|p| -> *const _ { p }) .unwrap_or(ptr::null()), p_color_blend_state: color_blend_state_vk .as_ref() - .map(ptr::from_ref) + .map(|p| -> *const _ { p }) .unwrap_or(ptr::null()), p_dynamic_state: dynamic_state_vk .as_ref() - .map(ptr::from_ref) + .map(|p| -> *const _ { p }) .unwrap_or(ptr::null()), layout: layout.handle(), render_pass: render_pass_vk,