diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-23 15:01:42 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-23 19:45:19 +0300 |
commit | f8a999c965435ed6cf3ed83aa4f1121c79f2a403 (patch) | |
tree | 9a8111a874e36c233444ab04a8d66955e4be379c /intern/cycles/kernel/bvh/qbvh_traversal.h | |
parent | b797a5ff7849b6c32c7aefeccbf52445c9ccc597 (diff) |
Cycles: Move triangle intersection precalc to an util file
This is a preparation work for the followup commit which wil l move
remaining parts of Woop intersection logic to an utility file.
Doing it as a separate commit to keep changes more atomic and easier
to bisect when/if needed.
Diffstat (limited to 'intern/cycles/kernel/bvh/qbvh_traversal.h')
-rw-r--r-- | intern/cycles/kernel/bvh/qbvh_traversal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/bvh/qbvh_traversal.h b/intern/cycles/kernel/bvh/qbvh_traversal.h index c20a8f3703f..bf69bfade1b 100644 --- a/intern/cycles/kernel/bvh/qbvh_traversal.h +++ b/intern/cycles/kernel/bvh/qbvh_traversal.h @@ -106,8 +106,8 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals *kg, &near_x, &near_y, &near_z, &far_x, &far_y, &far_z); - IsectPrecalc isect_precalc; - triangle_intersect_precalc(dir, &isect_precalc); + TriangleIsectPrecalc isect_precalc; + ray_triangle_intersect_precalc(dir, &isect_precalc); /* Traversal loop. */ do { @@ -447,7 +447,7 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals *kg, org4 = sse3f(ssef(P.x), ssef(P.y), ssef(P.z)); # endif - triangle_intersect_precalc(dir, &isect_precalc); + ray_triangle_intersect_precalc(dir, &isect_precalc); ++stack_ptr; kernel_assert(stack_ptr < BVH_QSTACK_SIZE); @@ -489,7 +489,7 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals *kg, org4 = sse3f(ssef(P.x), ssef(P.y), ssef(P.z)); # endif - triangle_intersect_precalc(dir, &isect_precalc); + ray_triangle_intersect_precalc(dir, &isect_precalc); object = OBJECT_NONE; node_addr = traversal_stack[stack_ptr].addr; |