@@ -2845,7 +2845,7 @@ void Sample::CreateAccelerationStructures()
2845
2845
nri::AllocateAccelerationStructureDesc allocateAccelerationStructureDesc = {};
2846
2846
allocateAccelerationStructureDesc.desc .type = nri::AccelerationStructureType::TOP_LEVEL;
2847
2847
allocateAccelerationStructureDesc.desc .flags = TLAS_BUILD_BITS;
2848
- allocateAccelerationStructureDesc.desc .instanceOrGeometryNum = helper::GetCountOf (m_Scene.instances );
2848
+ allocateAccelerationStructureDesc.desc .geometryOrInstanceNum = helper::GetCountOf (m_Scene.instances );
2849
2849
allocateAccelerationStructureDesc.memoryLocation = nri::MemoryLocation::DEVICE;
2850
2850
2851
2851
nri::AccelerationStructure* accelerationStructure = nullptr ;
@@ -2862,7 +2862,7 @@ void Sample::CreateAccelerationStructures()
2862
2862
nri::AllocateAccelerationStructureDesc allocateAccelerationStructureDesc = {};
2863
2863
allocateAccelerationStructureDesc.desc .type = nri::AccelerationStructureType::TOP_LEVEL;
2864
2864
allocateAccelerationStructureDesc.desc .flags = TLAS_BUILD_BITS;
2865
- allocateAccelerationStructureDesc.desc .instanceOrGeometryNum = helper::GetCountOf (m_Scene.instances );
2865
+ allocateAccelerationStructureDesc.desc .geometryOrInstanceNum = helper::GetCountOf (m_Scene.instances );
2866
2866
allocateAccelerationStructureDesc.memoryLocation = nri::MemoryLocation::DEVICE;
2867
2867
2868
2868
nri::AccelerationStructure* accelerationStructure = nullptr ;
@@ -2990,7 +2990,7 @@ void Sample::CreateAccelerationStructures()
2990
2990
nri::AllocateAccelerationStructureDesc allocateAccelerationStructureDesc = {};
2991
2991
allocateAccelerationStructureDesc.desc .type = nri::AccelerationStructureType::BOTTOM_LEVEL;
2992
2992
allocateAccelerationStructureDesc.desc .flags = BLAS_RIGID_MESH_BUILD_BITS;
2993
- allocateAccelerationStructureDesc.desc .instanceOrGeometryNum = geometryObjectsNum;
2993
+ allocateAccelerationStructureDesc.desc .geometryOrInstanceNum = geometryObjectsNum;
2994
2994
allocateAccelerationStructureDesc.desc .geometries = &geometries[geometryObjectBase];
2995
2995
allocateAccelerationStructureDesc.memoryLocation = nri::MemoryLocation::DEVICE;
2996
2996
@@ -3002,7 +3002,7 @@ void Sample::CreateAccelerationStructures()
3002
3002
nri::BuildBottomLevelAccelerationStructureDesc& buildBottomLevelAccelerationStructureDesc = buildBottomLevelAccelerationStructureDescs.emplace_back ();
3003
3003
buildBottomLevelAccelerationStructureDesc = {};
3004
3004
buildBottomLevelAccelerationStructureDesc.dst = accelerationStructure;
3005
- buildBottomLevelAccelerationStructureDesc.geometryObjectNum = geometryObjectsNum;
3005
+ buildBottomLevelAccelerationStructureDesc.geometryNum = geometryObjectsNum;
3006
3006
buildBottomLevelAccelerationStructureDesc.geometries = &geometries[geometryObjectBase];
3007
3007
buildBottomLevelAccelerationStructureDesc.scratchBuffer = nullptr ;
3008
3008
buildBottomLevelAccelerationStructureDesc.scratchOffset = scratchSize;
@@ -3065,7 +3065,7 @@ void Sample::CreateAccelerationStructures()
3065
3065
nri::AllocateAccelerationStructureDesc allocateAccelerationStructureDesc = {};
3066
3066
allocateAccelerationStructureDesc.desc .type = nri::AccelerationStructureType::BOTTOM_LEVEL;
3067
3067
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 ;
3069
3069
allocateAccelerationStructureDesc.desc .geometries = &bottomLevelGeometry;
3070
3070
allocateAccelerationStructureDesc.memoryLocation = nri::MemoryLocation::DEVICE;
3071
3071
@@ -3077,7 +3077,7 @@ void Sample::CreateAccelerationStructures()
3077
3077
nri::BuildBottomLevelAccelerationStructureDesc& buildBottomLevelAccelerationStructureDesc = buildBottomLevelAccelerationStructureDescs.emplace_back ();
3078
3078
buildBottomLevelAccelerationStructureDesc = {};
3079
3079
buildBottomLevelAccelerationStructureDesc.dst = accelerationStructure;
3080
- buildBottomLevelAccelerationStructureDesc.geometryObjectNum = 1 ;
3080
+ buildBottomLevelAccelerationStructureDesc.geometryNum = 1 ;
3081
3081
buildBottomLevelAccelerationStructureDesc.geometries = &geometries[geometries.size () - 1 ];
3082
3082
buildBottomLevelAccelerationStructureDesc.scratchBuffer = nullptr ;
3083
3083
buildBottomLevelAccelerationStructureDesc.scratchOffset = scratchSize;
@@ -4734,7 +4734,7 @@ void Sample::RenderFrame(uint32_t frameIndex)
4734
4734
4735
4735
nri::BuildBottomLevelAccelerationStructureDesc buildBottomLevelAccelerationStructureDesc = {};
4736
4736
buildBottomLevelAccelerationStructureDesc.dst = accelerationStructure;
4737
- buildBottomLevelAccelerationStructureDesc.geometryObjectNum = 1 ;
4737
+ buildBottomLevelAccelerationStructureDesc.geometryNum = 1 ;
4738
4738
buildBottomLevelAccelerationStructureDesc.geometries = &bottomLevelGeometry;
4739
4739
buildBottomLevelAccelerationStructureDesc.scratchBuffer = Get (Buffer::MorphMeshScratch);
4740
4740
buildBottomLevelAccelerationStructureDesc.scratchOffset = scratchOffset;
0 commit comments