mirror of
https://github.com/nestriness/nestri.git
synced 2026-09-21 10:15:20 +03:00
Make nescapture better with proper queue family checks, FPS limiting,
semaphore usage and other.. also updated deps like pollster and
pixelforge.
<!-- greptile_comment -->
<!-- greptile_summary -->
<h2><a
href="https://app.greptile.com/api/retrigger?id=64083904"><picture><source
media="(prefers-color-scheme: dark)"
srcset="https://greptile-static-assets.s3.amazonaws.com/badges/RetriggerDark.svg?v=1"><source
media="(prefers-color-scheme: light)"
srcset="https://greptile-static-assets.s3.amazonaws.com/badges/Retrigger.svg?v=1"><img
alt="Retrigger"
src="https://greptile-static-assets.s3.amazonaws.com/badges/Retrigger.svg?v=1"
align="right"></picture></a>Confidence Score: 5/5</h2>
The final review contains no accepted findings, so the PR appears safe
to merge.
<h3>Summary</h3>
- This PR reworks `nescapture` frame capture around a four-slot DMA-BUF
ring, tracks presentation queue families, adds semaphore-based
capture/present ordering, introduces capture frame-rate pacing, carries
presentation timestamps through encoding, and updates Vulkan-related
dependencies.
<sub>Reviews (1) · Last reviewed commit: ["feat: Update deps and remove
deprecated
..."](79e21f4aac)</sub>
<!-- /greptile_comment -->
---------
Co-authored-by: DatCaptainHorse <DatCaptainHorse@users.noreply.github.com>
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
161 lines
6.3 KiB
Rust
161 lines
6.3 KiB
Rust
// ─────────────────────────────────────────────────────────────────────────────
|
|
// swapchain.rs — Phase 4: swapchain tracking
|
|
//
|
|
// Captures format, extent AND color space from vkCreateSwapchainKHR so the
|
|
// encoder can automatically determine the correct color space pipeline
|
|
// (SDR/BT.709 vs HDR10/BT.2020-PQ vs FP16) without any manual configuration.
|
|
// ─────────────────────────────────────────────────────────────────────────────
|
|
|
|
use crate::dispatch_key;
|
|
use crate::state::DEVICE_STATE;
|
|
use ash::vk::{self, Handle};
|
|
use std::os::raw::c_void;
|
|
use std::sync::atomic::Ordering;
|
|
|
|
#[unsafe(no_mangle)]
|
|
pub unsafe extern "system" fn vkCreateSwapchainKHR(
|
|
device: vk::Device,
|
|
p_create_info: *const vk::SwapchainCreateInfoKHR,
|
|
p_allocator: *const vk::AllocationCallbacks,
|
|
p_swapchain: *mut vk::SwapchainKHR,
|
|
) -> vk::Result {
|
|
let key = unsafe { dispatch_key(device.as_raw() as *const c_void) };
|
|
let ds = match DEVICE_STATE.get(&key) {
|
|
Some(s) => s.clone(),
|
|
None => return vk::Result::ERROR_DEVICE_LOST,
|
|
};
|
|
|
|
let create_fn = match ds.fp.create_swapchain_khr {
|
|
Some(f) => f,
|
|
None => return vk::Result::ERROR_EXTENSION_NOT_PRESENT,
|
|
};
|
|
|
|
let ci = unsafe { &*p_create_info };
|
|
|
|
// Add TRANSFER_SRC so we can blit from swapchain images.
|
|
let mut modified_ci = *ci;
|
|
modified_ci.image_usage = ci.image_usage | vk::ImageUsageFlags::TRANSFER_SRC;
|
|
|
|
let result = unsafe { create_fn(device, &modified_ci, p_allocator, p_swapchain) };
|
|
// If the driver rejects TRANSFER_SRC (e.g. composited window), try without.
|
|
let transfer_src = result == vk::Result::SUCCESS;
|
|
let result = if transfer_src {
|
|
result
|
|
} else {
|
|
unsafe { create_fn(device, ci, p_allocator, p_swapchain) }
|
|
};
|
|
if result != vk::Result::SUCCESS {
|
|
return result;
|
|
}
|
|
if !transfer_src {
|
|
log::warn!(
|
|
"swapchain refused TRANSFER_SRC — capture disabled for this swapchain. \
|
|
Blitting from images the driver did not grant transfer usage is undefined."
|
|
);
|
|
}
|
|
ds.swapchain_transfer_src
|
|
.store(transfer_src, Ordering::Relaxed);
|
|
|
|
// A fresh swapchain means fresh images behind the same indices. The
|
|
// per-image capture semaphores may still be pending on presents from the
|
|
// outgoing swapchain, so they are set aside rather than reused.
|
|
crate::capture::retire_all_present_semaphores(&ds);
|
|
|
|
*ds.swapchain.lock().unwrap() = Some(unsafe { *p_swapchain });
|
|
*ds.swapchain_format.lock().unwrap() = ci.image_format;
|
|
*ds.swapchain_extent.lock().unwrap() = ci.image_extent;
|
|
// The colour space the layer below us was asked for, which is the one the
|
|
// game asked for in every configuration we ship.
|
|
//
|
|
// The exception is worth knowing about, because it is silent. A WSI layer
|
|
// of the gamescope kind rewrites `imageColorSpace` to SRGB_NONLINEAR before
|
|
// calling down -- deliberately, since it carries the real colour space to
|
|
// the compositor out of band instead. We sit below such a layer, so we
|
|
// would read the rewrite. Measured, all three lines from one run of a
|
|
// client requesting HDR10 PQ:
|
|
//
|
|
// [Gamescope WSI] ... colorspace: VK_COLOR_SPACE_HDR10_ST2084_EXT
|
|
// swapchain created — format=A2B10G10R10 colorspace=SRGB_NONLINEAR
|
|
// (re)init encoder: H265 Yuv420 Ten Bt709 → P010
|
|
//
|
|
// Ten-bit right, BT.709 wrong: PQ samples encoded and tagged as SDR, at
|
|
// full frame rate, decoding cleanly.
|
|
//
|
|
// This is not a bug to fix here. That route predates Wayland colour
|
|
// management and the compositor no longer enables it -- HDR comes from
|
|
// `wp_color_manager_v1` on a Wayland surface, where this value is correct
|
|
// and the same client yields Bt2020 and an smpte2084 stream. It is recorded
|
|
// because it is the reason the route stays off: enabling it would trade no
|
|
// HDR for wrong HDR. Anyone re-enabling it has to give this process a
|
|
// channel to the compositor first, since the true colour space exists only
|
|
// there.
|
|
ds.swapchain_colorspace
|
|
.store(ci.image_color_space.as_raw() as u32, Ordering::Relaxed);
|
|
|
|
log::debug!(
|
|
"swapchain created — format={:?} colorspace={:?} extent={}x{}",
|
|
ci.image_format,
|
|
ci.image_color_space,
|
|
ci.image_extent.width,
|
|
ci.image_extent.height,
|
|
);
|
|
|
|
vk::Result::SUCCESS
|
|
}
|
|
|
|
#[unsafe(no_mangle)]
|
|
pub unsafe extern "system" fn vkDestroySwapchainKHR(
|
|
device: vk::Device,
|
|
swapchain: vk::SwapchainKHR,
|
|
p_allocator: *const vk::AllocationCallbacks,
|
|
) {
|
|
let key = unsafe { dispatch_key(device.as_raw() as *const c_void) };
|
|
if let Some(ds) = DEVICE_STATE.get(&key) {
|
|
*ds.swapchain.lock().unwrap() = None;
|
|
*ds.swapchain_images.lock().unwrap() = Vec::new();
|
|
if let Some(destroy_fn) = ds.fp.destroy_swapchain_khr {
|
|
unsafe { destroy_fn(device, swapchain, p_allocator) };
|
|
}
|
|
}
|
|
}
|
|
|
|
#[unsafe(no_mangle)]
|
|
pub unsafe extern "system" fn vkGetSwapchainImagesKHR(
|
|
device: vk::Device,
|
|
swapchain: vk::SwapchainKHR,
|
|
p_swapchain_image_count: *mut u32,
|
|
p_swapchain_images: *mut vk::Image,
|
|
) -> vk::Result {
|
|
let key = unsafe { dispatch_key(device.as_raw() as *const c_void) };
|
|
let ds = match DEVICE_STATE.get(&key) {
|
|
Some(s) => s.clone(),
|
|
None => return vk::Result::ERROR_DEVICE_LOST,
|
|
};
|
|
|
|
let get_fn = match ds.fp.get_swapchain_images_khr {
|
|
Some(f) => f,
|
|
None => return vk::Result::ERROR_EXTENSION_NOT_PRESENT,
|
|
};
|
|
|
|
let result = unsafe {
|
|
get_fn(
|
|
device,
|
|
swapchain,
|
|
p_swapchain_image_count,
|
|
p_swapchain_images,
|
|
)
|
|
};
|
|
if result != vk::Result::SUCCESS {
|
|
return result;
|
|
}
|
|
|
|
if !p_swapchain_images.is_null() {
|
|
let count = unsafe { *p_swapchain_image_count as usize };
|
|
let images = unsafe { std::slice::from_raw_parts(p_swapchain_images, count) };
|
|
*ds.swapchain_images.lock().unwrap() = images.to_vec();
|
|
log::debug!("swapchain images — {} images", count);
|
|
}
|
|
|
|
vk::Result::SUCCESS
|
|
}
|