Use the new swap chain model of gfx-hal #331
Conversation
| @@ -847,9 +868,6 @@ impl<B: hal::Backend> Device<B> { | |||
| self.device.wait_idle().unwrap(); | |||
|
|
|||
| let ref mut heaps = *self.heaps.lock().unwrap(); | |||
| for frame in self.frames.drain(..) { | |||
webrender/src/device/gfx/device.rs
Outdated
| let (swap_chain, images) = | ||
| unsafe { device.create_swapchain(surface, swap_config, old_swap_chain) } | ||
| .expect("create_swapchain failed"); | ||
| println!("## Image count {}", frame_count); |
webrender/src/device/gfx/device.rs
Outdated
| frame_depths.push(depth); | ||
| for _ in 1 .. frame_count { | ||
| frame_depths.push( | ||
| DepthBuffer::new( |
There was a problem hiding this comment.
why are we creating N depth buffers? we should be able to use the same depth buffer for all frames
moreover, with picture caching we may not even need any depth buffers for the swapchain images
There was a problem hiding this comment.
As I've found picture caching uses the depth buffer.
webrender/src/device/gfx/device.rs
Outdated
|
|
||
| info!("Frames: {:?}", frames); | ||
| println!("## Frame depth count {:?}", frame_depths.len()); |
webrender/src/device/gfx/device.rs
Outdated
| @@ -2208,11 +2250,13 @@ impl<B: hal::Backend> Device<B> { | |||
| let img = &self.images[&fbo.texture_id]; | |||
| (img.format, &img.core, fbo.layer_index) | |||
| } else { | |||
| ( | |||
| println!("## This path is unimplemented!"); | |||
webrender/src/device/gfx/device.rs
Outdated
| self.viewport.rect, | ||
| &self.render_passes, | ||
| ); | ||
| let old_frame = mem::replace(&mut self.frame, new_frame); |
There was a problem hiding this comment.
should we just do self.frame.surface_image = Some(surface_image)) instead of creating a new one and doing the mem::replace?
webrender/src/device/gfx/device.rs
Outdated
| unsafe { | ||
| match self.swap_chain.as_mut() { | ||
| Some(swap_chain) => { | ||
| let present_pass = self.render_passes.present_pass(); |
There was a problem hiding this comment.
why are we doing this pass? it seems empty
There was a problem hiding this comment.
This is just a workaround to fix validation layer errors (that the frame image is not in a presentable layout) until I write the code which identifies the last render pass related to the frame image and we can start this pass there.
webrender/src/device/gfx/device.rs
Outdated
| } | ||
| } | ||
|
|
||
| fn deinit(self, device: &B::Device) { | ||
| unsafe { | ||
| device.destroy_framebuffer(self.framebuffer); |
There was a problem hiding this comment.
We need to be destroying the associated frame buffer right after it was presented.
See the quad example for the reference. If keep it, we are forcing Metal to have more than one CAMetalDrawable in flight.
Currently, the code appears to be destroying the framebuffer only after the next acquisition is done.
webrender/src/device/gfx/device.rs
Outdated
| }; | ||
|
|
||
| let surface_image = unsafe { | ||
| match surface.acquire_image(!0) { |
There was a problem hiding this comment.
why are we acquiring an image in more than one place in the code?
webrender/src/device/gfx/device.rs
Outdated
| match self.swap_chain.as_mut() { | ||
| Some(swap_chain) => { | ||
| let present_pass = self.render_passes.present_pass(self.frame_depth.is_some()); | ||
| self.command_buffer.begin_render_pass( |
There was a problem hiding this comment.
we definitely not want to have this pass :)
zakorgy
force-pushed
the
new-swapchain
branch
2 times, most recently
from
fc834a3 to
967e69e
Compare
|
A quick update on this PR: it's is in a state where everything works without validation layer errors with Vulkan backend. But I still need to nail down the number of render passes we use for the main target.
|
zakorgy
changed the title
zakorgy
force-pushed
the
new-swapchain
branch
2 times, most recently
from
0fca15c to
b236dcd
Compare
zakorgy
force-pushed
the
new-swapchain
branch
2 times, most recently
from
72d16fe to
fe54b71
Compare
zakorgy
force-pushed
the
new-swapchain
branch
from
fe54b71 to
b4f5b7b
Compare
This change is