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>
96 lines
5 KiB
C++
96 lines
5 KiB
C++
//SPDX-License-Identifier: LGPL-3.0-only
|
|
//SPDX-FileCopyrightText: Copyright (C) 2026 Catcrafts®
|
|
|
|
module;
|
|
#ifndef CRAFTER_GRAPHICS_WINDOW_DOM
|
|
#include "vulkan/vulkan.h"
|
|
#endif // !CRAFTER_GRAPHICS_WINDOW_DOM
|
|
export module Crafter.Graphics:ComputeShader;
|
|
#ifndef CRAFTER_GRAPHICS_WINDOW_DOM
|
|
import std;
|
|
import :Device;
|
|
import :DescriptorHeapVulkan;
|
|
|
|
export namespace Crafter {
|
|
// Tier 1: thin compute-pipeline wrapper. Owns one VkPipeline. Use this to
|
|
// dispatch the four standard UI shaders and any user-authored compute
|
|
// shader that follows the ui-shared.glsl contract.
|
|
//
|
|
// The pipeline follows the device's binding model
|
|
// (Device::descriptorHeapSupported):
|
|
// heap -> created with VK_PIPELINE_CREATE_2_DESCRIPTOR_HEAP_BIT_EXT and
|
|
// no pipeline layout; the bindless heap supplies all bindings
|
|
// and push constants travel via vkCmdPushDataEXT.
|
|
// sets -> created from the shader's <name>.sets.spv build against the
|
|
// heap object's shared pipeline layout; the bindless descriptor
|
|
// set supplies the bindings and push constants travel via
|
|
// vkCmdPushConstants.
|
|
class ComputeShader {
|
|
public:
|
|
VkPipeline pipeline = VK_NULL_HANDLE;
|
|
// Sets mode only: the pipeline layout of the heap this shader was
|
|
// loaded against, needed again by vkCmdPushConstants. Not owned — it
|
|
// belongs to that DescriptorHeapVulkan. VK_NULL_HANDLE in heap mode.
|
|
VkPipelineLayout layout = VK_NULL_HANDLE;
|
|
|
|
// NVIDIA descriptor-heap AS-read workaround (issue #15 / #7): set by
|
|
// Load when this shader ray-queries the TLAS through the descriptor
|
|
// heap and was rewritten to read its device address from a push
|
|
// constant. `workaroundTlasPushOffset` is the byte offset of that member
|
|
// (after the caller's own push payload, or 0 if the shader had none).
|
|
// Tracked per-shader — a global is clobbered by whichever shader was
|
|
// patched last. Both inert (false/0) on every other driver.
|
|
bool workaroundNeedsTlas = false;
|
|
std::uint32_t workaroundTlasPushOffset = 0;
|
|
|
|
ComputeShader() = default;
|
|
ComputeShader(const ComputeShader&) = delete;
|
|
ComputeShader& operator=(const ComputeShader&) = delete;
|
|
ComputeShader(ComputeShader&& other) noexcept;
|
|
ComputeShader& operator=(ComputeShader&& other) noexcept;
|
|
~ComputeShader();
|
|
|
|
// Loads a SPIR-V compute shader from disk and creates its pipeline.
|
|
// Loading again replaces the pipeline. The old one, like the one a
|
|
// ComputeShader holds when it's destroyed or moved over, goes through
|
|
// the deferred-deletion queue: a frame in flight may still dispatch it.
|
|
//
|
|
// `spvPath` always names the descriptor-heap build (<name>.spv). On a
|
|
// device without the heap, the <name>.sets.spv build next to it is
|
|
// loaded instead, so the caller never branches on the binding model;
|
|
// a missing .sets.spv throws, naming the file.
|
|
//
|
|
// `heap` must already be Initialize()d and must be the heap assigned
|
|
// to Window::descriptorHeap for every frame this shader is dispatched
|
|
// in: in sets mode the pipeline is built against that heap's layout,
|
|
// and Window::Render binds that heap's descriptor set.
|
|
void Load(const std::filesystem::path& spvPath, DescriptorHeapVulkan& heap);
|
|
|
|
// Bind, push constants (if any), dispatch. Caller computes group counts
|
|
// and is responsible for any inter-dispatch barriers (UIRenderer::Dispatch
|
|
// wraps this with the standard write-after-write barrier).
|
|
//
|
|
// pushBytes should be a multiple of 4 (Vulkan requires it for both
|
|
// push mechanisms). On a device without the descriptor heap the
|
|
// payload travels as ordinary push constants, so it must also fit
|
|
// the device's maxPushConstantsSize (256 bytes on common drivers); a
|
|
// larger one throws std::length_error. Keep push blocks within that
|
|
// if the shader is meant to run on both binding models.
|
|
//
|
|
// tlasAddress is the NVIDIA descriptor-heap AS-read workaround hook
|
|
// (issue #15 / #7): a shader that ray-queries the TLAS through the
|
|
// descriptor heap is rewritten to read its device address from a push
|
|
// constant, so the caller must supply the active frame's TLAS address
|
|
// (RenderingElement3D::tlases[frameIdx].address) here. It is pushed at
|
|
// the shader's workaroundTlasPushOffset only when the shader was
|
|
// rewritten (workaroundNeedsTlas) — ignored otherwise and on every
|
|
// other driver, so shaders that don't touch an AS pass nothing.
|
|
void Dispatch(VkCommandBuffer cmd,
|
|
const void* push, std::uint32_t pushBytes,
|
|
std::uint32_t gx,
|
|
std::uint32_t gy = 1,
|
|
std::uint32_t gz = 1,
|
|
VkDeviceAddress tlasAddress = 0) const;
|
|
};
|
|
}
|
|
#endif // !CRAFTER_GRAPHICS_WINDOW_DOM
|