fix(window): size the swapchain for its present mode, and key frames in flight by frame instead of image
Window - CreateSwapchain asked for exactly numFrames (3) images whatever the surface said, read them into a three-element array, and keyed the command buffers, the fences and the descriptor-heap copy holding "its" swapchain image by the acquired image index. A swapchain of another size fell back to FIFO (asked for MAILBOX or IMMEDIATE) or threw, and a surface whose minimum is above three got a create info below it (#160). Mesa's MAILBOX needs four images: Turnip on phoc, llvmpipe on any Wayland compositor. - The present mode is picked first, then the swapchain is sized by SwapchainCapabilities: the surface's counts for that mode where the instance has surface_maintenance1. With swapchain_maintenance1 the swapchain names its mode (VkSwapchainPresentModesCreateInfoKHR), which is what makes the mode's own count the one that applies, at creation and to the forward progress of a UINT64_MAX acquire; without it the stricter of the mode's and the surface's counts for all modes. It asks for numFrames or that minimum where more, never past the maximum (SwapchainMinImageCount). Turnip's FIFO keeps its three images and MAILBOX gets four. The FIFO fallback and presentModeUnfit are gone. - images, imageViewInfos (was imageViews: they are create-infos), the made imageViews that descriptor sets take, imageInitialised and the render-finished semaphores are per image, as many as the driver made. The views are made once per swapchain. The semaphores only grow, since a present of the old swapchain may still wait on one. - Frames in flight stay numFrames, keyed by currentFrame, frameCounter % numFrames: the command buffer, the fence, the acquire semaphore, the heap copy (or set), RenderingElement3D::tlases, the frameIdx a pass is recorded with. currentImage is the acquired image. currentBuffer is gone, so code that used it stops compiling instead of picking the wrong one; RenderPass::Record's frameIdx keeps its name and is now the frame slot, as RenderPass.cppm says. - The frame's fence is waited before the acquire. The acquire semaphores need no spare then, and a frame waits for exactly the one numFrames before it, which the deletion queue and the staging rings count on and fences keyed by image did not promise once images come back out of order. The swapchain slots are written before the fence is reset. - From the acquire to the present the window is recording: a Resize or SetPresentMode from a listener (a VSync key ticked in onUpdate) takes effect after the present, through RebuildSwapchain, together with a present that found the swapchain out of date. Rebuilding mid-frame used to destroy the image the frame was drawing into; with images sized per swapchain it would also index past the new one's end. DescriptorHeapVulkan - Frames and images pair up differently from frame to frame, so no heap copy can keep one swapchain image. AddSwapchainSlot(slot, window) lists an image slot as that window's swapchain image, and Window::Render writes the image a frame acquired into its window's listed slots in that frame's copy, or its set, before onUpdate, skipping a slot that holds it already. A slot is one window's, so two windows can share a heap without writing each other's slots under each other's frames in flight. A slot listed during a frame its window records is written at once. A slot past the heap's image slots, an empty ImageSlot's 0xFFFF among them, is refused. Freeing a slot unlists it, as does initialising the heap in either binding model. WriteImageSet, the one use of which this replaces, is gone, and with it the per-frame dimension of setImageViews. Device - VK_KHR_surface_maintenance1 (or EXT) and VK_KHR_get_surface_capabilities2 are enabled where the loader has them (surfaceMaintenance1Supported, vkGetPhysicalDeviceSurfaceCapabilities2KHR), and the matching swapchain_maintenance1 with its feature where the device has it (swapchainMaintenance1Supported). - DistinctGpus groups the physical devices by GPU as CRAFTER_GRAPHICS_DEVICE numbers them, for ChooseGpu and tests. UI - UIRenderer lists its output slot instead of writing every copy itself, and again on every resize; the resize listener is gone on both backends. The headers' frameIdx is currentFrame. Examples - VulkanTriangle, Sponza, SponzaBench and RTVolume list their output slot and write only the per-frame TLASes. They wrote imageViews[f] into copy f once, which a resize left pointing at destroyed images. Tests - SwapchainImageCount: SwapchainMinImageCount on the numbers drivers report; every offered mode keeps its mode and gets what the window asks for; every frame presents the colour it drew, read back a texel per frame; a switch and a resize asked for during a frame wait for its present; a slot listed during a frame holds its image at once; two windows on one heap draw their own colours. The frame checks run again in child processes, through CRAFTER_GRAPHICS_DEVICE, on a GPU whose swapchains have more images than frames (this one, else llvmpipe), in each binding model the parent didn't cover; a child skips only for a GPU that can't run the library, and checks it runs the model it was asked for. - FrameLoopSync checks the frame slot follows the frame counter and counts the swapchain's own images. HeapASRead, HeapDynamicIndexHit and RTPassPushData list their swapchain slot and drop their resize rewrites. Docs - README, AGENTS.md and AGENTS.consumer.md: frames and images, the swapchain slots, rebuilds held to the present, the new optional groups. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
6f471ca6b1
commit
234fcce099
29 changed files with 1378 additions and 550 deletions
34
README.md
34
README.md
|
|
@ -91,18 +91,36 @@ shaded through an intersection shader with an any-hit cut-out.
|
|||
compositor has them. Without xdg-decoration (GNOME) the window has no
|
||||
title bar, as the library draws no client-side decorations; when either
|
||||
of the other two is missing it draws at scale 1, and the compositor
|
||||
scales it up on a HiDPI output.
|
||||
scales it up on a HiDPI output. Natively the frame loop keeps three
|
||||
frames in flight (`Window::numFrames`) over however many images the
|
||||
swapchain has: as many as its present mode needs. Where the instance has
|
||||
`surface_maintenance1` and the device `swapchain_maintenance1`, that is
|
||||
the mode's own count, which on Mesa's Wayland is below the surface's
|
||||
count for all modes (FIFO three, Mailbox four); without, the stricter
|
||||
of the two. `window.currentFrame` picks what lives per frame in flight
|
||||
(the command buffer, the descriptor-heap copy,
|
||||
`RenderingElement3D::tlases`, the `frameIdx` a pass is recorded with);
|
||||
`window.currentImage` is the swapchain image the frame draws into,
|
||||
`window.images[window.currentImage]`. A shader reads that image from a
|
||||
heap slot listed with `heap.AddSwapchainSlot(slot, window)`, which the
|
||||
window rewrites with the acquired image every frame, so nothing is
|
||||
rewritten after a resize, and two windows can share a heap. A `Resize`
|
||||
or `SetPresentMode` from a listener of the frame being recorded takes
|
||||
effect after that frame's present.
|
||||
- **Device** *(Vulkan only)* — single-instance bring-up targeting
|
||||
`VK_EXT_descriptor_heap`; pipelines are created with
|
||||
`VK_PIPELINE_CREATE_2_DESCRIPTOR_HEAP_BIT_EXT` so there are no
|
||||
descriptor-set layouts and push constants travel via
|
||||
`vkCmdPushDataEXT`. Needs Vulkan 1.3. The heap, ray tracing and
|
||||
device-fault extensions are optional groups, detected at start-up
|
||||
(`Device::descriptorHeapSupported`, `rayTracingSupported`,
|
||||
`deviceFaultSupported`). Device features split by who uses them: the
|
||||
ones the binding model and the library's own shaders need are the
|
||||
library's to enable; arithmetic, storage and layout features an
|
||||
application's shaders use (`shaderInt16` for a `uint16_t` spec
|
||||
`vkCmdPushDataEXT`. Needs Vulkan 1.3. The heap, ray tracing,
|
||||
device-fault and swapchain-maintenance extensions are optional groups,
|
||||
detected at start-up (`Device::descriptorHeapSupported`,
|
||||
`rayTracingSupported`, `deviceFaultSupported`,
|
||||
`swapchainMaintenance1Supported`), as is the instance's
|
||||
`surface_maintenance1` (`surfaceMaintenance1Supported`). Device
|
||||
features split by who uses them: the ones the binding model and the
|
||||
library's own shaders need are the library's to enable; arithmetic,
|
||||
storage and layout features an application's shaders use
|
||||
(`shaderInt16` for a `uint16_t` spec
|
||||
constant, `scalarBlockLayout`, fp16, 16-bit storage) are the
|
||||
application's to ask for, as core feature structs:
|
||||
`Device::Initialize({.vulkan10 = {.shaderInt16 = VK_TRUE}})`. A second
|
||||
|
|
|
|||
Loading…
Reference in a new issue