@@ -519,20 +519,20 @@ class RayQueryGeometryApp final : public SimpleWindowedApplication, public Built
519519
520520 const auto geometryCount = [&cpuObjects]
521521 {
522- size_t count = 0 ;
523- for (auto & cpuObject: cpuObjects)
524- {
522+ size_t count = 0 ;
523+ for (auto & cpuObject: cpuObjects)
524+ {
525525 const auto data = cpuObject.data ;
526526 cpuObject.instanceID = count;
527- if (std::holds_alternative<PolygonGeometryData>(data))
528- {
527+ if (std::holds_alternative<PolygonGeometryData>(data))
528+ {
529529 count += 1 ;
530- } else if (std::holds_alternative<GeometryCollectionData>(data))
531- {
530+ } else if (std::holds_alternative<GeometryCollectionData>(data))
531+ {
532532 const auto colData = std::get<GeometryCollectionData>(data);
533533 count += colData->getGeometries ()->size ();
534- }
535- }
534+ }
535+ }
536536 return count;
537537 }();
538538
@@ -544,56 +544,56 @@ class RayQueryGeometryApp final : public SimpleWindowedApplication, public Built
544544 std::vector<smart_refctd_ptr<ICPUBottomLevelAccelerationStructure>> cpuBlas (cpuObjects.size ());
545545 for (uint32_t blas_i = 0 ; blas_i < cpuBlas.size (); blas_i++)
546546 {
547- auto & blas = cpuBlas[blas_i];
548- blas = make_smart_refctd_ptr<ICPUBottomLevelAccelerationStructure>();
547+ auto & blas = cpuBlas[blas_i];
548+ blas = make_smart_refctd_ptr<ICPUBottomLevelAccelerationStructure>();
549549 if (std::holds_alternative<PolygonGeometryData>(cpuObjects[blas_i].data ))
550550 {
551551 const auto data = std::get<PolygonGeometryData>(cpuObjects[blas_i].data );
552552
553- auto triangles = make_refctd_dynamic_array<smart_refctd_dynamic_array<ICPUBottomLevelAccelerationStructure::Triangles<ICPUBuffer>>>(1u );
554- auto primitiveCounts = make_refctd_dynamic_array<smart_refctd_dynamic_array<uint32_t >>(1u );
553+ auto triangles = make_refctd_dynamic_array<smart_refctd_dynamic_array<ICPUBottomLevelAccelerationStructure::Triangles<ICPUBuffer>>>(1u );
554+ auto primitiveCounts = make_refctd_dynamic_array<smart_refctd_dynamic_array<uint32_t >>(1u );
555555
556- auto & tri = triangles->front ();
556+ auto & tri = triangles->front ();
557557
558- auto & primCount = primitiveCounts->front ();
559- primCount = data->getPrimitiveCount ();
558+ auto & primCount = primitiveCounts->front ();
559+ primCount = data->getPrimitiveCount ();
560560
561- tri = data->exportForBLAS ();
561+ tri = data->exportForBLAS ();
562562
563- blas->setGeometries (std::move (triangles), std::move (primitiveCounts));
563+ blas->setGeometries (std::move (triangles), std::move (primitiveCounts));
564564
565-
565+
566566 } else if (std::holds_alternative<GeometryCollectionData>(cpuObjects[blas_i].data ))
567567 {
568-
568+
569569 const auto data = std::get<GeometryCollectionData>(cpuObjects[blas_i].data );
570570
571571 const auto & geometries = *data->getGeometries ();
572572 const auto geometryCount = geometries.size ();
573573
574- auto triangles = make_refctd_dynamic_array<smart_refctd_dynamic_array<ICPUBottomLevelAccelerationStructure::Triangles<ICPUBuffer>>>(geometryCount);
575- auto primitiveCounts = make_refctd_dynamic_array<smart_refctd_dynamic_array<uint32_t >>(geometryCount);
574+ auto triangles = make_refctd_dynamic_array<smart_refctd_dynamic_array<ICPUBottomLevelAccelerationStructure::Triangles<ICPUBuffer>>>(geometryCount);
575+ auto primitiveCounts = make_refctd_dynamic_array<smart_refctd_dynamic_array<uint32_t >>(geometryCount);
576576
577- for (auto geometry_i = 0u ; geometry_i < geometryCount; geometry_i++)
578- {
577+ for (auto geometry_i = 0u ; geometry_i < geometryCount; geometry_i++)
578+ {
579579 const auto & geometry = geometries[geometry_i];
580- const auto * polyGeo = static_cast <const ICPUPolygonGeometry*>(geometry.geometry .get ());
580+ const auto * polyGeo = static_cast <const ICPUPolygonGeometry*>(geometry.geometry .get ());
581581 primitiveCounts->operator [](geometry_i) = polyGeo->getPrimitiveCount ();
582582 auto & triangle = triangles->operator [](geometry_i);
583583 triangle = polyGeo->exportForBLAS ();
584584 if (geometry.hasTransform ())
585585 triangle.transform = geometry.transform ;
586- }
586+ }
587587
588- blas->setGeometries (std::move (triangles), std::move (primitiveCounts));
588+ blas->setGeometries (std::move (triangles), std::move (primitiveCounts));
589589
590590 }
591- auto blasFlags = bitflag (IGPUBottomLevelAccelerationStructure::BUILD_FLAGS::PREFER_FAST_TRACE_BIT) | IGPUBottomLevelAccelerationStructure::BUILD_FLAGS::ALLOW_COMPACTION_BIT;
592- if (m_physicalDevice->getProperties ().limits .rayTracingPositionFetch )
593- blasFlags |= IGPUBottomLevelAccelerationStructure::BUILD_FLAGS::ALLOW_DATA_ACCESS;
591+ auto blasFlags = bitflag (IGPUBottomLevelAccelerationStructure::BUILD_FLAGS::PREFER_FAST_TRACE_BIT) | IGPUBottomLevelAccelerationStructure::BUILD_FLAGS::ALLOW_COMPACTION_BIT;
592+ if (m_physicalDevice->getProperties ().limits .rayTracingPositionFetch )
593+ blasFlags |= IGPUBottomLevelAccelerationStructure::BUILD_FLAGS::ALLOW_DATA_ACCESS;
594594
595- blas->setBuildFlags (blasFlags);
596- blas->setContentHash (blas->computeContentHash ());
595+ blas->setBuildFlags (blasFlags);
596+ blas->setContentHash (blas->computeContentHash ());
597597 }
598598
599599 // get ICPUBottomLevelAccelerationStructure into ICPUTopLevelAccelerationStructure
@@ -691,17 +691,17 @@ class RayQueryGeometryApp final : public SimpleWindowedApplication, public Built
691691 {
692692 const auto polygonData = std::get<PolygonGeometryData>(data);
693693 tmpGeometries.push_back (polygonData.get ());
694- tmpGeometryPatches.push_back ({});
694+ tmpGeometryPatches.push_back ({});
695695 tmpGeometryPatches.back ().indexBufferUsages = IGPUBuffer::E_USAGE_FLAGS::EUF_SHADER_DEVICE_ADDRESS_BIT;
696696 } else if (std::holds_alternative<GeometryCollectionData>(data))
697697 {
698698 const auto collectionData = std::get<GeometryCollectionData>(data);
699699 for (const auto & geometryRef : *collectionData->getGeometries ())
700700 {
701- auto * polyGeo = static_cast <ICPUPolygonGeometry*>(geometryRef.geometry .get ());
701+ auto * polyGeo = static_cast <ICPUPolygonGeometry*>(geometryRef.geometry .get ());
702702 tmpGeometries.push_back (polyGeo);
703- tmpGeometryPatches.push_back ({});
704- tmpGeometryPatches.back ().indexBufferUsages = IGPUBuffer::E_USAGE_FLAGS::EUF_SHADER_DEVICE_ADDRESS_BIT;
703+ tmpGeometryPatches.push_back ({});
704+ tmpGeometryPatches.back ().indexBufferUsages = IGPUBuffer::E_USAGE_FLAGS::EUF_SHADER_DEVICE_ADDRESS_BIT;
705705 }
706706 }
707707 }
0 commit comments