diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-07-11 13:31:25 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-07-11 14:58:47 +0300 |
| commit | 2ecbc3b7775f567fdad41928361c6e3403fd08c2 (patch) | |
| tree | 60b7243fb5edb911a07c144b19ed4c2d340be8ec | |
| parent | 4355603790712032e89fa4da6d8ce7f3ede62b4f (diff) | |
Cycles: Add _all suffix to shadow traversal file
Matches better naming of volume traversal files, where we've got
optimized versions of a single step of volume intersection and
traversal which will gather all volume intersections.
| -rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/bvh/bvh.h | 10 | ||||
| -rw-r--r-- | intern/cycles/kernel/bvh/bvh_shadow_all.h (renamed from intern/cycles/kernel/bvh/bvh_shadow.h) | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/bvh/qbvh_shadow_all.h (renamed from intern/cycles/kernel/bvh/qbvh_shadow.h) | 0 |
4 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 3f0917bb992..bd3969b2889 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -31,13 +31,13 @@ set(SRC set(SRC_BVH_HEADERS bvh/bvh.h bvh/bvh_nodes.h - bvh/bvh_shadow.h + bvh/bvh_shadow_all.h bvh/bvh_subsurface.h bvh/bvh_traversal.h bvh/bvh_volume.h bvh/bvh_volume_all.h bvh/qbvh_nodes.h - bvh/qbvh_shadow.h + bvh/qbvh_shadow_all.h bvh/qbvh_subsurface.h bvh/qbvh_traversal.h bvh/qbvh_volume.h diff --git a/intern/cycles/kernel/bvh/bvh.h b/intern/cycles/kernel/bvh/bvh.h index b1802596c5a..59881738195 100644 --- a/intern/cycles/kernel/bvh/bvh.h +++ b/intern/cycles/kernel/bvh/bvh.h @@ -153,31 +153,31 @@ CCL_NAMESPACE_BEGIN #if defined(__SHADOW_RECORD_ALL__) # define BVH_FUNCTION_NAME bvh_intersect_shadow_all # define BVH_FUNCTION_FEATURES 0 -# include "bvh_shadow.h" +# include "bvh_shadow_all.h" #endif #if defined(__SHADOW_RECORD_ALL__) && defined(__INSTANCING__) # define BVH_FUNCTION_NAME bvh_intersect_shadow_all_instancing # define BVH_FUNCTION_FEATURES BVH_INSTANCING -# include "bvh_shadow.h" +# include "bvh_shadow_all.h" #endif #if defined(__SHADOW_RECORD_ALL__) && defined(__HAIR__) # define BVH_FUNCTION_NAME bvh_intersect_shadow_all_hair # define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR -# include "bvh_shadow.h" +# include "bvh_shadow_all.h" #endif #if defined(__SHADOW_RECORD_ALL__) && defined(__OBJECT_MOTION__) # define BVH_FUNCTION_NAME bvh_intersect_shadow_all_motion # define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_MOTION -# include "bvh_shadow.h" +# include "bvh_shadow_all.h" #endif #if defined(__SHADOW_RECORD_ALL__) && defined(__HAIR__) && defined(__OBJECT_MOTION__) # define BVH_FUNCTION_NAME bvh_intersect_shadow_all_hair_motion # define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR|BVH_MOTION -# include "bvh_shadow.h" +# include "bvh_shadow_all.h" #endif /* Record all intersections - Volume BVH traversal */ diff --git a/intern/cycles/kernel/bvh/bvh_shadow.h b/intern/cycles/kernel/bvh/bvh_shadow_all.h index 02147d20fee..5824de5b1c1 100644 --- a/intern/cycles/kernel/bvh/bvh_shadow.h +++ b/intern/cycles/kernel/bvh/bvh_shadow_all.h @@ -18,7 +18,7 @@ */ #ifdef __QBVH__ -# include "qbvh_shadow.h" +# include "qbvh_shadow_all.h" #endif #if BVH_FEATURE(BVH_HAIR) diff --git a/intern/cycles/kernel/bvh/qbvh_shadow.h b/intern/cycles/kernel/bvh/qbvh_shadow_all.h index e5e611a0d47..e5e611a0d47 100644 --- a/intern/cycles/kernel/bvh/qbvh_shadow.h +++ b/intern/cycles/kernel/bvh/qbvh_shadow_all.h |