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/kernel/kernel_passes.h | |
| 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/kernel/kernel_passes.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_passes.h | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/intern/cycles/kernel/kernel_passes.h b/intern/cycles/kernel/kernel_passes.h index 52be2ed87b7..8f58b8c3079 100644 --- a/intern/cycles/kernel/kernel_passes.h +++ b/intern/cycles/kernel/kernel_passes.h @@ -122,31 +122,6 @@ ccl_device_inline void kernel_update_denoising_features(KernelGlobals *kg, } #endif /* __DENOISING_FEATURES__ */ -#ifdef __KERNEL_DEBUG__ -ccl_device_inline void kernel_write_debug_passes(KernelGlobals *kg, - ccl_global float *buffer, - PathRadiance *L) -{ - int flag = kernel_data.film.pass_flag; - if (flag & PASSMASK(BVH_TRAVERSED_NODES)) { - kernel_write_pass_float(buffer + kernel_data.film.pass_bvh_traversed_nodes, - L->debug_data.num_bvh_traversed_nodes); - } - if (flag & PASSMASK(BVH_TRAVERSED_INSTANCES)) { - kernel_write_pass_float(buffer + kernel_data.film.pass_bvh_traversed_instances, - L->debug_data.num_bvh_traversed_instances); - } - if (flag & PASSMASK(BVH_INTERSECTIONS)) { - kernel_write_pass_float(buffer + kernel_data.film.pass_bvh_intersections, - L->debug_data.num_bvh_intersections); - } - if (flag & PASSMASK(RAY_BOUNCES)) { - kernel_write_pass_float(buffer + kernel_data.film.pass_ray_bounces, - L->debug_data.num_ray_bounces); - } -} -#endif /* __KERNEL_DEBUG__ */ - #ifdef __KERNEL_CPU__ # define WRITE_ID_SLOT(buffer, depth, id, matte_weight, name) \ kernel_write_id_pass_cpu(buffer, depth * 2, id, matte_weight, kg->coverage_##name) @@ -389,10 +364,6 @@ ccl_device_inline void kernel_write_result(KernelGlobals *kg, } #endif /* __DENOISING_FEATURES__ */ -#ifdef __KERNEL_DEBUG__ - kernel_write_debug_passes(kg, buffer, L); -#endif - /* Adaptive Sampling. Fill the additional buffer with the odd samples and calculate our stopping criteria. This is the heuristic from "A hierarchical automatic stopping condition for Monte Carlo global illumination" except that here it is applied per pixel and not in hierarchical |