alex/portability
1
0
Fork 0
mirror of https://github.com/italicsjenga/portability.git synced 2024-11-26 08:51:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge #237

Browse source 
237: Revisioned swapchains r=kvark a=ElArtista



Co-authored-by: TheArtist <agorglouk@gmail.com>
This commit is contained in:
bors[bot] 2020-12-14 20:52:29 +00:00 committed by GitHub
parent c1938e9149 785c61a9e6
commit 7ab1336ea8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4247,7 +4247,7 @@ pub unsafe extern "C" fn gfxDestroySurfaceKHR(
_: *const VkAllocationCallbacks, _: *const VkAllocationCallbacks,
) { ) {
if let Some(surface) = surface.unbox() { if let Some(surface) = surface.unbox() {
instance.backend.destroy_surface(surface); instance.backend.destroy_surface(surface.raw);
} }
} }
@ -4259,7 +4259,7 @@ pub unsafe extern "C" fn gfxGetPhysicalDeviceSurfaceSupportKHR(
pSupported: *mut VkBool32, pSupported: *mut VkBool32,
) -> VkResult { ) -> VkResult {
let family = &adapter.queue_families[queueFamilyIndex as usize]; let family = &adapter.queue_families[queueFamilyIndex as usize];
let supports = surface.supports_queue_family(family); let supports = surface.raw.supports_queue_family(family);
*pSupported = supports as _; *pSupported = supports as _;
VkResult::VK_SUCCESS VkResult::VK_SUCCESS
} }
@ -4270,7 +4270,7 @@ pub unsafe extern "C" fn gfxGetPhysicalDeviceSurfaceCapabilitiesKHR(
surface: VkSurfaceKHR, surface: VkSurfaceKHR,
pSurfaceCapabilities: *mut VkSurfaceCapabilitiesKHR, pSurfaceCapabilities: *mut VkSurfaceCapabilitiesKHR,
) -> VkResult { ) -> VkResult {
let caps = surface.capabilities(&adapter.physical_device); let caps = surface.raw.capabilities(&adapter.physical_device);
let output = VkSurfaceCapabilitiesKHR { let output = VkSurfaceCapabilitiesKHR {
minImageCount: *caps.image_count.start(), minImageCount: *caps.image_count.start(),
@ -4332,6 +4332,7 @@ pub unsafe extern "C" fn gfxGetPhysicalDeviceSurfaceFormatsKHR(
pSurfaceFormats: *mut VkSurfaceFormatKHR, pSurfaceFormats: *mut VkSurfaceFormatKHR,
) -> VkResult { ) -> VkResult {
let formats = surface let formats = surface
.raw
.supported_formats(&adapter.physical_device) .supported_formats(&adapter.physical_device)
.map(|formats| formats.into_iter().map(conv::format_from_hal).collect()) .map(|formats| formats.into_iter().map(conv::format_from_hal).collect())
.unwrap_or(vec![VkFormat::VK_FORMAT_UNDEFINED]); .unwrap_or(vec![VkFormat::VK_FORMAT_UNDEFINED]);
@ -4364,6 +4365,7 @@ pub unsafe extern "C" fn gfxGetPhysicalDeviceSurfaceFormats2KHR(
) -> VkResult { ) -> VkResult {
let formats = (*pSurfaceInfo) let formats = (*pSurfaceInfo)
.surface .surface
.raw
.supported_formats(&adapter.physical_device) .supported_formats(&adapter.physical_device)
.map(|formats| formats.into_iter().map(conv::format_from_hal).collect()) .map(|formats| formats.into_iter().map(conv::format_from_hal).collect())
.unwrap_or(vec![VkFormat::VK_FORMAT_UNDEFINED]); .unwrap_or(vec![VkFormat::VK_FORMAT_UNDEFINED]);
@ -4394,7 +4396,10 @@ pub unsafe extern "C" fn gfxGetPhysicalDeviceSurfacePresentModesKHR(
pPresentModeCount: *mut u32, pPresentModeCount: *mut u32,
pPresentModes: *mut VkPresentModeKHR, pPresentModes: *mut VkPresentModeKHR,
) -> VkResult { ) -> VkResult {
let present_modes = surface.capabilities(&adapter.physical_device).present_modes; let present_modes = surface
.raw
.capabilities(&adapter.physical_device)
.present_modes;
let num_present_modes = present_modes.bits().count_ones(); let num_present_modes = present_modes.bits().count_ones();
@ -4440,7 +4445,7 @@ pub unsafe extern "C" fn gfxCreateSwapchainKHR(
_pAllocator: *const VkAllocationCallbacks, _pAllocator: *const VkAllocationCallbacks,
pSwapchain: *mut VkSwapchainKHR, pSwapchain: *mut VkSwapchainKHR,
) -> VkResult { ) -> VkResult {
let info = &*pCreateInfo; let mut info = *pCreateInfo;
// TODO: more checks // TODO: more checks
if info.clipped == 0 { if info.clipped == 0 {
warn!("Non-clipped swapchain requested"); warn!("Non-clipped swapchain requested");
@ -4464,10 +4469,13 @@ pub unsafe extern "C" fn gfxCreateSwapchainKHR(
.surface .surface
.as_mut() .as_mut()
.unwrap() .unwrap()
.raw
.configure_swapchain(&gpu.device, config) .configure_swapchain(&gpu.device, config)
{ {
Ok(()) => { Ok(()) => {
let count = info.minImageCount; let count = info.minImageCount;
let revision = info.surface.swapchain_revision;
info.surface.swapchain_revision += 1;
let swapchain = Swapchain { let swapchain = Swapchain {
gpu, gpu,
surface: info.surface, surface: info.surface,
@ -4475,6 +4483,7 @@ pub unsafe extern "C" fn gfxCreateSwapchainKHR(
current_index: 0, current_index: 0,
active: (0 .. count).map(|_| None).collect(), active: (0 .. count).map(|_| None).collect(),
lazy_framebuffers: Mutex::new(Vec::with_capacity(1)), lazy_framebuffers: Mutex::new(Vec::with_capacity(1)),
revision,
}; };
*pSwapchain = Handle::new(swapchain); *pSwapchain = Handle::new(swapchain);
VkResult::VK_SUCCESS VkResult::VK_SUCCESS
@ -4499,7 +4508,9 @@ pub unsafe extern "C" fn gfxDestroySwapchainKHR(
_pAllocator: *const VkAllocationCallbacks, _pAllocator: *const VkAllocationCallbacks,
) { ) {
if let Some(mut sc) = swapchain.unbox() { if let Some(mut sc) = swapchain.unbox() {
sc.surface.unconfigure_swapchain(&gpu.device); if sc.surface.swapchain_revision == swapchain.revision {
sc.surface.raw.unconfigure_swapchain(&gpu.device);
}
} }
} }
#[inline] #[inline]
@ -4700,7 +4711,10 @@ pub unsafe extern "C" fn gfxCreateWin32SurfaceKHR(
#[cfg(any(feature = "gfx-backend-dx12", feature = "gfx-backend-dx11"))] #[cfg(any(feature = "gfx-backend-dx12", feature = "gfx-backend-dx11"))]
{ {
assert_eq!(info.flags, 0); assert_eq!(info.flags, 0);
*pSurface = Handle::new(instance.backend.create_surface_from_hwnd(info.hwnd)); *pSurface = Handle::new(Surface {
raw: instance.backend.create_surface_from_hwnd(info.hwnd),
swapchain_revision: 0,
});
VkResult::VK_SUCCESS VkResult::VK_SUCCESS
} }
#[cfg(not(all( #[cfg(not(all(
@ -4742,12 +4756,16 @@ pub unsafe extern "C" fn gfxCreateXlibSurfaceKHR(
display: info.dpy, display: info.dpy,
..XlibHandle::empty() ..XlibHandle::empty()
}; };
*pSurface = Handle::new(
instance let raw_surface = instance
.backend .backend
.create_surface(&HandleWrapper(xlib_handle)) .create_surface(&HandleWrapper(xlib_handle))
.unwrap(), .unwrap();
);
*pSurface = Handle::new(Surface {
raw: raw_surface,
swapchain_revision: 0,
});
VkResult::VK_SUCCESS VkResult::VK_SUCCESS
} }
#[cfg(not(target_os = "linux"))] #[cfg(not(target_os = "linux"))]
@ -4782,12 +4800,16 @@ pub unsafe extern "C" fn gfxCreateXcbSurfaceKHR(
connection: info.connection, connection: info.connection,
..XcbHandle::empty() ..XcbHandle::empty()
}; };
*pSurface = Handle::new(
instance let raw_surface = instance
.backend .backend
.create_surface(&HandleWrapper(xcb_handle)) .create_surface(&HandleWrapper(xcb_handle))
.unwrap(), .unwrap();
);
*pSurface = Handle::new(Surface {
raw: raw_surface,
swapchain_revision: 0,
});
VkResult::VK_SUCCESS VkResult::VK_SUCCESS
} }
#[cfg(not(target_os = "linux"))] #[cfg(not(target_os = "linux"))]
@ -4812,7 +4834,7 @@ pub unsafe extern "C" fn gfxAcquireNextImageKHR(
sem.is_fake = true; sem.is_fake = true;
} }
match swapchain.surface.acquire_image(timeout) { match swapchain.surface.raw.acquire_image(timeout) {
Ok((frame, suboptimal)) => { Ok((frame, suboptimal)) => {
let index = (swapchain.current_index + 1) % swapchain.count; let index = (swapchain.current_index + 1) % swapchain.count;
swapchain.active[index as usize] = Some(frame); swapchain.active[index as usize] = Some(frame);
@ -4854,7 +4876,7 @@ pub unsafe extern "C" fn gfxQueuePresentKHR(
.take() .take()
.expect("Frame was not acquired properly!"); .expect("Frame was not acquired properly!");
let sem = wait_semaphores.first().map(|s| &s.raw); let sem = wait_semaphores.first().map(|s| &s.raw);
if let Err(_) = queue.present(&mut *sc.surface, frame, sem) { if let Err(_) = queue.present(&mut sc.surface.raw, frame, sem) {
return VkResult::VK_ERROR_SURFACE_LOST_KHR; return VkResult::VK_ERROR_SURFACE_LOST_KHR;
} }
for framebuffer in sc.lazy_framebuffers.lock().drain(..) { for framebuffer in sc.lazy_framebuffers.lock().drain(..) {
@ -4877,11 +4899,12 @@ pub unsafe extern "C" fn gfxCreateMetalSurfaceEXT(
#[cfg(feature = "gfx-backend-metal")] #[cfg(feature = "gfx-backend-metal")]
{ {
assert_eq!(info.flags, 0); assert_eq!(info.flags, 0);
*pSurface = Handle::new( *pSurface = Handle::new(Surface {
instance raw: instance
.backend .backend
.create_surface_from_layer(mem::transmute(info.pLayer)), .create_surface_from_layer(mem::transmute(info.pLayer)),
); swapchain_revision: 0,
});
VkResult::VK_SUCCESS VkResult::VK_SUCCESS
} }
#[cfg(not(feature = "gfx-backend-metal"))] #[cfg(not(feature = "gfx-backend-metal"))]
@ -4903,7 +4926,10 @@ pub unsafe extern "C" fn gfxCreateMacOSSurfaceMVK(
#[cfg(all(target_os = "macos", feature = "gfx-backend-metal"))] #[cfg(all(target_os = "macos", feature = "gfx-backend-metal"))]
{ {
assert_eq!(info.flags, 0); assert_eq!(info.flags, 0);
*pSurface = Handle::new(instance.backend.create_surface_from_nsview(info.pView)); *pSurface = Handle::new(Surface {
raw: instance.backend.create_surface_from_nsview(info.pView),
swapchain_revision: 0,
});
VkResult::VK_SUCCESS VkResult::VK_SUCCESS
} }
#[cfg(not(all(target_os = "macos", feature = "gfx-backend-metal")))] #[cfg(not(all(target_os = "macos", feature = "gfx-backend-metal")))]

8
libportability-gfx/src/lib.rs
View file

@ -242,9 +242,14 @@ pub struct CommandPool<B: hal::Backend> {
//NOTE: all *KHR types have to be pure `Handle` things for compatibility with //NOTE: all *KHR types have to be pure `Handle` things for compatibility with
//`VK_DEFINE_NON_DISPATCHABLE_HANDLE` used in `vulkan.h` //`VK_DEFINE_NON_DISPATCHABLE_HANDLE` used in `vulkan.h`
pub type VkSurfaceKHR = Handle<<B as hal::Backend>::Surface>; pub type VkSurfaceKHR = Handle<Surface<B>>;
pub type VkSwapchainKHR = Handle<Swapchain<B>>; pub type VkSwapchainKHR = Handle<Swapchain<B>>;
pub struct Surface<B: hal::Backend> {
raw: B::Surface,
swapchain_revision: u32,
}
pub struct Swapchain<B: hal::Backend> { pub struct Swapchain<B: hal::Backend> {
gpu: VkDevice, gpu: VkDevice,
surface: VkSurfaceKHR, surface: VkSurfaceKHR,
@ -252,6 +257,7 @@ pub struct Swapchain<B: hal::Backend> {
current_index: hal::window::SwapImageIndex, current_index: hal::window::SwapImageIndex,
active: Vec<Option<<B::Surface as hal::window::PresentationSurface<B>>::SwapchainImage>>, active: Vec<Option<<B::Surface as hal::window::PresentationSurface<B>>::SwapchainImage>>,
lazy_framebuffers: parking_lot::Mutex<Vec<<B as hal::Backend>::Framebuffer>>, lazy_framebuffers: parking_lot::Mutex<Vec<<B as hal::Backend>::Framebuffer>>,
revision: u32,
} }
/* automatically generated by rust-bindgen */ /* automatically generated by rust-bindgen */