feat: windows on their own clock, deferred deletion for every handle owner, staged re-uploads, and RTPass push data

Window
- updateInterval runs Update on the window's own clock while the
  compositor sends no frame callbacks (hidden, minimized): the Wayland loop
  is a poll() loop, and the Win32 loop sleeps until the next update. Both
  read the interval each pass.
- SetPresentMode (FIFO, Mailbox, Immediate). A mode the surface lacks, or
  whose swapchain has other than numFrames images (Mesa's Mailbox has four),
  falls back to FIFO until the mode is set again.
- AddPollFd / RemovePollFd wake the Wayland loop on the app's descriptors.
- The swapchain has TRANSFER_DST where the surface allows it.
- CaptureNextFrame replaces SaveFrame: it records the copy in the frame,
  before the present, where SaveFrame read an image already presented. A
  frame unwound past before the write still frees the readback buffer.
- Inter-pass barriers on the swapchain image carry the access masks of the
  stages the passes use.

Deferred deletion (issue #101)
- VulkanBuffer, Mesh, VulkanShader, ComputeShader and PipelineRTVulkan hand
  their handles to the deletion queue from their destructors and moves, as
  a frame in flight may still use them; a static owner goes after the
  driver has torn down. VulkanShader and PipelineRTVulkan move and can't be
  copied; re-Load and re-Init queue the old pipeline.
- The queue and its mutex are never destroyed, and the queue takes handles
  from any thread; Device::frameCounter is atomic. Both the queue and the
  staging rings count frames as one window renders them (documented).
- DrainDeletions also lets every buffer's staging ring start over: without
  a Window nothing else reclaims either, so an app without one calls it
  after waiting for its work.

Meshes and buffers
- A Mesh rebuild queues the old acceleration structure and builds into the
  same storage after a barrier, so the BLAS address stays put when it fits.
  The refit and rebuild barriers cover compute ray queries too.
- RTBuildOptions::noDuplicateAnyHit. Mesh::geometryFlags replaces opaque,
  and the refit and rebuild fallbacks keep the flags.
- A re-upload into a buffer a frame in flight may read (UploadDeviceLocal
  of the same size, UploadDeviceLocalRange) copies on the GPU, after those
  reads, through a per-frame staging ring; on ReBAR it used to write the
  buffer in place. Empty uploads record nothing.
- A compressed Mesh::Build that keeps its buffers decompresses into them
  after the reads of frames in flight, and the hit shaders and ray queries
  wait for the decompress as well as the BLAS build. Its vertex buffer
  takes a ranged refit's copies.
- Mesh move-assigns (queueing the BLAS it replaces), so it can be replaced
  in place or erased from a vector.
- VulkanBuffer::Create asks for a device address only for buffers with
  SHADER_DEVICE_ADDRESS usage, as vkGetBufferDeviceAddress requires; the
  others have address 0. UIRenderer::RegisterBuffer refuses those.
- Build inputs are synchronized as shader reads.

Other
- RTPass pushes the app's own push data and traces at an explicit size.
- DescriptorHeapVulkan hands freed slot ranges out again (they leaked), and
  keeps its free lists sorted.
- ImageVulkan's mip chain clamps each level to 1 texel: a non-square
  image's shorter side went to 0.
- VulkanShader throws on a missing file instead of failing in bad_alloc.
- CRAFTER_GRAPHICS_DEVICE picks the GPU by its number among the distinct
  GPUs Vulkan lists; anything but such a number is an error.
- The debug messenger prints info messages only with
  CRAFTER_GRAPHICS_VALIDATION set.
- Windows: the WinRT gamepad code moved to a C file (mingw-w64's WinRT
  headers don't compile as C++), -lcombase dropped, a reference leak fixed.
- project.cpp honours --local for Crafter.Event, Math and Asset, as Asset
  does for Math, and builds every test through one helper, projectArgs
  included.
- Tests: DebugMessengerSeverity, DeletionQueueThreads, DeviceSelection,
  HeapSlotReuse, MeshLifetime, MipChainNonSquare, PipelineLifetime,
  RTPassPushData, SwapchainTransferDst, UploadInFlight, VulkanBufferAddress,
  VulkanShaderLifetime, WindowUpdateClock; others extended.

Breaking: SaveFrame is CaptureNextFrame; Mesh::opaque is geometryFlags; a
buffer without SHADER_DEVICE_ADDRESS usage has no address; frameCounter is
std::atomic.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Jorijn van der Graaf 2026-10-20 19:07:54 +02:00
commit 079b6b0e1f
Signed by: jorijnvdgraaf
GPG key ID: 2937E59CDCC1BCFB
47 changed files with 3572 additions and 1430 deletions

View file

@ -391,12 +391,35 @@ export namespace Crafter {
vkUpdateDescriptorSets(Device::device, Window::numFrames, writes, 0, nullptr);
}
// Takes `count` consecutive slots out of `freelist`, the first of
// them returned, if it holds a run that long: freed ranges and freed
// single slots alike come back as ranges, rather than only fresh
// slots serving a range. The freelists are kept sorted (Free), which
// puts neighbours side by side. A freed slot is handed out again at
// once, which is why the Free* calls below require that no frame in
// flight still uses it.
static std::optional<std::uint16_t> TakeRun(std::vector<std::uint16_t>& freelist, std::uint16_t count) {
if (count == 0 || freelist.size() < count) return std::nullopt;
for (std::size_t i = 0; i + count <= freelist.size(); ++i) {
// Sorted and without repeats: the ends `count - 1` apart are a run.
if (freelist[i + count - 1] - freelist[i] == count - 1) {
const std::uint16_t first = freelist[i];
freelist.erase(freelist.begin() + static_cast<std::ptrdiff_t>(i), freelist.begin() + static_cast<std::ptrdiff_t>(i + count));
return first;
}
}
return std::nullopt;
}
ImageSlotRange AllocateImageSlots(std::uint16_t count) {
if (count == 1 && !imageFreelist.empty()) {
std::uint16_t s = imageFreelist.back();
imageFreelist.pop_back();
return {s, 1};
}
if (const std::optional<std::uint16_t> first = TakeRun(imageFreelist, count)) {
return {*first, count};
}
if (imageNext + count > imageCapacity) {
std::uint16_t remaining = static_cast<std::uint16_t>((imageCapacity - imageNext) + imageFreelist.size());
throw std::runtime_error(std::format("DescriptorHeapVulkan: out of image slots ({} requested, {} remaining of {})", count, remaining, imageCapacity));
@ -412,6 +435,9 @@ export namespace Crafter {
bufferFreelist.pop_back();
return {s, 1};
}
if (const std::optional<std::uint16_t> first = TakeRun(bufferFreelist, count)) {
return {*first, count};
}
if (bufferNext + count > bufferCapacity) {
std::uint16_t remaining = static_cast<std::uint16_t>((bufferCapacity - bufferNext) + bufferFreelist.size());
throw std::runtime_error(std::format("DescriptorHeapVulkan: out of buffer slots ({} requested, {} remaining of {})", count, remaining, bufferCapacity));
@ -427,6 +453,9 @@ export namespace Crafter {
samplerFreelist.pop_back();
return {s, 1};
}
if (const std::optional<std::uint16_t> first = TakeRun(samplerFreelist, count)) {
return {*first, count};
}
if (samplerNext + count > samplerCapacity) {
std::uint16_t remaining = static_cast<std::uint16_t>((samplerCapacity - samplerNext) + samplerFreelist.size());
throw std::runtime_error(std::format("DescriptorHeapVulkan: out of sampler slots ({} requested, {} remaining of {})", count, remaining, samplerCapacity));
@ -441,23 +470,26 @@ export namespace Crafter {
// via WriteSampledImageDescriptor / WriteBufferDescriptor / sampler write.
// Caller MUST ensure no in-flight GPU frame still references the freed
// slots — typically vkDeviceWaitIdle (or a scene-switch barrier) before
// freeing. Multi-slot ranges are decomposed into their individual slots.
// noexcept: capacity is reserved at Initialize so push_back never reallocates.
// freeing. Multi-slot ranges are decomposed into their individual slots,
// each put in its sorted place (TakeRun looks for runs).
// noexcept: capacity is reserved at Initialize so inserting never reallocates.
void FreeImageSlots(ImageSlotRange r) noexcept {
for (std::uint16_t i = 0; i < r.count; ++i) {
imageFreelist.push_back(static_cast<std::uint16_t>(r.firstElement + i));
}
Release(imageFreelist, r.firstElement, r.count);
}
void FreeBufferSlots(BufferSlotRange r) noexcept {
for (std::uint16_t i = 0; i < r.count; ++i) {
bufferFreelist.push_back(static_cast<std::uint16_t>(r.firstElement + i));
}
Release(bufferFreelist, r.firstElement, r.count);
}
void FreeSamplerSlots(SamplerSlotRange r) noexcept {
for (std::uint16_t i = 0; i < r.count; ++i) {
samplerFreelist.push_back(static_cast<std::uint16_t>(r.firstElement + i));
Release(samplerFreelist, r.firstElement, r.count);
}
static void Release(std::vector<std::uint16_t>& freelist, std::uint16_t first, std::uint16_t count) noexcept {
const auto at = std::ranges::lower_bound(freelist, first);
const std::ptrdiff_t index = at - freelist.begin();
for (std::uint16_t i = 0; i < count; ++i) {
freelist.insert(freelist.begin() + index + i, static_cast<std::uint16_t>(first + i));
}
}