Skip to content

Commit fae6490

Browse files
author
devsh
committed
get old Acceleration Structure code workin in ex 71 after API change
1 parent a7f52a7 commit fae6490

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

71_RayTracingPipeline/main.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "nbl/ext/FullScreenTriangle/FullScreenTriangle.h"
77
#include "nbl/builtin/hlsl/indirect_commands.hlsl"
88

9-
#define TEST_ASSET_CONV_AS
9+
//#define TEST_ASSET_CONV_AS
1010

1111
class RaytracingPipelineApp final : public examples::SimpleWindowedApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
1212
{
@@ -1955,9 +1955,9 @@ class RaytracingPipelineApp final : public examples::SimpleWindowedApplication,
19551955
// build bottom level ASes
19561956
{
19571957
core::vector<uint32_t> primitiveCounts(blasCount);
1958-
core::vector<IGPUBottomLevelAccelerationStructure::Triangles<const IGPUBuffer>> triangles(m_gpuTriangleGeometries.size());
1958+
core::vector<IGPUBottomLevelAccelerationStructure::Triangles<IGPUBuffer>> triangles(m_gpuTriangleGeometries.size());
19591959
core::vector<uint32_t> scratchSizes(blasCount);
1960-
IGPUBottomLevelAccelerationStructure::AABBs<const IGPUBuffer> aabbs;
1960+
IGPUBottomLevelAccelerationStructure::AABBs<IGPUBuffer> aabbs;
19611961

19621962
auto blasFlags = bitflag(IGPUBottomLevelAccelerationStructure::BUILD_FLAGS::PREFER_FAST_TRACE_BIT) | IGPUBottomLevelAccelerationStructure::BUILD_FLAGS::ALLOW_COMPACTION_BIT;
19631963
if (m_physicalDevice->getProperties().limits.rayTracingPositionFetch)
@@ -2017,12 +2017,12 @@ class RaytracingPipelineApp final : public examples::SimpleWindowedApplication,
20172017
if (isProcedural)
20182018
{
20192019
const auto* aabbData = &aabbs;
2020-
buildSizes = m_device->getAccelerationStructureBuildSizes(blasBuildInfos[i].buildFlags, false, std::span{ aabbData, 1 }, maxPrimCount);
2020+
buildSizes = m_device->getAccelerationStructureBuildSizes(false, blasBuildInfos[i].buildFlags, false, std::span{ aabbData, 1 }, maxPrimCount);
20212021
}
20222022
else
20232023
{
20242024
const auto* trianglesData = triangles.data();
2025-
buildSizes = m_device->getAccelerationStructureBuildSizes(blasBuildInfos[i].buildFlags, false, std::span{ trianglesData,1 }, maxPrimCount);
2025+
buildSizes = m_device->getAccelerationStructureBuildSizes(false, blasBuildInfos[i].buildFlags, false, std::span{ trianglesData,1 }, maxPrimCount);
20262026
}
20272027
if (!buildSizes)
20282028
return logFail("Failed to get BLAS build sizes");
@@ -2144,8 +2144,8 @@ class RaytracingPipelineApp final : public examples::SimpleWindowedApplication,
21442144
IGPUBottomLevelAccelerationStructure::CopyInfo copyInfo;
21452145
copyInfo.src = cleanupBlas[i].get();
21462146
copyInfo.dst = m_gpuBlasList[i].get();
2147-
copyInfo.mode = IGPUBottomLevelAccelerationStructure::COPY_MODE::COMPACT;
2148-
if (!cmdbufCompact->copyAccelerationStructure(copyInfo))
2147+
copyInfo.compact = true;
2148+
if (!cmdbufCompact->copyAccelerationStructure<IGPUBottomLevelAccelerationStructure>(copyInfo))
21492149
return logFail("Failed to copy AS to compact");
21502150
}
21512151
}

0 commit comments

Comments
 (0)