From f6adb9ca6a453cb3dc1b4d98f8b2d60c52539d30 Mon Sep 17 00:00:00 2001
From: Mara Vogt <mvogt@uni-koblenz.de>
Date: Mon, 20 Sep 2021 12:21:25 +0200
Subject: [PATCH] [#92] started with documentation
---
include/vkcv/BufferManager.hpp | 4 +---
include/vkcv/Core.hpp | 13 ++++++++++++-
src/vkcv/BufferManager.cpp | 6 ------
src/vkcv/Core.cpp | 1 -
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/include/vkcv/BufferManager.hpp b/include/vkcv/BufferManager.hpp
index 272ba44b..7bec33d8 100644
--- a/include/vkcv/BufferManager.hpp
+++ b/include/vkcv/BufferManager.hpp
@@ -13,9 +13,7 @@ namespace vkcv
VERTEX,
UNIFORM,
STORAGE,
- STAGING,
- RT_ACCELERATION_VERTEX,
- RT_ACCELERATION_INDEX
+ STAGING
};
enum class BufferMemoryType {
diff --git a/include/vkcv/Core.hpp b/include/vkcv/Core.hpp
index 2f164ca4..e9fd3eb9 100644
--- a/include/vkcv/Core.hpp
+++ b/include/vkcv/Core.hpp
@@ -341,7 +341,18 @@ namespace vkcv
const WindowHandle& windowHandle);
-
+ /**
+ * Prepares RTXPipeline for Raygeneration by recording the binding Table to the Commandstream.
+ * Currently only supports closestHit, rayGen and miss shaderstages.
+ * @param cmdStreamHandle The command stream handle which receives relevant commands for drawing.
+ * @param rtxPipeline The raytracing pipeline from the RTXModule.
+ * @param rtxPipelineLayout The raytracing pipeline layout from the RTXModule.
+ * @param shaderBindingTable The shader binding table from the RTXModule.
+ * @param shaderGroupBaseAlignment The shader group base alignment from the RTXModule.
+ * @param descriptorSetUsages The descriptor set usages.
+ * @param pushConstants The push constants.
+ * @param windowHandle The window handle defining in which window to render.
+ */
void recordRayGenerationToCmdStream(
CommandStreamHandle cmdStreamHandle,
vk::Pipeline rtxPipeline,
diff --git a/src/vkcv/BufferManager.cpp b/src/vkcv/BufferManager.cpp
index 3f5051d4..f468bccc 100644
--- a/src/vkcv/BufferManager.cpp
+++ b/src/vkcv/BufferManager.cpp
@@ -48,12 +48,6 @@ namespace vkcv {
case BufferType::INDEX:
usageFlags = vk::BufferUsageFlagBits::eIndexBuffer;
break;
- case BufferType::RT_ACCELERATION_VERTEX:
- usageFlags = vk::BufferUsageFlagBits::eVertexBuffer | vk::BufferUsageFlagBits::eAccelerationStructureStorageKHR | vk::BufferUsageFlagBits::eShaderDeviceAddressKHR | vk::BufferUsageFlagBits::eStorageBuffer;
- break;
- case BufferType::RT_ACCELERATION_INDEX:
- usageFlags = vk::BufferUsageFlagBits::eIndexBuffer | vk::BufferUsageFlagBits::eAccelerationStructureStorageKHR | vk::BufferUsageFlagBits::eShaderDeviceAddressKHR | vk::BufferUsageFlagBits::eStorageBuffer;
- break;
default:
vkcv_log(LogLevel::WARNING, "Unknown buffer type");
break;
diff --git a/src/vkcv/Core.cpp b/src/vkcv/Core.cpp
index d5acdf1c..d2082bd4 100644
--- a/src/vkcv/Core.cpp
+++ b/src/vkcv/Core.cpp
@@ -459,7 +459,6 @@ namespace vkcv
rchitRegion.setSize(shaderBindingTableSize);
vk::StridedDeviceAddressRegionKHR rcallRegion = {};
-
cmdBuffer.traceRaysKHR(&rgenRegion,&rmissRegion,&rchitRegion,&rcallRegion,
getWindow(windowHandle).getWidth(), getWindow(windowHandle).getHeight(),1, m_rtxDispatcher);
--
GitLab