mirror of
https://github.com/italicsjenga/portability.git
synced 2025-02-17 06:37:43 +11:00
Implement vkCreateDescriptorPool, vkDestroyDescriptorPool, vkAllocateDescriptorSets and vkUpdateDescriptorSets
This commit is contained in:
msiglreith
parent
78f0654ad3
commit
a3a7f1f552
3 changed files with 167 additions and 38 deletions
|
|
@ -176,6 +176,24 @@ pub fn map_image_kind(
|
|||
}
|
||||
}
|
||||
|
||||
pub fn map_image_layout(layout: VkImageLayout) -> image::ImageLayout {
|
||||
match layout {
|
||||
/*
|
||||
VK_IMAGE_LAYOUT_UNDEFINED = 0,
|
||||
VK_IMAGE_LAYOUT_GENERAL = 1,
|
||||
VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL = 2,
|
||||
VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL = 3,
|
||||
VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL = 4,
|
||||
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL = 5,
|
||||
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL = 6,
|
||||
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL = 7,
|
||||
VK_IMAGE_LAYOUT_PREINITIALIZED = 8,
|
||||
VK_IMAGE_LAYOUT_PRESENT_SRC_KHR = 1000001002,
|
||||
*/
|
||||
_ => unimplemented!(),
|
||||
}
|
||||
}
|
||||
|
||||
fn map_aa_mode(samples: VkSampleCountFlagBits) -> image::AaMode {
|
||||
use VkSampleCountFlagBits::*;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
use hal::pso;
|
||||
use hal::{Backend, Device, Instance, PhysicalDevice, QueueFamily, Surface};
|
||||
use hal::{Backend, DescriptorPool, Device, Instance, PhysicalDevice, QueueFamily, Surface};
|
||||
use hal::pool::RawCommandPool;
|
||||
|
||||
use std::ffi::CString;
|
||||
use std::mem;
|
||||
use std::ops::Deref;
|
||||
use std::ops::{Deref, Range};
|
||||
|
||||
use super::*;
|
||||
|
||||
|
|
@ -974,20 +975,41 @@ pub extern "C" fn gfxDestroyDescriptorSetLayout(
|
|||
}
|
||||
#[inline]
|
||||
pub extern "C" fn gfxCreateDescriptorPool(
|
||||
device: VkDevice,
|
||||
gpu: VkDevice,
|
||||
pCreateInfo: *const VkDescriptorPoolCreateInfo,
|
||||
pAllocator: *const VkAllocationCallbacks,
|
||||
_pAllocator: *const VkAllocationCallbacks,
|
||||
pDescriptorPool: *mut VkDescriptorPool,
|
||||
) -> VkResult {
|
||||
unimplemented!()
|
||||
let info = unsafe { &*pCreateInfo };
|
||||
assert_eq!(info.flags, 0); // TODO
|
||||
|
||||
let pool_sizes = unsafe {
|
||||
slice::from_raw_parts(info.pPoolSizes, info.poolSizeCount as _)
|
||||
};
|
||||
|
||||
let ranges = pool_sizes
|
||||
.iter()
|
||||
.map(|pool| {
|
||||
pso::DescriptorRangeDesc {
|
||||
ty: conv::map_descriptor_type(pool.type_),
|
||||
count: pool.descriptorCount as _,
|
||||
}
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let pool = gpu.device
|
||||
.create_descriptor_pool(info.maxSets as _, &ranges);
|
||||
|
||||
unsafe { *pDescriptorPool = Handle::new(pool); }
|
||||
VkResult::VK_SUCCESS
|
||||
}
|
||||
#[inline]
|
||||
pub extern "C" fn gfxDestroyDescriptorPool(
|
||||
device: VkDevice,
|
||||
gpu: VkDevice,
|
||||
descriptorPool: VkDescriptorPool,
|
||||
pAllocator: *const VkAllocationCallbacks,
|
||||
_pAllocator: *const VkAllocationCallbacks,
|
||||
) {
|
||||
unimplemented!()
|
||||
gpu.device.destroy_descriptor_pool(*descriptorPool.unwrap());
|
||||
}
|
||||
#[inline]
|
||||
pub extern "C" fn gfxResetDescriptorPool(
|
||||
|
|
@ -999,11 +1021,30 @@ pub extern "C" fn gfxResetDescriptorPool(
|
|||
}
|
||||
#[inline]
|
||||
pub extern "C" fn gfxAllocateDescriptorSets(
|
||||
device: VkDevice,
|
||||
_device: VkDevice,
|
||||
pAllocateInfo: *const VkDescriptorSetAllocateInfo,
|
||||
pDescriptorSets: *mut VkDescriptorSet,
|
||||
) -> VkResult {
|
||||
unimplemented!()
|
||||
let info = unsafe { &mut *(pAllocateInfo as *mut VkDescriptorSetAllocateInfo) };
|
||||
let pool = &mut info.descriptorPool;
|
||||
|
||||
let set_layouts = unsafe {
|
||||
slice::from_raw_parts(info.pSetLayouts, info.descriptorSetCount as _)
|
||||
};
|
||||
let layouts = set_layouts
|
||||
.iter()
|
||||
.map(|layout| layout.deref())
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let descriptor_sets = pool.allocate_sets(&layouts);
|
||||
let sets = unsafe {
|
||||
slice::from_raw_parts_mut(pDescriptorSets, info.descriptorSetCount as _)
|
||||
};
|
||||
for (set, raw_set) in sets.iter_mut().zip(descriptor_sets.into_iter()) {
|
||||
*set = Handle::new(raw_set);
|
||||
}
|
||||
|
||||
VkResult::VK_SUCCESS
|
||||
}
|
||||
#[inline]
|
||||
pub extern "C" fn gfxFreeDescriptorSets(
|
||||
|
|
@ -1016,13 +1057,105 @@ pub extern "C" fn gfxFreeDescriptorSets(
|
|||
}
|
||||
#[inline]
|
||||
pub extern "C" fn gfxUpdateDescriptorSets(
|
||||
device: VkDevice,
|
||||
gpu: VkDevice,
|
||||
descriptorWriteCount: u32,
|
||||
pDescriptorWrites: *const VkWriteDescriptorSet,
|
||||
descriptorCopyCount: u32,
|
||||
pDescriptorCopies: *const VkCopyDescriptorSet,
|
||||
) {
|
||||
unimplemented!()
|
||||
assert_eq!(descriptorCopyCount, 0); // TODO
|
||||
|
||||
let writes = unsafe {
|
||||
slice::from_raw_parts(pDescriptorWrites, descriptorWriteCount as _)
|
||||
};
|
||||
|
||||
let writes = writes
|
||||
.iter()
|
||||
.map(|write| {
|
||||
fn map_buffer_info(buffer_info: &[VkDescriptorBufferInfo]) -> Vec<(&<B as Backend>::Buffer, Range<u64>)> {
|
||||
buffer_info
|
||||
.into_iter()
|
||||
.map(|buffer| {
|
||||
assert_ne!(buffer.range as i32, VK_WHOLE_SIZE);
|
||||
(
|
||||
match buffer.buffer.deref() {
|
||||
&Buffer::Buffer(ref buf) => buf,
|
||||
// Vulkan portability restriction:
|
||||
// Non-sparse buffer need to be bound to device memory.
|
||||
&Buffer::Unbound(_) => panic!("Buffer needs to be bound"),
|
||||
},
|
||||
buffer.offset .. buffer.offset+buffer.range,
|
||||
)
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
let image_info = unsafe {
|
||||
slice::from_raw_parts(write.pImageInfo, write.descriptorCount as _)
|
||||
};
|
||||
let buffer_info = unsafe {
|
||||
slice::from_raw_parts(write.pBufferInfo, write.descriptorCount as _)
|
||||
};
|
||||
let texel_buffer_views = unsafe {
|
||||
slice::from_raw_parts(write.pTexelBufferView, write.descriptorCount as _)
|
||||
};
|
||||
|
||||
let ty = conv::map_descriptor_type(write.descriptorType);
|
||||
let desc_write = match ty {
|
||||
pso::DescriptorType::Sampler => pso::DescriptorWrite::Sampler(
|
||||
image_info
|
||||
.into_iter()
|
||||
.map(|image| &*image.sampler)
|
||||
.collect()
|
||||
),
|
||||
pso::DescriptorType::SampledImage => pso::DescriptorWrite::SampledImage(
|
||||
image_info
|
||||
.into_iter()
|
||||
.map(|image| (&*image.imageView, conv::map_image_layout(image.imageLayout)))
|
||||
.collect()
|
||||
),
|
||||
pso::DescriptorType::StorageImage => pso::DescriptorWrite::StorageImage(
|
||||
image_info
|
||||
.into_iter()
|
||||
.map(|image| (&*image.imageView, conv::map_image_layout(image.imageLayout)))
|
||||
.collect()
|
||||
),
|
||||
pso::DescriptorType::UniformTexelBuffer => pso::DescriptorWrite::UniformTexelBuffer(
|
||||
texel_buffer_views
|
||||
.into_iter()
|
||||
.map(|view| view.deref())
|
||||
.collect()
|
||||
),
|
||||
pso::DescriptorType::StorageTexelBuffer => pso::DescriptorWrite::StorageTexelBuffer(
|
||||
texel_buffer_views
|
||||
.into_iter()
|
||||
.map(|view| view.deref())
|
||||
.collect()
|
||||
),
|
||||
pso::DescriptorType::UniformBuffer => pso::DescriptorWrite::UniformBuffer(
|
||||
map_buffer_info(buffer_info)
|
||||
),
|
||||
pso::DescriptorType::StorageBuffer => pso::DescriptorWrite::StorageBuffer(
|
||||
map_buffer_info(buffer_info)
|
||||
),
|
||||
pso::DescriptorType::InputAttachment => pso::DescriptorWrite::InputAttachment(
|
||||
image_info
|
||||
.into_iter()
|
||||
.map(|image| (&*image.imageView, conv::map_image_layout(image.imageLayout)))
|
||||
.collect()
|
||||
),
|
||||
};
|
||||
|
||||
pso::DescriptorSetWrite {
|
||||
set: &*write.dstSet,
|
||||
binding: write.dstBinding as _,
|
||||
array_offset: write.dstArrayElement as _,
|
||||
write: desc_write,
|
||||
}
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
gpu.device.update_descriptor_sets(&writes);
|
||||
}
|
||||
#[inline]
|
||||
pub extern "C" fn gfxCreateFramebuffer(
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ mod handle;
|
|||
mod impls;
|
||||
|
||||
use std::{cmp, slice};
|
||||
use hal::pool::RawCommandPool;
|
||||
use back::Backend as B;
|
||||
use handle::Handle;
|
||||
|
||||
|
|
@ -32,6 +31,10 @@ pub type VkCommandBuffer = Handle<<B as hal::Backend>::CommandBuffer>;
|
|||
pub type VkDeviceMemory = Handle<<B as hal::Backend>::Memory>;
|
||||
pub type VkDescriptorSetLayout = Handle<<B as hal::Backend>::DescriptorSetLayout>;
|
||||
pub type VkPipelineLayout = Handle<<B as hal::Backend>::PipelineLayout>;
|
||||
pub type VkDescriptorPool = Handle<<B as hal::Backend>::DescriptorPool>;
|
||||
pub type VkDescriptorSet = Handle<<B as hal::Backend>::DescriptorSet>;
|
||||
pub type VkSampler = Handle<<B as hal::Backend>::Sampler>;
|
||||
pub type VkBufferView = Handle<<B as hal::Backend>::BufferView>;
|
||||
|
||||
pub enum Image<B: hal::Backend> {
|
||||
Image(B::Image),
|
||||
|
|
@ -535,13 +538,6 @@ pub struct VkQueryPool_T {
|
|||
_unused: [u8; 0],
|
||||
}
|
||||
pub type VkQueryPool = *mut VkQueryPool_T;
|
||||
#[repr(C)]
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
pub struct VkBufferView_T {
|
||||
_unused: [u8; 0],
|
||||
}
|
||||
pub type VkBufferView = *mut VkBufferView_T;
|
||||
|
||||
#[repr(C)]
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
pub struct VkShaderModule_T {
|
||||
|
|
@ -568,24 +564,6 @@ pub struct VkPipeline_T {
|
|||
pub type VkPipeline = *mut VkPipeline_T;
|
||||
#[repr(C)]
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
pub struct VkSampler_T {
|
||||
_unused: [u8; 0],
|
||||
}
|
||||
pub type VkSampler = *mut VkSampler_T;
|
||||
#[repr(C)]
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
pub struct VkDescriptorPool_T {
|
||||
_unused: [u8; 0],
|
||||
}
|
||||
pub type VkDescriptorPool = *mut VkDescriptorPool_T;
|
||||
#[repr(C)]
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
pub struct VkDescriptorSet_T {
|
||||
_unused: [u8; 0],
|
||||
}
|
||||
pub type VkDescriptorSet = *mut VkDescriptorSet_T;
|
||||
#[repr(C)]
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
pub struct VkFramebuffer_T {
|
||||
_unused: [u8; 0],
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue