Crafter.Graphics/tests/SwapchainBarrierScope/main.cpp

197 lines
10 KiB
C++
Raw Normal View History

2026-07-22 18:09:06 +02:00
//SPDX-License-Identifier: LGPL-3.0-only
//SPDX-FileCopyrightText: Copyright (C) 2026 Catcrafts®
// Issue #115: the frame loop's inter-pass and frame-edge (acquire/present)
// barriers used to set BOTH stage masks to VK_PIPELINE_STAGE_ALL_COMMANDS_BIT
// and the inter-pass dependency to a queue-wide VkMemoryBarrier — flushing
// every cache and fully serialising against the whole pipeline every frame,
// when all the next pass needs is the swapchain image the previous one wrote.
//
// The fix scopes the inter-pass dependency to the swapchain image's single
// colour subresource (BuildSwapchainInterPassBarrier) and narrows the stage
// masks to the stages that actually touch that image, derived per pass via the
// polymorphic RenderPass::SwapchainStage() and unioned across the frame by
// SwapchainStageUnion. The load-bearing correctness constraint is that this
// derivation is per-pass: a compute pass writes via COMPUTE_SHADER, a ray-
// tracing pass via RAY_TRACING_SHADER, so a hardcoded compute mask would
// UNDER-synchronise an RT pass and corrupt the image. All three helpers are
// pure CPU logic over the pass list, so this test drives them directly with no
// GPU device at runtime — mirroring MipChainBarrierBatch / UploadStrategy.
#include <cstdlib>
#include "vulkan/vulkan.h"
import Crafter.Graphics;
import std;
using namespace Crafter;
namespace {
int failures = 0;
void Check(bool ok, std::string_view what) {
std::println("{} {}", ok ? "PASS" : "FAIL", what);
if (!ok) ++failures;
}
// A pass that never overrides SwapchainStage(): stands in for any future pass
// that forgets to narrow its stage, and must fall back to the conservative
// writer union rather than silently picking one stage (which could under-sync).
struct DefaultPass : RenderPass {
void Record(GraphicsCommandBuffer, std::uint32_t, Window&) override {}
};
VkImage SentinelImage() {
return reinterpret_cast<VkImage>(static_cast<std::uintptr_t>(0xC0FFEE));
}
} // namespace
int main() {
// ─── per-pass SwapchainStage() polymorphism ─────────────────────────────
// The whole reason the fix is "moderate, not trivial": these two stages
// MUST differ, or scoping an RT pass's barrier to the compute stage would
// under-synchronise it. Pin that they are distinct and each correct.
Check(VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT != VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR,
"compute and ray-tracing write stages are distinct (the under-sync trap)");
UIRenderer ui; // real compute UI pass
RTPass rt(nullptr); // real RT pass (SwapchainStage doesn't touch the pipeline)
DefaultPass def; // un-overridden fallback
// Access through the base pointer — the frame loop only ever sees RenderPass*.
RenderPass* uiBase = &ui;
RenderPass* rtBase = &rt;
RenderPass* defBase = &def;
Check(uiBase->SwapchainStage() == VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
"UIRenderer reports the COMPUTE_SHADER stage");
Check(rtBase->SwapchainStage() == VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR,
"RTPass reports the RAY_TRACING_SHADER stage");
Check(defBase->SwapchainStage() == kSwapchainWriterStages,
"an un-overridden pass falls back to the conservative writer union");
// ─── the conservative writer union constant ─────────────────────────────
constexpr VkPipelineStageFlags expectedUnion =
VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT
| VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR
| VK_PIPELINE_STAGE_TRANSFER_BIT;
Check(kSwapchainWriterStages == expectedUnion,
"writer union = COMPUTE_SHADER | RAY_TRACING_SHADER | TRANSFER");
// The point of the whole change: even the conservative fallback is far
// tighter than the ALL_COMMANDS mask it replaces.
Check(kSwapchainWriterStages != VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
"writer union is narrower than ALL_COMMANDS");
// ─── SwapchainStageUnion over the frame's pass list ─────────────────────
// Empty frame: no writers to derive from, so fall back to the conservative
// union (the image is still transitioned, just never written).
Check(SwapchainStageUnion(std::span<RenderPass* const>{}) == kSwapchainWriterStages,
"empty pass list falls back to the conservative writer union");
// All-compute frame: the union narrows to COMPUTE_SHADER ONLY — this is the
// real perf win, no RAY_TRACING / TRANSFER / ALL_COMMANDS dragged in.
{
std::array<RenderPass*, 2> computeOnly = {uiBase, uiBase};
VkPipelineStageFlags u = SwapchainStageUnion(computeOnly);
Check(u == VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
"all-compute frame narrows the union to COMPUTE_SHADER only");
Check((u & VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR) == 0,
"all-compute frame does NOT pull in RAY_TRACING_SHADER");
}
// RT-only frame: narrows to RAY_TRACING_SHADER only.
{
std::array<RenderPass*, 1> rtOnly = {rtBase};
Check(SwapchainStageUnion(rtOnly) == VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR,
"RT-only frame narrows the union to RAY_TRACING_SHADER only");
}
// Mixed frame: the union folds in BOTH stages — never under-syncs the RT
// pass, never over-syncs to ALL_COMMANDS.
{
std::array<RenderPass*, 2> mixed = {uiBase, rtBase};
VkPipelineStageFlags u = SwapchainStageUnion(mixed);
Check(u == (VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT | VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR),
"mixed compute+RT frame unions COMPUTE_SHADER | RAY_TRACING_SHADER");
Check((u & VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR) != 0,
"mixed frame keeps RAY_TRACING_SHADER (no RT under-sync)");
}
// A frame containing an un-overridden pass conservatively widens to the
// full writer union — safe by construction.
{
std::array<RenderPass*, 2> withDefault = {uiBase, defBase};
Check(SwapchainStageUnion(withDefault) == kSwapchainWriterStages,
"a frame with an un-overridden pass widens to the conservative union");
}
// ─── BuildSwapchainInterPassBarrier ─────────────────────────────────────
// Replaces the queue-wide VkMemoryBarrier: an image memory barrier scoped
// to the swapchain image's single colour subresource, GENERAL->GENERAL (no
// layout change — the storage image stays bound), matching the intra-pass
// UI barrier's access scope.
{
VkImageMemoryBarrier b = BuildSwapchainInterPassBarrier(SentinelImage());
Check(b.sType == VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, "inter-pass barrier sType is IMAGE_MEMORY_BARRIER");
Check(b.image == SentinelImage(), "inter-pass barrier carries the swapchain image handle");
Check(b.oldLayout == VK_IMAGE_LAYOUT_GENERAL && b.newLayout == VK_IMAGE_LAYOUT_GENERAL,
"inter-pass barrier is GENERAL->GENERAL (pure memory dependency, no transition)");
Check(b.srcAccessMask == VK_ACCESS_SHADER_WRITE_BIT,
"inter-pass barrier src access is shader write");
Check(b.dstAccessMask == (VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT),
"inter-pass barrier dst access is shader read|write");
Check(b.srcQueueFamilyIndex == VK_QUEUE_FAMILY_IGNORED && b.dstQueueFamilyIndex == VK_QUEUE_FAMILY_IGNORED,
"inter-pass barrier is not a queue-family transfer");
Check(b.subresourceRange.aspectMask == VK_IMAGE_ASPECT_COLOR_BIT,
"inter-pass barrier covers the colour aspect");
Check(b.subresourceRange.levelCount == 1 && b.subresourceRange.layerCount == 1,
"inter-pass barrier is scoped to the single swapchain subresource");
}
fix(window): silence per-frame and setup-path Vulkan validation errors (#153) Two distinct validation errors the native frame loop emitted, both originating in Crafter.Graphics with no consumer-side influence. Problem 1 — per-frame acquire-barrier access/stage mismatch. The acquire->GENERAL barrier hardcoded dstAccessMask = SHADER_WRITE|TRANSFER_WRITE but used the per-pass stage union as its dst stage mask. For an all-compute frame the union narrows to COMPUTE_SHADER, which does not support TRANSFER_WRITE, so VUID-02820 fired every frame. Derive the access mask from the same stage union via a new SwapchainWriterAccess() helper (mirroring SwapchainStageUnion), and apply it to both the acquire dst and present src masks for symmetry. Problem 2 — mid-session StartInit/FinishInit (and GetCmd/EndCmd) reuse the shared drawCmdBuffers[currentBuffer]. With no steady-state wait-idle the loop's last submission of that buffer may still be in flight when scene setup runs (building map meshes / acceleration structures), so the old code re-began (VUID-00049) and re-submitted (VUID-00071) a pending buffer, and resources freed in the StartInit..FinishInit bracket could still be referenced by it. Drain the queue at the start of StartInit/GetCmd before re-recording; setup is rare, so a wait-idle is fine (FinishInit/EndCmd already wait-idle at the end). Tests: extend SwapchainBarrierScope with SwapchainWriterAccess coverage (pure CPU), and add SetupCmdBufferReuse — a real-frame-loop regression test driving a compute pass plus interleaved mid-session StartInit rounds, asserting the validation layer stays silent. Verified both halves fail (reproducing the exact VUIDs) when their respective fix is reverted. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-18 18:04:25 +00:00
// ─── SwapchainWriterAccess (issue #153) ─────────────────────────────────
// The frame-edge (acquire dst / present src) barriers must set an access
// mask supported by their accompanying stage mask
// (VUID-vkCmdPipelineBarrier-pImageMemoryBarriers-02820). The old code
// hardcoded SHADER_WRITE|TRANSFER_WRITE on a barrier whose stage mask is the
// per-pass union, so an all-compute frame carried TRANSFER_WRITE into a
// COMPUTE_SHADER dst stage and fired the VUID every frame. The fix derives
// the access from the same stage union, so each stage only pulls in the
// access flags it actually supports.
{
// All-compute frame: COMPUTE_SHADER supports SHADER_WRITE only — and
// crucially NOT TRANSFER_WRITE (the bit that fired the VUID).
VkAccessFlags compute = SwapchainWriterAccess(VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT);
Check(compute == VK_ACCESS_SHADER_WRITE_BIT,
"compute-only writer access is SHADER_WRITE only");
Check((compute & VK_ACCESS_TRANSFER_WRITE_BIT) == 0,
"compute-only writer access does NOT include TRANSFER_WRITE (the VUID-02820 trap)");
// RT frame: RAY_TRACING_SHADER also writes via SHADER_WRITE, no transfer.
Check(SwapchainWriterAccess(VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR) == VK_ACCESS_SHADER_WRITE_BIT,
"RT-only writer access is SHADER_WRITE only");
// A transfer-stage writer pulls in TRANSFER_WRITE.
Check(SwapchainWriterAccess(VK_PIPELINE_STAGE_TRANSFER_BIT) == VK_ACCESS_TRANSFER_WRITE_BIT,
"transfer-only writer access is TRANSFER_WRITE only");
// The conservative writer union (un-overridden / empty frame) folds in
// both — and every bit it sets is supported by some stage in the union.
Check(SwapchainWriterAccess(kSwapchainWriterStages)
== (VK_ACCESS_SHADER_WRITE_BIT | VK_ACCESS_TRANSFER_WRITE_BIT),
"conservative writer union access is SHADER_WRITE | TRANSFER_WRITE");
// Mixed compute+RT (no transfer): still SHADER_WRITE only, no transfer.
VkAccessFlags mixed = SwapchainWriterAccess(
VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT | VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR);
Check(mixed == VK_ACCESS_SHADER_WRITE_BIT,
"compute+RT writer access is SHADER_WRITE only (no spurious TRANSFER_WRITE)");
}
if (failures != 0) {
std::println("{} check(s) failed", failures);
return EXIT_FAILURE;
}
std::println("all checks passed");
return EXIT_SUCCESS;
}