Two gaps in the Vulkan RT path that fault the device on the NVIDIA
proprietary driver with a non-trivial pipeline (simple VulkanTriangle
never hit them):
1. maxPipelineRayRecursionDepth was hardcoded to 1, so any closest-hit
shader that traces a secondary ray (shadow ray — a very common
pattern) recursed past the pipeline limit (UB → device fault).
PipelineRTVulkan::Init now takes a maxRecursionDepth parameter
(default 1, clamped to the device's maxRayRecursionDepth).
2. The NVIDIA descriptor-heap AS-read workaround rewrites every shader
that reads an accelerationStructureEXT from the heap — including
compute shaders — to read the TLAS device address from a push
constant, but only RTPass pushed that address. A compute shader that
ray-queries the TLAS (rayQueryEXT) therefore ran against an unwritten
push slot → garbage AS handle → VK_ERROR_DEVICE_LOST.
WorkaroundNvidiaAS::Patch now returns a per-shader PatchResult
{patched, tlasPushOffset} instead of writing the clobber-prone global
Device::workaroundTlasPushOffset (removed). VulkanShader stores it;
ShaderBindingTableVulkan/PipelineRTVulkan carry it for RTPass, and
ComputeShader tracks its own offset and pushes the caller-supplied
TLAS address in Dispatch (new defaulted tlasAddress parameter),
mirroring RTPass::Record.
The PushConstantRewrite regression test now asserts Patch's returned
patched/offset and adds two ray-querying compute-shader cases, proving
the rewrite is stage-agnostic and the per-shader offset is correct.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
137 lines
6.9 KiB
C++
137 lines
6.9 KiB
C++
/*
|
|
Crafter®.Graphics
|
|
Copyright (C) 2026 Catcrafts®
|
|
catcrafts.net
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License version 3.0 as published by the Free Software Foundation;
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with this library; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
module;
|
|
#ifndef CRAFTER_GRAPHICS_WINDOW_DOM
|
|
#include "vulkan/vulkan.h"
|
|
#endif // !CRAFTER_GRAPHICS_WINDOW_DOM
|
|
export module Crafter.Graphics:PipelineRTVulkan;
|
|
#ifndef CRAFTER_GRAPHICS_WINDOW_DOM
|
|
import std;
|
|
import :Device;
|
|
import :VulkanBuffer;
|
|
import :ShaderBindingTableVulkan;
|
|
import :Types;
|
|
|
|
export namespace Crafter {
|
|
struct PipelineRTVulkan {
|
|
VkPipeline pipeline;
|
|
std::vector<std::uint8_t> shaderHandles;
|
|
VulkanBuffer<std::uint8_t, true> sbtBuffer;
|
|
VkStridedDeviceAddressRegionKHR raygenRegion;
|
|
VkStridedDeviceAddressRegionKHR missRegion;
|
|
VkStridedDeviceAddressRegionKHR hitRegion;
|
|
VkStridedDeviceAddressRegionKHR callableRegion;
|
|
|
|
// NVIDIA descriptor-heap AS-read workaround (issue #15 / #7): copied
|
|
// from the shader table at Init so RTPass can push the active TLAS
|
|
// device address into the patched shaders' push constant. Inert on
|
|
// every other driver.
|
|
bool workaroundNeedsTlas = false;
|
|
std::uint32_t workaroundTlasPushOffset = 0;
|
|
|
|
// maxRecursionDepth: the maximum ray-recursion depth the pipeline must
|
|
// support — i.e. the deepest chain of nested traceRayEXT calls. The
|
|
// raygen counts as depth 1, so a closest-hit shader that traces a shadow
|
|
// ray needs 2. Tracing beyond the value the pipeline was created with is
|
|
// undefined behaviour and faults the device, so a consumer with any
|
|
// recursion past the raygen must raise this. Defaults to 1 (raygen-only,
|
|
// matching the simple examples) and is clamped to the device's
|
|
// maxRayRecursionDepth.
|
|
void Init(VkCommandBuffer cmd, std::span<VkRayTracingShaderGroupCreateInfoKHR> raygenGroups, std::span<VkRayTracingShaderGroupCreateInfoKHR> missGroups, std::span<VkRayTracingShaderGroupCreateInfoKHR> hitGroups, ShaderBindingTableVulkan& shaderTable, std::uint32_t maxRecursionDepth = 1) {
|
|
workaroundNeedsTlas = shaderTable.workaroundNeedsTlas;
|
|
workaroundTlasPushOffset = shaderTable.workaroundTlasPushOffset;
|
|
|
|
std::vector<VkRayTracingShaderGroupCreateInfoKHR> groups;
|
|
groups.reserve(raygenGroups.size() + missGroups.size() + hitGroups.size());
|
|
|
|
groups.insert(groups.end(), raygenGroups.begin(), raygenGroups.end());
|
|
groups.insert(groups.end(), missGroups.begin(), missGroups.end());
|
|
groups.insert(groups.end(), hitGroups.begin(), hitGroups.end());
|
|
|
|
VkPipelineCreateFlags2CreateInfo flags2 = {
|
|
.sType = VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO,
|
|
.flags = VK_PIPELINE_CREATE_2_DESCRIPTOR_HEAP_BIT_EXT
|
|
};
|
|
|
|
VkRayTracingPipelineCreateInfoKHR rtPipelineInfo {
|
|
.sType = VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CREATE_INFO_KHR,
|
|
.pNext = &flags2,
|
|
.flags = 0,
|
|
.stageCount = static_cast<std::uint32_t>(shaderTable.shaderStages.size()),
|
|
.pStages = shaderTable.shaderStages.data(),
|
|
.groupCount = static_cast<std::uint32_t>(groups.size()),
|
|
.pGroups = groups.data(),
|
|
.maxPipelineRayRecursionDepth = std::min(maxRecursionDepth, Device::rayTracingProperties.maxRayRecursionDepth),
|
|
.layout = VK_NULL_HANDLE
|
|
};
|
|
|
|
Device::CheckVkResult(Device::vkCreateRayTracingPipelinesKHR(Device::device, {}, {}, 1, &rtPipelineInfo, nullptr, &pipeline));
|
|
|
|
std::size_t dataSize = Device::rayTracingProperties.shaderGroupHandleSize * rtPipelineInfo.groupCount;
|
|
shaderHandles.resize(dataSize);
|
|
Device::CheckVkResult(Device::vkGetRayTracingShaderGroupHandlesKHR(Device::device, pipeline, 0, rtPipelineInfo.groupCount, dataSize, shaderHandles.data()));
|
|
|
|
std::uint32_t sbtStride = AlignUp(Device::rayTracingProperties.shaderGroupHandleSize, Device::rayTracingProperties.shaderGroupHandleAlignment);
|
|
|
|
raygenRegion.stride = sbtStride;
|
|
raygenRegion.deviceAddress = 0;
|
|
raygenRegion.size = raygenGroups.size() * sbtStride;
|
|
|
|
missRegion.stride = sbtStride;
|
|
missRegion.deviceAddress = AlignUp(raygenRegion.size, Device::rayTracingProperties.shaderGroupBaseAlignment);
|
|
missRegion.size = missGroups.size() * sbtStride;
|
|
|
|
hitRegion.stride = sbtStride;
|
|
hitRegion.deviceAddress = AlignUp(missRegion.deviceAddress + missRegion.size, Device::rayTracingProperties.shaderGroupBaseAlignment);
|
|
hitRegion.size = hitGroups.size() * sbtStride;
|
|
|
|
std::size_t bufferSize = hitRegion.deviceAddress + hitRegion.size;
|
|
sbtBuffer.Create(VK_BUFFER_USAGE_2_SHADER_BINDING_TABLE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, bufferSize);
|
|
|
|
std::uint8_t* offset = sbtBuffer.value;
|
|
std::uint8_t* handleOffset = shaderHandles.data();
|
|
|
|
std::memcpy(offset, handleOffset, raygenGroups.size() * Device::rayTracingProperties.shaderGroupHandleSize);
|
|
offset += AlignUp(raygenRegion.size, Device::rayTracingProperties.shaderGroupBaseAlignment);
|
|
handleOffset += raygenGroups.size() * Device::rayTracingProperties.shaderGroupHandleSize;
|
|
|
|
std::memcpy(offset, handleOffset, missGroups.size() * Device::rayTracingProperties.shaderGroupHandleSize);
|
|
offset += AlignUp(missRegion.size, Device::rayTracingProperties.shaderGroupBaseAlignment);
|
|
handleOffset += missGroups.size() * Device::rayTracingProperties.shaderGroupHandleSize;
|
|
|
|
std::memcpy(offset, handleOffset, hitGroups.size() * Device::rayTracingProperties.shaderGroupHandleSize);
|
|
|
|
sbtBuffer.FlushDevice(cmd, VK_ACCESS_MEMORY_READ_BIT, VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR);
|
|
|
|
raygenRegion.deviceAddress += sbtBuffer.address;
|
|
missRegion.deviceAddress += sbtBuffer.address;
|
|
hitRegion.deviceAddress += sbtBuffer.address;
|
|
|
|
callableRegion.deviceAddress = 0;
|
|
callableRegion.stride = 0;
|
|
callableRegion.size = 0;
|
|
}
|
|
|
|
~PipelineRTVulkan() {
|
|
vkDestroyPipeline(Device::device, pipeline, nullptr);
|
|
}
|
|
};
|
|
}
|
|
#endif // !CRAFTER_GRAPHICS_WINDOW_DOM
|