-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adding raytracing support (1): acceleration struct (#10)
* Adding raytracing support (1): acceleration struct * Fixup linux github script
- Loading branch information
Showing
12 changed files
with
176 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| // Copyright (C) Krzysztof Jakubowski <[email protected]> | ||
| // This file is part of libfwk. See license.txt for details. | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "fwk/vulkan/vulkan_storage.h" | ||
| #include "fwk/vulkan_base.h" | ||
|
|
||
| namespace fwk { | ||
|
|
||
| DEFINE_ENUM(VAccelStructType, top_level, bottom_level); | ||
|
|
||
| class VulkanAccelStruct : public VulkanObjectBase<VulkanAccelStruct> { | ||
| public: | ||
| static Ex<PVAccelStruct> create(VulkanDevice &, VAccelStructType, VBufferSpan<char>); | ||
|
|
||
| static Ex<PVAccelStruct> build(VulkanDevice &, VBufferSpan<float3> vertices, | ||
| VBufferSpan<u32> indices); | ||
|
|
||
| private: | ||
| friend class VulkanDevice; | ||
| VulkanAccelStruct(VkAccelerationStructureKHR, VObjectId, PVBuffer); | ||
| ~VulkanAccelStruct(); | ||
|
|
||
| PVBuffer m_buffer; | ||
| }; | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| // Copyright (C) Krzysztof Jakubowski <[email protected]> | ||
| // This file is part of libfwk. See license.txt for details. | ||
|
|
||
| #include "fwk/vulkan/vulkan_ray_tracing.h" | ||
|
|
||
| #include "fwk/enum_map.h" | ||
| #include "fwk/sys/assert.h" | ||
| #include "fwk/vulkan/vulkan_command_queue.h" | ||
| #include "fwk/vulkan/vulkan_device.h" | ||
| #include "fwk/vulkan/vulkan_internal.h" | ||
| #include "fwk/vulkan/vulkan_memory_manager.h" | ||
|
|
||
| namespace fwk { | ||
|
|
||
| VulkanAccelStruct::VulkanAccelStruct(VkAccelerationStructureKHR handle, VObjectId id, | ||
| PVBuffer buffer) | ||
| : VulkanObjectBase(handle, id), m_buffer(std::move(buffer)) {} | ||
|
|
||
| VulkanAccelStruct::~VulkanAccelStruct() { | ||
| deferredRelease(vkDestroyAccelerationStructureKHR, m_handle); | ||
| } | ||
|
|
||
| Ex<PVAccelStruct> VulkanAccelStruct::create(VulkanDevice &device, VAccelStructType type, | ||
| VBufferSpan<char> buffer) { | ||
| DASSERT(buffer.byteOffset() % 256 == 0); | ||
|
|
||
| VkAccelerationStructureCreateInfoKHR create_info{ | ||
| VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_INFO_KHR}; | ||
| create_info.buffer = buffer.buffer().handle(); | ||
| create_info.offset = buffer.byteOffset(); | ||
| create_info.size = buffer.byteOffset(); | ||
| create_info.type = VkAccelerationStructureTypeKHR(type); | ||
|
|
||
| VkAccelerationStructureKHR handle = 0; | ||
| FWK_VK_EXPECT_CALL(vkCreateAccelerationStructureKHR, device.handle(), &create_info, nullptr, | ||
| &handle); | ||
| return device.createObject(handle, buffer.buffer()); | ||
| } | ||
|
|
||
| template <class T> static u64 getAddress(VulkanDevice &device, VBufferSpan<T> buffer) { | ||
| VkBufferDeviceAddressInfo info = {VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO}; | ||
| info.buffer = buffer.buffer().handle(); | ||
| return vkGetBufferDeviceAddress(device.handle(), &info) + buffer.byteOffset(); | ||
| } | ||
|
|
||
| Ex<PVAccelStruct> VulkanAccelStruct::build(VulkanDevice &device, VBufferSpan<float3> vertices, | ||
| VBufferSpan<u32> indices) { | ||
| VkAccelerationStructureGeometryTrianglesDataKHR triangles{ | ||
| VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR}; | ||
| triangles.vertexFormat = VK_FORMAT_R32G32B32_SFLOAT; | ||
| triangles.vertexData.deviceAddress = getAddress(device, vertices); | ||
| triangles.vertexStride = sizeof(float3); | ||
| triangles.indexType = VK_INDEX_TYPE_UINT32; | ||
| triangles.indexData.deviceAddress = getAddress(device, indices); | ||
| DASSERT(vertices.size() > 0); | ||
| triangles.maxVertex = vertices.size() - 1; | ||
|
|
||
| VkAccelerationStructureGeometryKHR geometry{ | ||
| VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_KHR}; | ||
| geometry.geometryType = VK_GEOMETRY_TYPE_TRIANGLES_KHR; | ||
| geometry.flags = VK_GEOMETRY_OPAQUE_BIT_KHR; | ||
| geometry.geometry.triangles = triangles; | ||
|
|
||
| VkAccelerationStructureBuildRangeInfoKHR offset; | ||
| offset.firstVertex = vertices.byteOffset() / sizeof(float3); | ||
| offset.primitiveCount = indices.size() / 3; | ||
| offset.primitiveOffset = 0; | ||
| offset.transformOffset = 0; | ||
|
|
||
| VkAccelerationStructureBuildGeometryInfoKHR build_info{ | ||
| VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_GEOMETRY_INFO_KHR}; | ||
| build_info.type = | ||
| VkAccelerationStructureTypeKHR::VK_ACCELERATION_STRUCTURE_TYPE_BOTTOM_LEVEL_KHR; | ||
| build_info.flags = 0; // TODO: compaction | ||
| build_info.pGeometries = &geometry; | ||
| build_info.geometryCount = 1; | ||
|
|
||
| VkAccelerationStructureBuildSizesInfoKHR size_info{ | ||
| VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_SIZES_INFO_KHR}; | ||
| uint32_t prim_count = indices.size() / 3; | ||
|
|
||
| vkGetAccelerationStructureBuildSizesKHR( | ||
| device.handle(), | ||
| VkAccelerationStructureBuildTypeKHR::VK_ACCELERATION_STRUCTURE_BUILD_TYPE_DEVICE_KHR, | ||
| &build_info, &prim_count, &size_info); | ||
|
|
||
| auto buffer = EX_PASS(VulkanBuffer::create(device, size_info.accelerationStructureSize, | ||
| VBufferUsage::accel_struct_storage)); | ||
| auto accel = EX_PASS(VulkanAccelStruct::create(device, VAccelStructType::bottom_level, buffer)); | ||
|
|
||
| build_info.srcAccelerationStructure = accel->handle(); | ||
| build_info.dstAccelerationStructure = accel->handle(); | ||
|
|
||
| auto *offsets = &offset; | ||
|
|
||
| auto result = | ||
| vkBuildAccelerationStructuresKHR(device.handle(), nullptr, 1, &build_info, &offsets); | ||
|
|
||
| return accel; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters