diff options
author | Brecht Van Lommel <brecht@blender.org> | 2021-07-28 19:27:25 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-07-28 20:27:57 +0300 |
commit | 073bf8bf52edbb6f53fb6bbbecc26f20b91e8c43 (patch) | |
tree | 109ca52ccec690c7a639ea70ac00f68d3ee9fae8 /intern/cycles/device/device_optix.cpp | |
parent | 3bf96758496973c1bcf2226324552ee1b9bf95f3 (diff) |
Cycles: remove WITH_CYCLES_DEBUG, add WITH_CYCLES_DEBUG_NAN
WITH_CYCLES_DEBUG was used for rendering BVH debugging passes. But since we
mainly use Embree an OptiX now, this information is no longer important.
WITH_CYCLES_DEBUG_NAN will enable additional checks for NaNs and invalid values
in the kernel, for Cycles developers. Previously these asserts where enabled in
all debug builds, but this is too likely to crash Blender in scenes that render
fine regardless of the NaNs. So this is behind a CMake option now.
Fixes T90240
Diffstat (limited to 'intern/cycles/device/device_optix.cpp')
-rw-r--r-- | intern/cycles/device/device_optix.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/intern/cycles/device/device_optix.cpp b/intern/cycles/device/device_optix.cpp index 392fec4d57b..6f9a7943722 100644 --- a/intern/cycles/device/device_optix.cpp +++ b/intern/cycles/device/device_optix.cpp @@ -234,9 +234,6 @@ class OptiXDevice : public CUDADevice { } }; # endif -# if OPTIX_ABI_VERSION >= 41 && defined(WITH_CYCLES_DEBUG) - options.validationMode = OPTIX_DEVICE_CONTEXT_VALIDATION_MODE_ALL; -# endif check_result_optix(optixDeviceContextCreate(cuContext, &options, &context)); # ifdef WITH_CYCLES_LOGGING check_result_optix(optixDeviceContextSetLogCallback( @@ -369,13 +366,8 @@ class OptiXDevice : public CUDADevice { OptixModuleCompileOptions module_options = {}; module_options.maxRegisterCount = 0; // Do not set an explicit register limit -# ifdef WITH_CYCLES_DEBUG - module_options.optLevel = OPTIX_COMPILE_OPTIMIZATION_LEVEL_0; - module_options.debugLevel = OPTIX_COMPILE_DEBUG_LEVEL_FULL; -# else module_options.optLevel = OPTIX_COMPILE_OPTIMIZATION_LEVEL_3; module_options.debugLevel = OPTIX_COMPILE_DEBUG_LEVEL_LINEINFO; -# endif # if OPTIX_ABI_VERSION >= 41 module_options.boundValues = nullptr; @@ -578,11 +570,7 @@ class OptiXDevice : public CUDADevice { OptixPipelineLinkOptions link_options = {}; link_options.maxTraceDepth = 1; -# ifdef WITH_CYCLES_DEBUG - link_options.debugLevel = OPTIX_COMPILE_DEBUG_LEVEL_FULL; -# else link_options.debugLevel = OPTIX_COMPILE_DEBUG_LEVEL_LINEINFO; -# endif # if OPTIX_ABI_VERSION < 24 link_options.overrideUsesMotionBlur = motion_blur; # endif |