fix(pyrowave): per-session raw-dmabuf zero-copy capture on the Linux NVIDIA host
ci / web (push) Successful in 52s
apple / swift (push) Successful in 1m13s
ci / docs-site (push) Successful in 1m11s
ci / bench (push) Successful in 5m35s
apple / screenshots (push) Successful in 6m28s
docker / build-push (--build-arg FEDORA_VERSION=44, ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora44-rpm) (push) Successful in 12s
decky / build-publish (push) Successful in 29s
docker / build-push (., web/Dockerfile, punktfunk-web) (push) Successful in 11s
docker / build-push (ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora-rpm) (push) Successful in 10s
docker / build-push (ci, ci/rust-ci-noble.Dockerfile, punktfunk-rust-ci-noble) (push) Successful in 9s
docker / build-push (ci, ci/rust-ci.Dockerfile, punktfunk-rust-ci) (push) Successful in 10s
docker / build-push (docs-site, docs-site/Dockerfile, punktfunk-docs) (push) Successful in 12s
android / android (push) Successful in 13m34s
deb / build-publish (push) Successful in 9m10s
deb / build-publish-host (push) Successful in 9m26s
arch / build-publish (push) Successful in 17m58s
windows-host / package (push) Successful in 16m40s
ci / rust (push) Successful in 29m45s
rpm / build-publish (43, bazzite, punktfunk-fedora-rpm) (push) Successful in 20m12s
rpm / build-publish (44, fedora-44, punktfunk-fedora44-rpm) (push) Successful in 20m8s
docker / deploy-docs (push) Successful in 28s
ci / web (push) Successful in 52s
apple / swift (push) Successful in 1m13s
ci / docs-site (push) Successful in 1m11s
ci / bench (push) Successful in 5m35s
apple / screenshots (push) Successful in 6m28s
docker / build-push (--build-arg FEDORA_VERSION=44, ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora44-rpm) (push) Successful in 12s
decky / build-publish (push) Successful in 29s
docker / build-push (., web/Dockerfile, punktfunk-web) (push) Successful in 11s
docker / build-push (ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora-rpm) (push) Successful in 10s
docker / build-push (ci, ci/rust-ci-noble.Dockerfile, punktfunk-rust-ci-noble) (push) Successful in 9s
docker / build-push (ci, ci/rust-ci.Dockerfile, punktfunk-rust-ci) (push) Successful in 10s
docker / build-push (docs-site, docs-site/Dockerfile, punktfunk-docs) (push) Successful in 12s
android / android (push) Successful in 13m34s
deb / build-publish (push) Successful in 9m10s
deb / build-publish-host (push) Successful in 9m26s
arch / build-publish (push) Successful in 17m58s
windows-host / package (push) Successful in 16m40s
ci / rust (push) Successful in 29m45s
rpm / build-publish (43, bazzite, punktfunk-fedora-rpm) (push) Successful in 20m12s
rpm / build-publish (44, fedora-44, punktfunk-fedora44-rpm) (push) Successful in 20m8s
docker / deploy-docs (push) Successful in 28s
A PyroWave session on an NVIDIA-auto host was forced onto CPU-RGB capture
(session_plan flipped gpu=false): Mutter blits tiled->LINEAR, we mmap +
de-pad ~30 MB, the encoder re-uploads it - three full-frame CPU touches
per frame at 5120x1440 while an HEVC session on the same box rides the
tiled EGL/CUDA zero-copy. The dmabuf passthrough + Vulkan tiled import
were already validated (8dc5d672) but only reachable via the global
PUNKTFUNK_ENCODER=pyrowave lab policy.
ZeroCopyPolicy gains pyrowave_session (from OutputFormat.pyrowave, i.e.
the negotiated codec): the capturer skips the NVENC-only EGL->CUDA
importer, takes the raw-dmabuf passthrough, and advertises the wavelet
encoder's Vulkan-importable modifiers so Mutter+NVIDIA negotiates tiled
zero-copy. The forced-CPU flip in session_plan is gone.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -155,36 +155,22 @@ impl SessionPlan {
|
||||
}
|
||||
gpu && !force_cpu_for_nvenc_444
|
||||
};
|
||||
// PyroWave on an NVIDIA-auto host: the `gpu` capture path resolves to the EGL→CUDA
|
||||
// import that only NVENC can consume — the wavelet backend ingests raw dmabufs
|
||||
// (the AMD/Intel path) or CPU RGB. Flip THIS session to CPU RGB capture; the
|
||||
// Phase-2 exit sessions ran exactly this shape at 60 fps (the encode itself stays
|
||||
// sub-ms GPU compute). Per-session raw-dmabuf passthrough on NVIDIA (true
|
||||
// zero-copy without the PUNKTFUNK_ENCODER=pyrowave capture policy) is the
|
||||
// follow-up; the AMD/Intel dmabuf path is untouched.
|
||||
#[cfg(target_os = "linux")]
|
||||
let gpu = {
|
||||
let pyro_needs_cpu = self.codec == crate::encode::Codec::PyroWave
|
||||
&& !crate::encode::linux_zero_copy_is_vaapi();
|
||||
if gpu && pyro_needs_cpu {
|
||||
tracing::info!(
|
||||
"PyroWave session on the NVIDIA capture path: GPU (CUDA) capture disabled \
|
||||
for this session — frames arrive as CPU RGB and upload to the wavelet \
|
||||
encoder (raw-dmabuf zero-copy on NVIDIA is a follow-up)"
|
||||
);
|
||||
}
|
||||
gpu && !pyro_needs_cpu
|
||||
};
|
||||
// PyroWave on Linux keeps `gpu = true`: the capture facade sees `pyrowave` below and
|
||||
// routes the session onto the raw-dmabuf passthrough (the wavelet encoder's own Vulkan
|
||||
// device imports the compositor's dmabuf on ANY vendor — `ZeroCopyPolicy::pyrowave_session`
|
||||
// advertises its importable modifiers, so Mutter+NVIDIA negotiates tiled zero-copy instead
|
||||
// of the old forced CPU-RGB readback). The EGL→CUDA importer is skipped there — its
|
||||
// payloads only NVENC consumes.
|
||||
crate::capture::OutputFormat {
|
||||
gpu,
|
||||
hdr: self.hdr,
|
||||
// 4:4:4 needs a full-chroma source: on Windows this keeps the capturer on RGB (not the
|
||||
// default NV12/P010 video-engine output) so NVENC can CSC to 4:4:4.
|
||||
chroma_444: self.chroma.is_444(),
|
||||
// PyroWave (Windows): the IDD-push capturer makes its NV12 out-ring shareable + signals a
|
||||
// shared fence so the wavelet encoder can zero-copy-import the texture into its own Vulkan
|
||||
// device. Inert on Linux (the wavelet backend ingests dmabufs / CPU RGB there — handled
|
||||
// by the `gpu` flips above, not this flag).
|
||||
// PyroWave: on Windows the IDD-push capturer makes its NV12 out-ring shareable + signals
|
||||
// a shared fence so the wavelet encoder can zero-copy-import the texture into its own
|
||||
// Vulkan device; on Linux the capture facade flips the zero-copy policy to the
|
||||
// raw-dmabuf passthrough (see above).
|
||||
pyrowave: self.codec == crate::encode::Codec::PyroWave,
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user