337: Fix life cycle of swap chain framebuffers r=grovesNL a=kvark

Fixes #78 

The new swapchain model requires framebuffers to be destroyed right after presentation.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
This commit is contained in:
bors[bot]andDzmitry Malyshau authored and GitHub committed 2019-09-11 23:18:40 +00:00
commit b045e7ea13
5 files changed
+72 -32

No files matched your search

+1 -1
View File
@@ -87,7 +87,7 @@ impl<B: GfxBackend> CommandAllocator<B> {
device_id,
life_guard: LifeGuard::new(),
trackers: TrackerSet::new(B::VARIANT),
used_swap_chain_image: None,
used_swap_chain: None,
}
}
+48 -22
View File
@@ -118,7 +118,7 @@ pub struct CommandBuffer<B: hal::Backend> {
device_id: Stored<DeviceId>,
pub(crate) life_guard: LifeGuard,
pub(crate) trackers: TrackerSet,
pub(crate) used_swap_chain_image: Option<Stored<TextureViewId>>,
pub(crate) used_swap_chain: Option<(Stored<TextureViewId>, B::Framebuffer)>,
}
impl<B: GfxBackend> CommandBuffer<B> {
@@ -198,7 +198,7 @@ pub fn command_encoder_finish<B: GfxBackend>(
assert!(comb.is_recording);
comb.is_recording = false;
// stop tracking the swapchain image, if used
if let Some(ref view_id) = comb.used_swap_chain_image {
if let Some((ref view_id, _)) = comb.used_swap_chain {
comb.trackers.views.remove(view_id.value);
}
encoder_id
@@ -248,6 +248,7 @@ pub fn command_encoder_begin_render_pass<B: GfxBackend>(
let mut extent = None;
let mut barriers = Vec::new();
let mut used_swap_chain_image = None::<Stored<TextureViewId>>;
let color_attachments =
unsafe { slice::from_raw_parts(desc.color_attachments, desc.color_attachments_length) };
@@ -381,10 +382,11 @@ pub fn command_encoder_begin_render_pass<B: GfxBackend>(
old_layout .. hal::image::Layout::ColorAttachmentOptimal
}
TextureViewInner::SwapChain { .. } => {
if let Some(ref view_id) = cmb.used_swap_chain_image {
if let Some((ref view_id, _)) = cmb.used_swap_chain {
assert_eq!(view_id.value, at.attachment);
} else {
cmb.used_swap_chain_image = Some(Stored {
assert!(used_swap_chain_image.is_none());
used_swap_chain_image = Some(Stored {
value: at.attachment,
ref_count: view.life_guard.ref_count.clone(),
});
@@ -452,10 +454,11 @@ pub fn command_encoder_begin_render_pass<B: GfxBackend>(
old_layout .. hal::image::Layout::ColorAttachmentOptimal
}
TextureViewInner::SwapChain { .. } => {
if let Some(ref view_id) = cmb.used_swap_chain_image {
if let Some((ref view_id, _)) = cmb.used_swap_chain {
assert_eq!(view_id.value, resolve_target);
} else {
cmb.used_swap_chain_image = Some(Stored {
assert!(used_swap_chain_image.is_none());
used_swap_chain_image = Some(Stored {
value: resolve_target,
ref_count: view.life_guard.ref_count.clone(),
});
@@ -555,7 +558,7 @@ pub fn command_encoder_begin_render_pass<B: GfxBackend>(
}
};
let mut framebuffer_cache = device.framebuffers.lock();
let mut framebuffer_cache;
let fb_key = FramebufferKey {
colors: color_attachments.iter().map(|at| at.attachment).collect(),
resolves: color_attachments
@@ -564,22 +567,45 @@ pub fn command_encoder_begin_render_pass<B: GfxBackend>(
.collect(),
depth_stencil: depth_stencil_attachment.map(|at| at.attachment),
};
let framebuffer = match framebuffer_cache.entry(fb_key) {
Entry::Occupied(e) => e.into_mut(),
Entry::Vacant(e) => {
let fb = {
let attachments = e.key().all().map(|&id| match view_guard[id].inner {
TextureViewInner::Native { ref raw, .. } => raw,
TextureViewInner::SwapChain { ref image, .. } => Borrow::borrow(image),
});
unsafe {
device
.raw
.create_framebuffer(&render_pass, attachments, extent.unwrap())
}
.unwrap()
let framebuffer = match used_swap_chain_image.take() {
Some(view_id) => {
assert!(cmb.used_swap_chain.is_none());
// Always create a new framebuffer and delete it after presentation.
let attachments = fb_key.all().map(|&id| match view_guard[id].inner {
TextureViewInner::Native { ref raw, .. } => raw,
TextureViewInner::SwapChain { ref image, .. } => Borrow::borrow(image),
});
let framebuffer = unsafe {
device
.raw
.create_framebuffer(&render_pass, attachments, extent.unwrap())
.unwrap()
};
e.insert(fb)
cmb.used_swap_chain = Some((view_id, framebuffer));
&mut cmb.used_swap_chain.as_mut().unwrap().1
}
None => {
// Cache framebuffers by the device.
framebuffer_cache = device.framebuffers.lock();
match framebuffer_cache.entry(fb_key) {
Entry::Occupied(e) => e.into_mut(),
Entry::Vacant(e) => {
let fb = {
let attachments = e.key().all().map(|&id| match view_guard[id].inner {
TextureViewInner::Native { ref raw, .. } => raw,
TextureViewInner::SwapChain { ref image, .. } => Borrow::borrow(image),
});
unsafe {
device
.raw
.create_framebuffer(&render_pass, attachments, extent.unwrap())
}
.unwrap()
};
e.insert(fb)
}
}
}
};
+9 -5
View File
@@ -1433,7 +1433,7 @@ pub fn queue_submit<B: GfxBackend>(queue_id: QueueId, command_buffer_ids: &[Comm
let (bind_group_guard, mut token) = hub.bind_groups.read(&mut token);
let (buffer_guard, mut token) = hub.buffers.read(&mut token);
let (texture_guard, mut token) = hub.textures.read(&mut token);
let (texture_view_guard, _) = hub.texture_views.read(&mut token);
let (mut texture_view_guard, _) = hub.texture_views.write(&mut token);
//TODO: if multiple command buffers are submitted, we can re-use the last
// native command buffer of the previous chain instead of always creating
@@ -1443,11 +1443,15 @@ pub fn queue_submit<B: GfxBackend>(queue_id: QueueId, command_buffer_ids: &[Comm
for &cmb_id in command_buffer_ids {
let comb = &mut command_buffer_guard[cmb_id];
if let Some(view_id) = comb.used_swap_chain_image.take() {
if let Some((view_id, fbo)) = comb.used_swap_chain.take() {
let sem = match texture_view_guard[view_id.value].inner {
resource::TextureViewInner::Native { .. } => unreachable!(),
resource::TextureViewInner::SwapChain { ref source_id, .. } =>
&swap_chain_guard[source_id.value].semaphore,
resource::TextureViewInner::SwapChain { ref source_id, ref mut framebuffer, .. } => {
assert!(framebuffer.is_none(),
"Using a swap chain in multiple framebuffers is not supported yet");
*framebuffer = Some(fbo);
&swap_chain_guard[source_id.value].semaphore
}
};
signal_semaphores.push(sem);
}
@@ -1958,8 +1962,8 @@ pub fn device_create_swap_chain<B: GfxBackend>(
},
desc: desc.clone(),
num_frames,
acquired_view_id: None,
semaphore: device.raw.create_semaphore().unwrap(),
acquired_view_id: None,
};
swap_chain_guard.insert(sc_id, swap_chain);
sc_id
+3
View File
@@ -270,6 +270,9 @@ pub(crate) enum TextureViewInner<B: hal::Backend> {
SwapChain {
image: <B::Surface as hal::window::PresentationSurface<B>>::SwapchainImage,
source_id: Stored<SwapChainId>,
//Note: limited to a single framebuffer, could be relaxed
// to support multiple ones.
framebuffer: Option<B::Framebuffer>,
},
}
+11 -4
View File
@@ -44,6 +44,7 @@ use crate::{
use hal::{
self,
device::Device as _,
queue::CommandQueue as _,
window::PresentationSurface as _,
};
@@ -60,8 +61,8 @@ pub struct SwapChain<B: hal::Backend> {
pub(crate) device_id: Stored<DeviceId>,
pub(crate) desc: SwapChainDescriptor,
pub(crate) num_frames: hal::window::SwapImageIndex,
pub(crate) acquired_view_id: Option<Stored<TextureViewId>>,
pub(crate) semaphore: B::Semaphore,
pub(crate) acquired_view_id: Option<Stored<TextureViewId>>,
}
#[repr(C)]
@@ -165,6 +166,7 @@ pub fn swap_chain_get_next_texture<B: GfxBackend>(
value: swap_chain_id,
ref_count: sc.life_guard.ref_count.clone(),
},
framebuffer: None,
},
format: sc.desc.format,
extent: hal::image::Extent {
@@ -216,9 +218,9 @@ pub fn swap_chain_present<B: GfxBackend>(swap_chain_id: SwapChainId) {
.take()
.expect("Swap chain image is not acquired");
let (view, _) = hub.texture_views.unregister(view_id.value, &mut token);
let image = match view.inner {
let (image, framebuffer) = match view.inner {
resource::TextureViewInner::Native { .. } => unreachable!(),
resource::TextureViewInner::SwapChain { image, .. } => image,
resource::TextureViewInner::SwapChain { image, framebuffer, .. } => (image, framebuffer),
};
let err = unsafe {
@@ -229,10 +231,15 @@ pub fn swap_chain_present<B: GfxBackend>(swap_chain_id: SwapChainId) {
Some(&sc.semaphore),
)
};
if let Err(e) = err {
log::warn!("present failed: {:?}", e);
}
if let Some(fbo) = framebuffer {
unsafe {
device.raw.destroy_framebuffer(fbo);
}
}
}
#[no_mangle]