Skip to content

cargo: Support ash 0.34 all the way up to ash 0.37 #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 17, 2022
Merged

cargo: Support ash 0.34 all the way up to ash 0.37 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ log = "0.4"
thiserror = "1.0"
# Only needed for vulkan. Disable all default features as good practice,
# such as the ability to link/load a Vulkan library.
ash = { version = "0.36", optional = true, default-features = false, features = ["debug"] }
ash = { version = ">=0.34, <=0.37", optional = true, default-features = false, features = ["debug"] }
# Only needed for visualizer.
imgui = { version = "0.8", optional = true }

Expand All @@ -33,8 +33,8 @@ winapi = { version = "0.3.9", features = ["d3d12", "winerror", "impl-default", "

[dev-dependencies]
# Enable the "loaded" feature to be able to access the Vulkan entrypoint.
ash = { version = "0.36", default-features = false, features = ["debug", "loaded"] }
ash-window = "0.9.1"
ash = { version = "0.37", default-features = false, features = ["debug", "loaded"] }
ash-window = "0.10.0"
raw-window-handle = "0.4"
winit = "0.26"
imgui-winit-support = { version = "0.8", default-features = false, features = ["winit-26"] }
Expand Down
6 changes: 1 addition & 5 deletions examples/vulkan-visualization/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,11 @@ fn main() -> ash::prelude::VkResult<()> {
.collect();

let surface_extensions = ash_window::enumerate_required_extensions(&window).unwrap();
let extensions_names_raw = surface_extensions
.iter()
.map(|ext| ext.as_ptr())
.collect::<Vec<_>>();

let create_info = vk::InstanceCreateInfo::builder()
.application_info(&appinfo)
.enabled_layer_names(&layers_names_raw)
.enabled_extension_names(&extensions_names_raw);
.enabled_extension_names(surface_extensions);

unsafe {
entry
Expand Down
4 changes: 2 additions & 2 deletions src/vulkan/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ impl Allocation {
/// without this library, because that will lead to undefined behavior.
///
/// # Safety
/// The result of this function can safely be used to pass into [`vk::DeviceFnV1_0::bind_buffer_memory()`],
/// [`vk::DeviceFnV1_0::bind_image_memory()`] etc. It is exposed for this reason. Keep in mind to also
/// The result of this function can safely be used to pass into [`ash::Device::bind_buffer_memory()`],
/// [`ash::Device::bind_image_memory()`] etc. It is exposed for this reason. Keep in mind to also
/// pass [`Self::offset()`] along to those.
pub unsafe fn memory(&self) -> vk::DeviceMemory {
self.device_memory
Expand Down