nordic-dev.net/vulkano
nordic-dev.net/vulkano
2
0
Fork 0
mirror of https://github.com/vulkano-rs/vulkano.git synced 2025-02-16 17:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for khr_get_memory_requirements2

Browse Source
This commit is contained in:
Pierre Krieger 2017-07-14 13:45:53 +02:00
parent 7515cb7b9e
commit e56edae631
7 changed files with 123 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vk-sys/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "vk-sys"
version = "0.2.6"
version = "0.2.7"
authors = ["Pierre Krieger <pierre.krieger1708@gmail.com>"]
repository = "https://github.com/tomaka/vulkano"
description = "Bindings for the Vulkan graphics API"

28
vk-sys/src/lib.rs
View File

@ -182,6 +182,11 @@ pub const STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR: u32 = 1
pub const STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO_KHR: u32 = 1000085000;
pub const STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR: u32 = 1000127000;
pub const STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR: u32 = 1000127001;
pub const STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR: u32 = 1000146000;
pub const STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR: u32 = 1000146001;
pub const STRUCTURE_TYPE_IMAGE_SPARSE_MEMORY_REQUIREMENTS_INFO_2_KHR: u32 = 1000146002;
pub const STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR: u32 = 1000146003;
pub const STRUCTURE_TYPE_SPARSE_IMAGE_MEMORY_REQUIREMENTS_2_KHR: u32 = 1000146004;
pub type SystemAllocationScope = u32;
pub const SYSTEM_ALLOCATION_SCOPE_COMMAND: u32 = 0;
@ -2602,6 +2607,27 @@ pub struct MemoryDedicatedAllocateInfoKHR {
pub buffer: Buffer,
}
#[repr(C)]
pub struct BufferMemoryRequirementsInfo2KHR {
pub sType: StructureType,
pub pNext: *mut c_void,
pub buffer: Buffer,
}
#[repr(C)]
pub struct ImageMemoryRequirementsInfo2KHR {
pub sType: StructureType,
pub pNext: *mut c_void,
pub image: Image,
}
#[repr(C)]
pub struct MemoryRequirements2KHR {
pub sType: StructureType,
pub pNext: *mut c_void,
pub memoryRequirements: MemoryRequirements,
}
macro_rules! ptrs {
($struct_name:ident, { $($name:ident => ($($param_n:ident: $param_ty:ty),*) -> $ret:ty,)+ }) => (
pub struct $struct_name {
@ -2848,4 +2874,6 @@ ptrs!(DevicePointers, {
DestroyDescriptorUpdateTemplateKHR => (device: Device, descriptorUpdateTemplate: DescriptorUpdateTemplateKHR, pAllocator: *const AllocationCallbacks) -> (),
UpdateDescriptorSetWithTemplateKHR => (device: Device, descriptorSet: DescriptorSet, descriptorUpdateTemplate: DescriptorUpdateTemplateKHR, pData: *const c_void) -> (),
CmdPushDescriptorSetWithTemplateKHR => (commandBuffer: CommandBuffer, descriptorUpdateTemplate: DescriptorUpdateTemplateKHR, layout: PipelineLayout, set: u32, pData: *const c_void) -> (),
GetImageMemoryRequirements2KHR => (device: Device, pInfo: *const ImageMemoryRequirementsInfo2KHR, pMemoryRequirements: *mut MemoryRequirements2KHR) -> (),
GetBufferMemoryRequirements2KHR => (device: Device, pInfo: *const BufferMemoryRequirementsInfo2KHR, pMemoryRequirements: *mut MemoryRequirements2KHR) -> (),
});

2
vulkano/Cargo.toml
View File

@ -15,4 +15,4 @@ fnv = "1.0.5"
shared_library = "0.1.5"
smallvec = "0.3.1"
lazy_static = "0.2.2"
vk-sys = { version = "0.2.6", path = "../vk-sys" }
vk-sys = { version = "0.2.7", path = "../vk-sys" }

47
vulkano/src/buffer/sys.rs
View File

@ -127,12 +127,49 @@ impl UnsafeBuffer {
al * (1 + (val - 1) / al)
}
let mut output: vk::MemoryRequirements = mem::uninitialized();
vk.GetBufferMemoryRequirements(device.internal_object(), buffer, &mut output);
debug_assert!(output.size >= size as u64);
debug_assert!(output.memoryTypeBits != 0);
let mut output = if device.loaded_extensions().khr_get_memory_requirements2 {
let infos = vk::BufferMemoryRequirementsInfo2KHR {
sType: vk::STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR,
pNext: ptr::null_mut(),
buffer: buffer,
};
let mut output: MemoryRequirements = output.into();
let mut output2 = if device.loaded_extensions().khr_dedicated_allocation {
Some(vk::MemoryDedicatedRequirementsKHR {
sType: vk::STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR,
pNext: ptr::null(),
prefersDedicatedAllocation: mem::uninitialized(),
requiresDedicatedAllocation: mem::uninitialized(),
})
} else {
None
};
let mut output = vk::MemoryRequirements2KHR {
sType: vk::STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR,
pNext: output2.as_mut().map(|o| o as *mut vk::MemoryDedicatedRequirementsKHR)
.unwrap_or(ptr::null_mut()) as *mut _,
memoryRequirements: mem::uninitialized(),
};
vk.GetBufferMemoryRequirements2KHR(device.internal_object(), &infos, &mut output);
debug_assert!(output.memoryRequirements.size >= size as u64);
debug_assert!(output.memoryRequirements.memoryTypeBits != 0);
let mut out: MemoryRequirements = output.memoryRequirements.into();
if let Some(output2) = output2 {
debug_assert_eq!(output2.requiresDedicatedAllocation, 0);
out.prefer_dedicated = output2.prefersDedicatedAllocation != 0;
}
out
} else {
let mut output: vk::MemoryRequirements = mem::uninitialized();
vk.GetBufferMemoryRequirements(device.internal_object(), buffer, &mut output);
debug_assert!(output.size >= size as u64);
debug_assert!(output.memoryTypeBits != 0);
output.into()
};
// We have to manually enforce some additional requirements for some buffer types.
let limits = device.physical_device().limits();

43
vulkano/src/image/sys.rs
View File

@ -519,11 +519,46 @@ impl UnsafeImage {
output
};
let mem_reqs: vk::MemoryRequirements = {
let mut output = mem::uninitialized();
let mem_reqs = if device.loaded_extensions().khr_get_memory_requirements2 {
let infos = vk::ImageMemoryRequirementsInfo2KHR {
sType: vk::STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR,
pNext: ptr::null_mut(),
image: image,
};
let mut output2 = if device.loaded_extensions().khr_dedicated_allocation {
Some(vk::MemoryDedicatedRequirementsKHR {
sType: vk::STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR,
pNext: ptr::null(),
prefersDedicatedAllocation: mem::uninitialized(),
requiresDedicatedAllocation: mem::uninitialized(),
})
} else {
None
};
let mut output = vk::MemoryRequirements2KHR {
sType: vk::STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR,
pNext: output2.as_mut().map(|o| o as *mut vk::MemoryDedicatedRequirementsKHR)
.unwrap_or(ptr::null_mut()) as *mut _,
memoryRequirements: mem::uninitialized(),
};
vk.GetImageMemoryRequirements2KHR(device.internal_object(), &infos, &mut output);
debug_assert!(output.memoryRequirements.memoryTypeBits != 0);
let mut out: MemoryRequirements = output.memoryRequirements.into();
if let Some(output2) = output2 {
debug_assert_eq!(output2.requiresDedicatedAllocation, 0);
out.prefer_dedicated = output2.prefersDedicatedAllocation != 0;
}
out
} else {
let mut output: vk::MemoryRequirements = mem::uninitialized();
vk.GetImageMemoryRequirements(device.internal_object(), image, &mut output);
debug_assert!(output.memoryTypeBits != 0);
output
output.into()
};
let image = UnsafeImage {
@ -538,7 +573,7 @@ impl UnsafeImage {
needs_destruction: true,
};
Ok((image, mem_reqs.into()))
Ok((image, mem_reqs))
}
/// Creates an image from a raw handle. The image won't be destroyed.

1
vulkano/src/instance/extensions.rs
View File

@ -356,6 +356,7 @@ device_extensions! {
khr_display_swapchain => b"VK_KHR_display_swapchain",
khr_sampler_mirror_clamp_to_edge => b"VK_KHR_sampler_mirror_clamp_to_edge",
khr_maintenance1 => b"VK_KHR_maintenance1",
khr_get_memory_requirements2 => b"VK_KHR_get_memory_requirements2",
khr_dedicated_allocation => b"VK_KHR_dedicated_allocation",
}

12
vulkano/src/memory/mod.rs
View File

@ -102,7 +102,8 @@ pub use self::pool::MemoryPool;
mod device_memory;
pub mod pool;
/// Represents requirements expressed by the Vulkan implementation.
/// Represents requirements expressed by the Vulkan implementation when it comes to binding memory
/// to a resource.
#[derive(Debug, Copy, Clone)]
pub struct MemoryRequirements {
/// Number of bytes of memory required.
@ -115,6 +116,14 @@ pub struct MemoryRequirements {
/// Indicates which memory types can be used. Each bit that is set to 1 means that the memory
/// type whose index is the same as the position of the bit can be used.
pub memory_type_bits: u32,
/// True if the implementation prefers to use dedicated allocations (in other words, allocate
/// a whole block of memory dedicated to this resource alone). If the implementation doesn't
/// support dedicated allocations, this will be false.
///
/// > **Note**: As its name says, using a dedicated allocation is an optimization and not a
/// > requirement.
pub prefer_dedicated: bool,
}
#[doc(hidden)]
@ -125,6 +134,7 @@ impl From<vk::MemoryRequirements> for MemoryRequirements {
size: reqs.size as usize,
alignment: reqs.alignment as usize,
memory_type_bits: reqs.memoryTypeBits,
prefer_dedicated: false,
}
}
}