ilusha/pbrt-v4
1
0
Fork 0
mirror of https://github.com/mmp/pbrt-v4 synced 2026-09-26 16:20:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Fix nvcc __host__ __device__ warning for OptiXAggregate::BVH

Browse source 
nvcc marks implicitly-defined special members __host__ __device__, so
the implicit BVH copy ctor/dtor (which call std::vector's host-only
members) triggered warning 20011-D. The warning chain was driven by
AsyncJob<GAS> copying GAS, and thus BVH, by value.

Make BVH move-only with out-of-line special members and switch the
top-level GAS jobs to AsyncJob<GAS *> so the async machinery only ever
copies a pointer. This keeps the shared parallel.h/pstd.h utilities
untouched.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Matt Pharr 2026-05-15 14:37:46 -07:00
parent 529988579b
commit ab9f2136a5
2 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/pbrt/gpu/optix/aggregate.cpp
View file

@ -63,6 +63,10 @@ OptiXAggregate::BVH::BVH(size_t size) {
randomHitHGRecords.resize(size);
}
OptiXAggregate::BVH::BVH(BVH&&) = default;
OptiXAggregate::BVH &OptiXAggregate::BVH::operator=(BVH&&) = default;
OptiXAggregate::BVH::~BVH() = default;
struct __align__(OPTIX_SBT_RECORD_ALIGNMENT) RaygenRecord {
__align__(OPTIX_SBT_RECORD_ALIGNMENT) char header[OPTIX_SBT_RECORD_HEADER_SIZE];
};
@ -1390,32 +1394,32 @@ OptiXAggregate::OptiXAggregate(
BVH bvh;
int sbtOffset;
};
AsyncJob<GAS> *triJob = RunAsync([&]() {
AsyncJob<GAS *> *triJob = RunAsync([&]() {
BVH triangleBVH = buildBVHForTriangles(
scene.shapes, plyMeshes, optixContext, hitPGTriangle, anyhitPGShadowTriangle,
hitPGRandomHitTriangle, textures.floatTextures, namedMaterials, materials,
media, shapeIndexToAreaLights, threadAllocators, threadCUDAStreams);
int sbtOffset = addHGRecords(triangleBVH);
return GAS{triangleBVH, sbtOffset};
return new GAS{std::move(triangleBVH), sbtOffset};
});
AsyncJob<GAS> *blpJob = RunAsync([&]() {
AsyncJob<GAS *> *blpJob = RunAsync([&]() {
BVH blpBVH =
buildBVHForBLPs(scene.shapes, optixContext, hitPGBilinearPatch,
anyhitPGShadowBilinearPatch, hitPGRandomHitBilinearPatch,
textures.floatTextures, namedMaterials, materials, media,
shapeIndexToAreaLights, threadAllocators, threadCUDAStreams);
int bilinearSBTOffset = addHGRecords(blpBVH);
return GAS{blpBVH, bilinearSBTOffset};
return new GAS{std::move(blpBVH), bilinearSBTOffset};
});
AsyncJob<GAS> *quadricJob = RunAsync([&]() {
AsyncJob<GAS *> *quadricJob = RunAsync([&]() {
BVH quadricBVH = buildBVHForQuadrics(
scene.shapes, optixContext, hitPGQuadric, anyhitPGShadowQuadric,
hitPGRandomHitQuadric, textures.floatTextures, namedMaterials, materials,
media, shapeIndexToAreaLights, threadAllocators, threadCUDAStreams);
int quadricSBTOffset = addHGRecords(quadricBVH);
return GAS{quadricBVH, quadricSBTOffset};
return new GAS{std::move(quadricBVH), quadricSBTOffset};
});
///////////////////////////////////////////////////////////////////////////
@ -1535,15 +1539,16 @@ OptiXAggregate::OptiXAggregate(
gasInstance.flags =
OPTIX_INSTANCE_FLAG_NONE; // TODO: OPTIX_INSTANCE_FLAG_DISABLE_ANYHIT
LOG_VERBOSE("Starting to consume top-level GAS futures");
for (AsyncJob<GAS> *job : {triJob, blpJob, quadricJob}) {
GAS gas = job->GetResult();
if (gas.bvh.traversableHandle) {
gasInstance.traversableHandle = gas.bvh.traversableHandle;
gasInstance.sbtOffset = gas.sbtOffset;
for (AsyncJob<GAS *> *job : {triJob, blpJob, quadricJob}) {
GAS *gas = job->GetResult();
if (gas->bvh.traversableHandle) {
gasInstance.traversableHandle = gas->bvh.traversableHandle;
gasInstance.sbtOffset = gas->sbtOffset;
iasInstances.push_back(gasInstance);
bounds = Union(bounds, gas.bvh.bounds);
bounds = Union(bounds, gas->bvh.bounds);
}
delete gas;
}
LOG_VERBOSE("Finished consuming top-level GAS futures");

6
src/pbrt/gpu/optix/aggregate.h
View file

@ -69,6 +69,12 @@ class OptiXAggregate : public WavefrontAggregate {
BVH() = default;
BVH(size_t size);
BVH(const BVH&) = delete;
BVH& operator=(const BVH&) = delete;
BVH(BVH&&);
BVH& operator=(BVH&&);
~BVH();
OptixTraversableHandle traversableHandle = {};
std::vector<HitgroupRecord> intersectHGRecords;
std::vector<HitgroupRecord> shadowHGRecords;