diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-29 11:34:10 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-29 11:35:31 +0300 |
| commit | 9c4aba11c9dcd677c74453746eaa0d9d9b8c226b (patch) | |
| tree | 945cda9c82999d9cbdbe227e54ab4e1f579ae892 | |
| parent | 0a76be81b73eb5d0060845c2467fcecb986fb77e (diff) | |
Cycles: Add some sanity check asserts in the traversal code
This way we'll be sure (in debug builds) that regular BVH traversal is not used
for QBVH tree (could happen because of mismatch of logic in kernel and render).
| -rw-r--r-- | intern/cycles/kernel/geom/geom_bvh_shadow.h | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/geom/geom_bvh_subsurface.h | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/geom/geom_bvh_traversal.h | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/geom/geom_bvh_volume.h | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/kernel/geom/geom_bvh_shadow.h b/intern/cycles/kernel/geom/geom_bvh_shadow.h index 3c405284b4d..dd3a1709bbb 100644 --- a/intern/cycles/kernel/geom/geom_bvh_shadow.h +++ b/intern/cycles/kernel/geom/geom_bvh_shadow.h @@ -394,6 +394,7 @@ ccl_device_inline bool BVH_FUNCTION_NAME(KernelGlobals *kg, else #endif { + kernel_assert(kernel_data.bvh.use_qbvh == false); return BVH_FUNCTION_FULL_NAME(BVH)(kg, ray, isect_array, diff --git a/intern/cycles/kernel/geom/geom_bvh_subsurface.h b/intern/cycles/kernel/geom/geom_bvh_subsurface.h index ff462142f6f..974e0e47e12 100644 --- a/intern/cycles/kernel/geom/geom_bvh_subsurface.h +++ b/intern/cycles/kernel/geom/geom_bvh_subsurface.h @@ -316,6 +316,7 @@ ccl_device_inline uint BVH_FUNCTION_NAME(KernelGlobals *kg, else #endif { + kernel_assert(kernel_data.bvh.use_qbvh == false); return BVH_FUNCTION_FULL_NAME(BVH)(kg, ray, isect_array, diff --git a/intern/cycles/kernel/geom/geom_bvh_traversal.h b/intern/cycles/kernel/geom/geom_bvh_traversal.h index 6e5b6ea476e..7cbb1bece55 100644 --- a/intern/cycles/kernel/geom/geom_bvh_traversal.h +++ b/intern/cycles/kernel/geom/geom_bvh_traversal.h @@ -401,6 +401,7 @@ ccl_device_inline bool BVH_FUNCTION_NAME(KernelGlobals *kg, else #endif { + kernel_assert(kernel_data.bvh.use_qbvh == false); return BVH_FUNCTION_FULL_NAME(BVH)(kg, ray, isect, diff --git a/intern/cycles/kernel/geom/geom_bvh_volume.h b/intern/cycles/kernel/geom/geom_bvh_volume.h index 8a25b5dc884..152aa957277 100644 --- a/intern/cycles/kernel/geom/geom_bvh_volume.h +++ b/intern/cycles/kernel/geom/geom_bvh_volume.h @@ -327,6 +327,7 @@ ccl_device_inline bool BVH_FUNCTION_NAME(KernelGlobals *kg, else #endif { + kernel_assert(kernel_data.bvh.use_qbvh == false); return BVH_FUNCTION_FULL_NAME(BVH)(kg, ray, isect); |