Skip to content

Commit c65f564

Browse files
committed
Merge branch 'master' of github.com:Devsh-Graphics-Programming/Nabla
2 parents 6d8b728 + 61e4425 commit c65f564

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/nbl/video/utilities/CAssetConverter.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2862,15 +2862,15 @@ auto CAssetConverter::reserve(const SInputs& inputs) -> SReserveResult
28622862
const auto geoms = as->getAABBGeometries();
28632863
if (patch.hostBuild)
28642864
{
2865-
const std::span<const IGPUBottomLevelAccelerationStructure::Triangles<const IGPUBuffer>> cpuGeoms = {
2866-
reinterpret_cast<const IGPUBottomLevelAccelerationStructure::Triangles<const IGPUBuffer>*>(geoms.data()),geoms.size()
2865+
const std::span<const IGPUBottomLevelAccelerationStructure::Triangles<const ICPUBuffer>> cpuGeoms = {
2866+
reinterpret_cast<const IGPUBottomLevelAccelerationStructure::Triangles<const ICPUBuffer>*>(geoms.data()),geoms.size()
28672867
};
28682868
sizes = device->getAccelerationStructureBuildSizes(buildFlags,motionBlur,cpuGeoms,pMaxPrimitiveCounts);
28692869
}
28702870
else
28712871
{
2872-
const std::span<const IGPUBottomLevelAccelerationStructure::Triangles<const ICPUBuffer>> cpuGeoms = {
2873-
reinterpret_cast<const IGPUBottomLevelAccelerationStructure::Triangles<const ICPUBuffer>*>(geoms.data()),geoms.size()
2872+
const std::span<const IGPUBottomLevelAccelerationStructure::Triangles<const IGPUBuffer>> cpuGeoms = {
2873+
reinterpret_cast<const IGPUBottomLevelAccelerationStructure::Triangles<const IGPUBuffer>*>(geoms.data()),geoms.size()
28742874
};
28752875
sizes = device->getAccelerationStructureBuildSizes(buildFlags,motionBlur,cpuGeoms,pMaxPrimitiveCounts);
28762876
}
@@ -2885,15 +2885,15 @@ auto CAssetConverter::reserve(const SInputs& inputs) -> SReserveResult
28852885
const auto geoms = as->getTriangleGeometries();
28862886
if (patch.hostBuild)
28872887
{
2888-
const std::span<const IGPUBottomLevelAccelerationStructure::Triangles<const IGPUBuffer>> cpuGeoms = {
2889-
reinterpret_cast<const IGPUBottomLevelAccelerationStructure::Triangles<const IGPUBuffer>*>(geoms.data()),geoms.size()
2888+
const std::span<const IGPUBottomLevelAccelerationStructure::Triangles<const ICPUBuffer>> cpuGeoms = {
2889+
reinterpret_cast<const IGPUBottomLevelAccelerationStructure::Triangles<const ICPUBuffer>*>(geoms.data()),geoms.size()
28902890
};
28912891
sizes = device->getAccelerationStructureBuildSizes(buildFlags,motionBlur,cpuGeoms,pMaxPrimitiveCounts);
28922892
}
28932893
else
28942894
{
2895-
const std::span<const IGPUBottomLevelAccelerationStructure::Triangles<const ICPUBuffer>> cpuGeoms = {
2896-
reinterpret_cast<const IGPUBottomLevelAccelerationStructure::Triangles<const ICPUBuffer>*>(geoms.data()),geoms.size()
2895+
const std::span<const IGPUBottomLevelAccelerationStructure::Triangles<const IGPUBuffer>> cpuGeoms = {
2896+
reinterpret_cast<const IGPUBottomLevelAccelerationStructure::Triangles<const IGPUBuffer>*>(geoms.data()),geoms.size()
28972897
};
28982898
sizes = device->getAccelerationStructureBuildSizes(buildFlags,motionBlur,cpuGeoms,pMaxPrimitiveCounts);
28992899
}
@@ -2918,10 +2918,10 @@ auto CAssetConverter::reserve(const SInputs& inputs) -> SReserveResult
29182918
}
29192919
}
29202920
}
2921-
if (!buildSize)
2921+
if (buildSize==0 || sizes.buildScratchSize==0)
29222922
{
29232923
inputs.logger.log(
2924-
"Build Size Input is 0 for Acceleration Structure %8llx%8llx%8llx%8llx",
2924+
"Build Size Input is 0 or failed the call to `ILogicalDevice::getAccelerationStructureBuildSizes` for Acceleration Structure %8llx%8llx%8llx%8llx",
29252925
system::ILogger::ELL_ERROR,hashAsU64[0],hashAsU64[1],hashAsU64[2],hashAsU64[3]
29262926
);
29272927
continue;

0 commit comments

Comments
 (0)