Skip to content

Commit 7c2b7c0

Browse files
committed
Updated deps (v2)
1 parent 82aaa40 commit 7c2b7c0

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Source/NRDSample.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -2845,7 +2845,7 @@ void Sample::CreateAccelerationStructures()
28452845
nri::AllocateAccelerationStructureDesc allocateAccelerationStructureDesc = {};
28462846
allocateAccelerationStructureDesc.desc.type = nri::AccelerationStructureType::TOP_LEVEL;
28472847
allocateAccelerationStructureDesc.desc.flags = TLAS_BUILD_BITS;
2848-
allocateAccelerationStructureDesc.desc.instanceOrGeometryNum = helper::GetCountOf(m_Scene.instances);
2848+
allocateAccelerationStructureDesc.desc.geometryOrInstanceNum = helper::GetCountOf(m_Scene.instances);
28492849
allocateAccelerationStructureDesc.memoryLocation = nri::MemoryLocation::DEVICE;
28502850

28512851
nri::AccelerationStructure* accelerationStructure = nullptr;
@@ -2862,7 +2862,7 @@ void Sample::CreateAccelerationStructures()
28622862
nri::AllocateAccelerationStructureDesc allocateAccelerationStructureDesc = {};
28632863
allocateAccelerationStructureDesc.desc.type = nri::AccelerationStructureType::TOP_LEVEL;
28642864
allocateAccelerationStructureDesc.desc.flags = TLAS_BUILD_BITS;
2865-
allocateAccelerationStructureDesc.desc.instanceOrGeometryNum = helper::GetCountOf(m_Scene.instances);
2865+
allocateAccelerationStructureDesc.desc.geometryOrInstanceNum = helper::GetCountOf(m_Scene.instances);
28662866
allocateAccelerationStructureDesc.memoryLocation = nri::MemoryLocation::DEVICE;
28672867

28682868
nri::AccelerationStructure* accelerationStructure = nullptr;
@@ -2990,7 +2990,7 @@ void Sample::CreateAccelerationStructures()
29902990
nri::AllocateAccelerationStructureDesc allocateAccelerationStructureDesc = {};
29912991
allocateAccelerationStructureDesc.desc.type = nri::AccelerationStructureType::BOTTOM_LEVEL;
29922992
allocateAccelerationStructureDesc.desc.flags = BLAS_RIGID_MESH_BUILD_BITS;
2993-
allocateAccelerationStructureDesc.desc.instanceOrGeometryNum = geometryObjectsNum;
2993+
allocateAccelerationStructureDesc.desc.geometryOrInstanceNum = geometryObjectsNum;
29942994
allocateAccelerationStructureDesc.desc.geometries = &geometries[geometryObjectBase];
29952995
allocateAccelerationStructureDesc.memoryLocation = nri::MemoryLocation::DEVICE;
29962996

@@ -3002,7 +3002,7 @@ void Sample::CreateAccelerationStructures()
30023002
nri::BuildBottomLevelAccelerationStructureDesc& buildBottomLevelAccelerationStructureDesc = buildBottomLevelAccelerationStructureDescs.emplace_back();
30033003
buildBottomLevelAccelerationStructureDesc = {};
30043004
buildBottomLevelAccelerationStructureDesc.dst = accelerationStructure;
3005-
buildBottomLevelAccelerationStructureDesc.geometryObjectNum = geometryObjectsNum;
3005+
buildBottomLevelAccelerationStructureDesc.geometryNum = geometryObjectsNum;
30063006
buildBottomLevelAccelerationStructureDesc.geometries = &geometries[geometryObjectBase];
30073007
buildBottomLevelAccelerationStructureDesc.scratchBuffer = nullptr;
30083008
buildBottomLevelAccelerationStructureDesc.scratchOffset = scratchSize;
@@ -3065,7 +3065,7 @@ void Sample::CreateAccelerationStructures()
30653065
nri::AllocateAccelerationStructureDesc allocateAccelerationStructureDesc = {};
30663066
allocateAccelerationStructureDesc.desc.type = nri::AccelerationStructureType::BOTTOM_LEVEL;
30673067
allocateAccelerationStructureDesc.desc.flags = mesh.HasMorphTargets() ? BLAS_DEFORMABLE_MESH_BUILD_BITS : BLAS_RIGID_MESH_BUILD_BITS;
3068-
allocateAccelerationStructureDesc.desc.instanceOrGeometryNum = 1;
3068+
allocateAccelerationStructureDesc.desc.geometryOrInstanceNum = 1;
30693069
allocateAccelerationStructureDesc.desc.geometries = &bottomLevelGeometry;
30703070
allocateAccelerationStructureDesc.memoryLocation = nri::MemoryLocation::DEVICE;
30713071

@@ -3077,7 +3077,7 @@ void Sample::CreateAccelerationStructures()
30773077
nri::BuildBottomLevelAccelerationStructureDesc& buildBottomLevelAccelerationStructureDesc = buildBottomLevelAccelerationStructureDescs.emplace_back();
30783078
buildBottomLevelAccelerationStructureDesc = {};
30793079
buildBottomLevelAccelerationStructureDesc.dst = accelerationStructure;
3080-
buildBottomLevelAccelerationStructureDesc.geometryObjectNum = 1;
3080+
buildBottomLevelAccelerationStructureDesc.geometryNum = 1;
30813081
buildBottomLevelAccelerationStructureDesc.geometries = &geometries[geometries.size() - 1];
30823082
buildBottomLevelAccelerationStructureDesc.scratchBuffer = nullptr;
30833083
buildBottomLevelAccelerationStructureDesc.scratchOffset = scratchSize;
@@ -4734,7 +4734,7 @@ void Sample::RenderFrame(uint32_t frameIndex)
47344734

47354735
nri::BuildBottomLevelAccelerationStructureDesc buildBottomLevelAccelerationStructureDesc = {};
47364736
buildBottomLevelAccelerationStructureDesc.dst = accelerationStructure;
4737-
buildBottomLevelAccelerationStructureDesc.geometryObjectNum = 1;
4737+
buildBottomLevelAccelerationStructureDesc.geometryNum = 1;
47384738
buildBottomLevelAccelerationStructureDesc.geometries = &bottomLevelGeometry;
47394739
buildBottomLevelAccelerationStructureDesc.scratchBuffer = Get(Buffer::MorphMeshScratch);
47404740
buildBottomLevelAccelerationStructureDesc.scratchOffset = scratchOffset;

0 commit comments

Comments
 (0)