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 Optix 7.7 build

Browse source 
Fixes issue #331.
This commit is contained in:
Matt Pharr 2023-04-02 06:45:00 -07:00
parent b939189eff
commit 1b3521b4dd
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pbrt/gpu/aggregate.cpp
View file

@ -1061,7 +1061,11 @@ OptixModule OptiXAggregate::createOptiXModule(OptixDeviceContext optixContext,
char log[4096];
size_t logSize = sizeof(log);
OptixModule optixModule;
#if (OPTIX_VERSION >= 70700)
OPTIX_CHECK_WITH_LOG(optixModuleCreate(
#else
OPTIX_CHECK_WITH_LOG(optixModuleCreateFromPTX(
#endif
optixContext, &moduleCompileOptions, &pipelineCompileOptions,
ptx, strlen(ptx), log, &logSize, &optixModule),
log);
@ -1253,11 +1257,13 @@ OptiXAggregate::OptiXAggregate(
OptixPipelineLinkOptions pipelineLinkOptions = {};
pipelineLinkOptions.maxTraceDepth = 2;
#if (OPTIX_VERSION < 70700)
#ifndef NDEBUG
pipelineLinkOptions.debugLevel = OPTIX_COMPILE_DEBUG_LEVEL_FULL;
#else
pipelineLinkOptions.debugLevel = OPTIX_COMPILE_DEBUG_LEVEL_NONE;
#endif
#endif // OPTIX_VERSION
OPTIX_CHECK_WITH_LOG(
optixPipelineCreate(optixContext, &pipelineCompileOptions, &pipelineLinkOptions,