[Bf-blender-cvs] [a5f14ad] master: Cycles: Make regular bvh traversal functions close to each other

[Sergey Sharybin]

Commit: a5f14ad1a232debf108d1093d6d285c835754b90
Author: Sergey Sharybin
Date:   Tue Sep 20 13:29:07 2016 +0200
Branches: master
https://developer.blender.org/rBa5f14ad1a232debf108d1093d6d285c835754b90

Cycles: Make regular bvh traversal functions close to each other

===================================================================

M	intern/cycles/kernel/bvh/bvh_shadow_all.h
M	intern/cycles/kernel/bvh/bvh_volume_all.h

===================================================================

diff --git a/intern/cycles/kernel/bvh/bvh_shadow_all.h b/intern/cycles/kernel/bvh/bvh_shadow_all.h
index f3dc5cf..294362e 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. */
diff --git a/intern/cycles/kernel/bvh/bvh_volume_all.h b/intern/cycles/kernel/bvh/bvh_volume_all.h
index 67b2562..529848e 100644
--- a/intern/cycles/kernel/bvh/bvh_volume_all.h
+++ b/intern/cycles/kernel/bvh/bvh_volume_all.h
@@ -99,7 +99,7 @@ uint BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 	ssef tsplat(0.0f, 0.0f, -isect_t, -isect_t);
 
 	gen_idirsplat_swap(pn, shuf_identity, shuf_swap, idir, idirsplat, shufflexyz);
-#endif
+#endif  /* __KERNEL_SSE2__ */
 
 	IsectPrecalc isect_precalc;
 	triangle_intersect_precalc(dir, &isect_precalc);
@@ -378,7 +378,7 @@ uint BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 			node_addr = traversal_stack[stack_ptr];
 			--stack_ptr;
 		}
-#endif  /* FEATURE(BVH_MOTION) */
+#endif  /* FEATURE(BVH_INSTANCING) */
 	} while(node_addr != ENTRYPOINT_SENTINEL);
 
 	return num_hits;