Catcrafts/Crafter.Graphics
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TLAS

Browse source
This commit is contained in:
Jorijn van der Graaf 2026-01-28 19:16:28 +01:00
commit e08d5f104a
3 changed files with 108 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/VulkanTriangle/main.cpp
View file

@ -23,8 +23,8 @@ int main() {
std::array<Vertex, 3> verts {{{-0.1, 0, 0}, {0, 0.1, 0}, {0.1, 0, 0}}}; std::array<Vertex, 3> verts {{{-0.1, 0, 0}, {0, 0.1, 0}, {0.1, 0, 0}}};
std::array<std::uint32_t, 3> index {{0,1,2}}; std::array<std::uint32_t, 3> index {{0,1,2}};
triangleMesh.Build(verts, index, cmd); triangleMesh.Build(verts, index, cmd);
// RenderingElement3DVulkan::elements.emplace_back(triangleMesh); RenderingElement3DVulkan::elements.emplace_back(triangleMesh);
// RenderingElement3DVulkan::BuildTLAS(cmd); RenderingElement3DVulkan::BuildTLAS(cmd);
/* /*
FinishInit executes all commands recorded to StartInit. FinishInit executes all commands recorded to StartInit.

165
implementations/Crafter.Graphics-RenderingElement3DVulkan.cpp
View file

@ -25,106 +25,99 @@ import std;
using namespace Crafter; using namespace Crafter;
//std::vector<RenderingElement3DVulkan> RenderingElement3DVulkan::elements; std::vector<RenderingElement3DVulkan> RenderingElement3DVulkan::elements;
//RenderingElement3DVulkan::RenderingElement3DVulkan(Mesh& mesh) { RenderingElement3DVulkan::RenderingElement3DVulkan(Mesh& mesh) {
// VkTransformMatrixKHR identity{}; VkTransformMatrixKHR identity{};
// float tmp[3][4] = { float tmp[3][4] = {
// {1.f, 0.f, 0.f, 0.f}, {1.f, 0.f, 0.f, 0.f},
// {0.f, 1.f, 0.f, 0.f}, {0.f, 1.f, 0.f, 0.f},
// {0.f, 0.f, 1.f, 0.f} {0.f, 0.f, 1.f, 0.f}
// }; };
// std::memcpy(identity.matrix, tmp, sizeof(tmp)); std::memcpy(identity.matrix, tmp, sizeof(tmp));
// VkAccelerationStructureDeviceAddressInfoKHR addrInfo { VkAccelerationStructureDeviceAddressInfoKHR addrInfo {
// .sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DEVICE_ADDRESS_INFO_KHR, .sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DEVICE_ADDRESS_INFO_KHR,
// .accelerationStructure = mesh.accelerationStructure .accelerationStructure = mesh.accelerationStructure
// }; };
// VkDeviceAddress blasDeviceAddr = VulkanDevice::vkGetAccelerationStructureDeviceAddressKHR(VulkanDevice::device, &addrInfo); VkDeviceAddress blasDeviceAddr = VulkanDevice::vkGetAccelerationStructureDeviceAddressKHR(VulkanDevice::device, &addrInfo);
// instance = { instance = {
// .transform = identity, .transform = identity,
// .mask = 0xFF, .mask = 0xFF,
// .accelerationStructureReference = blasDeviceAddr .accelerationStructureReference = blasDeviceAddr
// }; };
// } }
// void RenderingElement3DVulkan::BuildTLAS(VkCommandBuffer cmd) { void RenderingElement3DVulkan::BuildTLAS(VkCommandBuffer cmd) {
// VulkanBuffer<VkAccelerationStructureInstanceKHR> newBuffer(VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_2_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, elements.size()); instanceBuffer.Resize(VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, elements.size());
// for(std::uint32_t i = 0; i < elements.size(); i++) { for(std::uint32_t i = 0; i < elements.size(); i++) {
// newBuffer.value[i] = elements[i].instance; instanceBuffer.value[i] = elements[i].instance;
// } }
// VkAccelerationStructureGeometryInstancesDataKHR instancesData = VkAccelerationStructureGeometryInstancesDataKHR { VkAccelerationStructureGeometryInstancesDataKHR instancesData = VkAccelerationStructureGeometryInstancesDataKHR {
// .arrayOfPointers = VK_FALSE, .sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_INSTANCES_DATA_KHR,
// .data = {newBuffer.address} .arrayOfPointers = VK_FALSE,
// }; .data = {instanceBuffer.address}
};
// vk::AccelerationStructureGeometryDataKHR geometryData(instancesData); VkAccelerationStructureGeometryDataKHR geometryData;
geometryData.instances = instancesData;
// vk::AccelerationStructureGeometryKHR tlasGeometry{ VkAccelerationStructureGeometryKHR tlasGeometry {
// .geometryType = vk::GeometryTypeKHR::eInstances, .sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_KHR,
// .geometry = geometryData}; .geometryType = VK_GEOMETRY_TYPE_INSTANCES_KHR,
.geometry = geometryData
};
// vk::AccelerationStructureBuildGeometryInfoKHR tlasBuildGeometryInfo{ VkAccelerationStructureBuildGeometryInfoKHR tlasBuildGeometryInfo{
// .type = vk::AccelerationStructureTypeKHR::eTopLevel, .sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_GEOMETRY_INFO_KHR,
// .mode = vk::BuildAccelerationStructureModeKHR::eBuild, .type = VK_ACCELERATION_STRUCTURE_TYPE_TOP_LEVEL_KHR,
// .geometryCount = 1, .mode = VK_BUILD_ACCELERATION_STRUCTURE_MODE_BUILD_KHR,
// .pGeometries = &tlasGeometry}; .geometryCount = 1,
.pGeometries = &tlasGeometry
};
// // Query the memory sizes that will be needed for this TLAS // Query the memory sizes that will be needed for this TLAS
// auto primitiveCount = static_cast<uint32_t>(instances.size()); auto primitiveCount = static_cast<uint32_t>(elements.size());
// vk::AccelerationStructureBuildSizesInfoKHR tlasBuildSizes = VkAccelerationStructureBuildSizesInfoKHR tlasBuildSizes {
// device.getAccelerationStructureBuildSizesKHR( .sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_SIZES_INFO_KHR
// vk::AccelerationStructureBuildTypeKHR::eDevice, };
// tlasBuildGeometryInfo, VulkanDevice::vkGetAccelerationStructureBuildSizesKHR(
// {primitiveCount}); VulkanDevice::device,
VK_ACCELERATION_STRUCTURE_BUILD_TYPE_DEVICE_KHR,
&tlasBuildGeometryInfo,
&primitiveCount,
&tlasBuildSizes
);
// // Create a scratch buffer for the TLAS, this will hold temporary data scratchBuffer.Resize(VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, tlasBuildSizes.buildScratchSize);
// // during the build process tlasBuildGeometryInfo.scratchData.deviceAddress = scratchBuffer.address;
// createBuffer(
// tlasBuildSizes.buildScratchSize,
// vk::BufferUsageFlagBits::eStorageBuffer |
// vk::BufferUsageFlagBits::eShaderDeviceAddress,
// vk::MemoryPropertyFlagBits::eDeviceLocal,
// tlasScratchBuffer, tlasScratchMemory);
// // Save the scratch buffer address in the build info structure tlasBuffer.Resize(VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, tlasBuildSizes.accelerationStructureSize);
// vk::BufferDeviceAddressInfo scratchAddressInfo{.buffer = *tlasScratchBuffer};
// vk::DeviceAddress scratchAddr = device.getBufferAddressKHR(scratchAddressInfo);
// tlasBuildGeometryInfo.scratchData.deviceAddress = scratchAddr;
// // Create a buffer for the TLAS itself now that we now the required size // Create and store the TLAS handle
// createBuffer( VkAccelerationStructureCreateInfoKHR tlasCreateInfo {
// tlasBuildSizes.accelerationStructureSize, .sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_INFO_KHR,
// vk::BufferUsageFlagBits::eAccelerationStructureStorageKHR | .buffer = tlasBuffer.buffer,
// vk::BufferUsageFlagBits::eShaderDeviceAddress | .offset = 0,
// vk::BufferUsageFlagBits::eAccelerationStructureBuildInputReadOnlyKHR, .size = tlasBuildSizes.accelerationStructureSize,
// vk::MemoryPropertyFlagBits::eDeviceLocal, .type = VK_ACCELERATION_STRUCTURE_TYPE_TOP_LEVEL_KHR,
// tlasBuffer, tlasMemory); };
// // Create and store the TLAS handle VulkanDevice::CheckVkResult(VulkanDevice::vkCreateAccelerationStructureKHR(VulkanDevice::device, &tlasCreateInfo, nullptr, &accelerationStructure));
// vk::AccelerationStructureCreateInfoKHR tlasCreateInfo{ tlasBuildGeometryInfo.dstAccelerationStructure = accelerationStructure;
// .buffer = tlasBuffer,
// .offset = 0,
// .size = tlasBuildSizes.accelerationStructureSize,
// .type = vk::AccelerationStructureTypeKHR::eTopLevel,
// };
// tlas = device.createAccelerationStructureKHR(tlasCreateInfo); // Prepare the build range for the TLAS
VkAccelerationStructureBuildRangeInfoKHR tlasRangeInfo {
.primitiveCount = primitiveCount,
.primitiveOffset = 0,
.firstVertex = 0,
.transformOffset = 0
};
// // Save the TLAS handle in the build info structure VkAccelerationStructureBuildRangeInfoKHR* tlasRangeInfoPP = &tlasRangeInfo;
// tlasBuildGeometryInfo.dstAccelerationStructure = tlas; VulkanDevice::vkCmdBuildAccelerationStructuresKHR(cmd, 1, &tlasBuildGeometryInfo, &tlasRangeInfoPP);
}
// // Prepare the build range for the TLAS
// vk::AccelerationStructureBuildRangeInfoKHR tlasRangeInfo{
// .primitiveCount = primitiveCount,
// .primitiveOffset = 0,
// .firstVertex = 0,
// .transformOffset = 0};
// cmd->buildAccelerationStructuresKHR({tlasBuildGeometryInfo}, {&tlasRangeInfo});
//}

17
interfaces/Crafter.Graphics-RenderingElement3DVulkan.cppm
View file

@ -29,13 +29,16 @@ import :VulkanBuffer;
export namespace Crafter { export namespace Crafter {
class RenderingElement3DVulkan { class RenderingElement3DVulkan {
// public: public:
// Mesh* mesh; Mesh* mesh;
// VkAccelerationStructureInstanceKHR instance; VkAccelerationStructureInstanceKHR instance;
// static std::vector<RenderingElement3DVulkan> elements; static std::vector<RenderingElement3DVulkan> elements;
// inline static VulkanBuffer<VkAccelerationStructureInstanceKHR> instanceBuffer; inline static VulkanBuffer<VkAccelerationStructureInstanceKHR, true, true, false> instanceBuffer;
// RenderingElement3DVulkan(Mesh& mesh); inline static VulkanBuffer<char, false, true, false> scratchBuffer;
// static void BuildTLAS(VkCommandBuffer cmd); inline static VulkanBuffer<char, false, true, false> tlasBuffer;
inline static VkAccelerationStructureKHR accelerationStructure;
RenderingElement3DVulkan(Mesh& mesh);
static void BuildTLAS(VkCommandBuffer cmd);
}; };
} }
#endif #endif