diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-20 14:29:07 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-20 17:58:39 +0300 |
| commit | a5f14ad1a232debf108d1093d6d285c835754b90 (patch) | |
| tree | 6555c39a5482e2e1cfa0975c63db37d95144f58c /intern/cycles/kernel/bvh/bvh_shadow_all.h | |
| parent | a6db95cd4215dfe20038617ddb81f9ec300ec06b (diff) | |
Cycles: Make regular bvh traversal functions close to each other
Diffstat (limited to 'intern/cycles/kernel/bvh/bvh_shadow_all.h')
| -rw-r--r-- | intern/cycles/kernel/bvh/bvh_shadow_all.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/kernel/bvh/bvh_shadow_all.h b/intern/cycles/kernel/bvh/bvh_shadow_all.h index f3dc5cf195f..294362ea995 100644 --- a/intern/cycles/kernel/bvh/bvh_shadow_all.h +++ b/intern/cycles/kernel/bvh/bvh_shadow_all.h @@ -108,7 +108,7 @@ bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg, do { /* traverse internal nodes */ while(node_addr >= 0 && node_addr != ENTRYPOINT_SENTINEL) { - int node_addr_ahild1, traverse_mask; + int node_addr_child1, traverse_mask; float dist[2]; float4 cnodes = kernel_tex_fetch(__bvh_nodes, node_addr+0); @@ -141,25 +141,25 @@ bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg, #endif // __KERNEL_SSE2__ node_addr = __float_as_int(cnodes.z); - node_addr_ahild1 = __float_as_int(cnodes.w); + node_addr_child1 = __float_as_int(cnodes.w); if(traverse_mask == 3) { /* Both children were intersected, push the farther one. */ bool is_closest_child1 = (dist[1] < dist[0]); if(is_closest_child1) { int tmp = node_addr; - node_addr = node_addr_ahild1; - node_addr_ahild1 = tmp; + node_addr = node_addr_child1; + node_addr_child1 = tmp; } ++stack_ptr; kernel_assert(stack_ptr < BVH_STACK_SIZE); - traversal_stack[stack_ptr] = node_addr_ahild1; + traversal_stack[stack_ptr] = node_addr_child1; } else { /* One child was intersected. */ if(traverse_mask == 2) { - node_addr = node_addr_ahild1; + node_addr = node_addr_child1; } else if(traverse_mask == 0) { /* Neither child was intersected. */ |