-
Notifications
You must be signed in to change notification settings - Fork 119
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Port to the finalised Vulkan Khronos ray tracing extensions (#21)
* Saving first WiP steps for when SDK is updated to final specs for ray tracing * Upgraded to latest Vulkan SDK (1.2.162) with support for VK_KHR_acceleration_structure and VK_KHR_ray_tracing_pipeline. Hopefully fixed all of the Vulkan calls and validation errors. Fixed ImGui::SliderFloat logarithmic call (API break). * Fix Windows CI. * Fix Linux build (missing header include). Fix Windows CI (update msbuild setup). * Fix Linux build (missing header include). Fix Windows CI (update msbuild setup).
- Loading branch information
Showing
30 changed files
with
333 additions
and
411 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
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,78 @@ | ||
| #pragma once | ||
|
|
||
| #include "Buffer.hpp" | ||
| #include "CommandPool.hpp" | ||
| #include "Device.hpp" | ||
| #include "DeviceMemory.hpp" | ||
| #include <cstring> | ||
| #include <memory> | ||
| #include <string> | ||
| #include <vector> | ||
|
|
||
|
|
||
| namespace Vulkan | ||
| { | ||
| class BufferUtil final | ||
| { | ||
| public: | ||
|
|
||
| template <class T> | ||
| static void CopyFromStagingBuffer(CommandPool& commandPool, Buffer& dstBuffer, const std::vector<T>& content); | ||
|
|
||
| template <class T> | ||
| static void CreateDeviceBuffer( | ||
| CommandPool& commandPool, | ||
| const char* name, | ||
| VkBufferUsageFlags usage, | ||
| const std::vector<T>& content, | ||
| std::unique_ptr<Buffer>& buffer, | ||
| std::unique_ptr<DeviceMemory>& memory); | ||
| }; | ||
|
|
||
| template <class T> | ||
| void BufferUtil::CopyFromStagingBuffer(CommandPool& commandPool, Buffer& dstBuffer, const std::vector<T>& content) | ||
| { | ||
| const auto& device = commandPool.Device(); | ||
| const auto contentSize = sizeof(content[0]) * content.size(); | ||
|
|
||
| // Create a temporary host-visible staging buffer. | ||
| auto stagingBuffer = std::make_unique<Buffer>(device, contentSize, VK_BUFFER_USAGE_TRANSFER_SRC_BIT); | ||
| auto stagingBufferMemory = stagingBuffer->AllocateMemory(VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT); | ||
|
|
||
| // Copy the host data into the staging buffer. | ||
| const auto data = stagingBufferMemory.Map(0, contentSize); | ||
| std::memcpy(data, content.data(), contentSize); | ||
| stagingBufferMemory.Unmap(); | ||
|
|
||
| // Copy the staging buffer to the device buffer. | ||
| dstBuffer.CopyFrom(commandPool, *stagingBuffer, contentSize); | ||
|
|
||
| // Delete the buffer before the memory | ||
| stagingBuffer.reset(); | ||
| } | ||
|
|
||
| template <class T> | ||
| void BufferUtil::CreateDeviceBuffer( | ||
| CommandPool& commandPool, | ||
| const char* const name, | ||
| const VkBufferUsageFlags usage, | ||
| const std::vector<T>& content, | ||
| std::unique_ptr<Buffer>& buffer, | ||
| std::unique_ptr<DeviceMemory>& memory) | ||
| { | ||
| const auto& device = commandPool.Device(); | ||
| const auto& debugUtils = device.DebugUtils(); | ||
| const auto contentSize = sizeof(content[0]) * content.size(); | ||
| const VkMemoryAllocateFlags allocateFlags = usage & VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | ||
| ? VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT | ||
| : 0; | ||
|
|
||
| buffer.reset(new Buffer(device, contentSize, VK_BUFFER_USAGE_TRANSFER_DST_BIT | usage)); | ||
| memory.reset(new DeviceMemory(buffer->AllocateMemory(allocateFlags, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT))); | ||
|
|
||
| debugUtils.SetObjectName(buffer->Handle(), (name + std::string(" Buffer")).c_str()); | ||
| debugUtils.SetObjectName(memory->Handle(), (name + std::string(" Memory")).c_str()); | ||
|
|
||
| CopyFromStagingBuffer(commandPool, *buffer, content); | ||
| } | ||
| } |
Oops, something went wrong.