Skip to content

Commit 6a68a5b

Browse files
committed
Prepare for next ash release
1 parent 3d4466e commit 6a68a5b

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,3 +98,7 @@ metal = ["dep:objc2", "dep:objc2-metal", "dep:objc2-foundation"]
9898
hashbrown = ["dep:hashbrown"]
9999

100100
default = ["std", "d3d12", "vulkan", "metal"]
101+
102+
[patch.crates-io]
103+
# https://github.com/ash-rs/ash/pull/951
104+
ash = { git = "https://github.com/Traverse-Research/ash", rev = "e589cf77" }

src/vulkan/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use core::{fmt, marker::PhantomData};
55
#[cfg(feature = "std")]
66
use std::backtrace::Backtrace;
77

8-
use ash::vk;
8+
use ash::vk::{self, TaggedStructure as _};
99
use log::{debug, Level};
1010

1111
#[cfg(feature = "visualizer")]
@@ -369,7 +369,7 @@ impl MemoryBlock {
369369
let mut flags_info = vk::MemoryAllocateFlagsInfo::default().flags(allocation_flags);
370370
// TODO(manon): Test this based on if the device has this feature enabled or not
371371
let alloc_info = if buffer_device_address {
372-
alloc_info.push_next(&mut flags_info)
372+
alloc_info.push(&mut flags_info)
373373
} else {
374374
alloc_info
375375
};
@@ -379,11 +379,11 @@ impl MemoryBlock {
379379
let alloc_info = match allocation_scheme {
380380
AllocationScheme::DedicatedBuffer(buffer) => {
381381
dedicated_memory_info = dedicated_memory_info.buffer(buffer);
382-
alloc_info.push_next(&mut dedicated_memory_info)
382+
alloc_info.push(&mut dedicated_memory_info)
383383
}
384384
AllocationScheme::DedicatedImage(image) => {
385385
dedicated_memory_info = dedicated_memory_info.image(image);
386-
alloc_info.push_next(&mut dedicated_memory_info)
386+
alloc_info.push(&mut dedicated_memory_info)
387387
}
388388
AllocationScheme::GpuAllocatorManaged => alloc_info,
389389
};

0 commit comments

Comments
 (0)