alex/portability
1
0
Fork 0
mirror of https://github.com/italicsjenga/portability.git synced 2025-02-17 06:37:43 +11:00
Code Issues Projects Releases Packages Wiki Activity

Update to iterator changes in HAL device methods

Browse source
This commit is contained in:
Dzmitry Malyshau 2018-02-15 23:34:53 -05:00
parent 05e8abbde0
commit db997ead72
2 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libportability-gfx/src/conv.rs
View file

@ -155,7 +155,7 @@ pub fn map_image_kind(
assert!(!is_cube || array_layers % 6 == 0);
match ty {
VkImageType::VK_IMAGE_TYPE_1D => image::Kind::D1(extent.width as _),
VkImageType::VK_IMAGE_TYPE_1D if array_layers == 1 => image::Kind::D1(extent.width as _),
VkImageType::VK_IMAGE_TYPE_1D => image::Kind::D1Array(extent.width as _, array_layers as _),
VkImageType::VK_IMAGE_TYPE_2D if array_layers == 1 => {
image::Kind::D2(extent.width as _, extent.height as _, map_aa_mode(samples))

42
libportability-gfx/src/impls.rs
View file

@ -695,19 +695,19 @@ pub extern "C" fn gfxWaitForFences(
waitAll: VkBool32,
timeout: u64,
) -> VkResult {
let fences = unsafe {
let fence_slice = unsafe {
slice::from_raw_parts(pFences, fenceCount as _)
.into_iter()
.map(|fence| &**fence)
.collect::<Vec<_>>()
};
let fences = fence_slice
.into_iter()
.map(|fence| &**fence);
let wait_for = match waitAll {
VK_FALSE => WaitFor::Any,
_ => WaitFor::All,
};
if gpu.device.wait_for_fences(&fences, wait_for, timeout as _) {
if gpu.device.wait_for_fences(fences, wait_for, timeout as _) {
VkResult::VK_SUCCESS
} else {
VkResult::VK_TIMEOUT
@ -1388,8 +1388,7 @@ pub extern "C" fn gfxCreatePipelineLayout(
let layouts = set_layouts
.iter()
.map(|layout| &**layout)
.collect::<Vec<&<B as Backend>::DescriptorSetLayout>>();
.map(|layout| &**layout);
let ranges = push_constants
.iter()
@ -1399,11 +1398,10 @@ pub extern "C" fn gfxCreatePipelineLayout(
let size = constant.size / 4;
(stages, start .. start+size)
})
.collect::<Vec<_>>();
});
let pipeline_layout = gpu.device
.create_pipeline_layout(&layouts, &ranges);
.create_pipeline_layout(layouts, ranges);
unsafe { *pPipelineLayout = Handle::new(pipeline_layout); }
VkResult::VK_SUCCESS
@ -1534,10 +1532,9 @@ pub extern "C" fn gfxAllocateDescriptorSets(
};
let layouts = set_layouts
.iter()
.map(|layout| &**layout)
.collect::<Vec<_>>();
.map(|layout| &**layout);
let descriptor_sets = pool.allocate_sets(&layouts);
let descriptor_sets = pool.allocate_sets(layouts);
let sets = unsafe {
slice::from_raw_parts_mut(pDescriptorSets, info.descriptorSetCount as _)
};
@ -1645,6 +1642,16 @@ pub extern "C" fn gfxUpdateDescriptorSets(
.map(|image| (&*image.imageView, conv::map_image_layout(image.imageLayout)))
.collect()
),
pso::DescriptorType::CombinedImageSampler => pso::DescriptorWrite::CombinedImageSampler(
image_info
.into_iter()
.map(|image| (
&*image.sampler,
&*image.imageView,
conv::map_image_layout(image.imageLayout),
))
.collect()
),
};
pso::DescriptorSetWrite {
@ -1667,13 +1674,12 @@ pub extern "C" fn gfxCreateFramebuffer(
) -> VkResult {
let info = unsafe { &*pCreateInfo };
let attachments = unsafe {
let attachments_slice = unsafe {
slice::from_raw_parts(info.pAttachments, info.attachmentCount as _)
};
let attachments = attachments
let attachments = attachments_slice
.into_iter()
.map(|attachment| &**attachment)
.collect::<Vec<_>>();
.map(|attachment| &**attachment);
let extent = hal::device::Extent {
width: info.width,
@ -1683,7 +1689,7 @@ pub extern "C" fn gfxCreateFramebuffer(
let framebuffer = gpu
.device
.create_framebuffer(&*info.renderPass, &attachments, extent)
.create_framebuffer(&*info.renderPass, attachments, extent)
.unwrap();
unsafe {