[Bf-blender-cvs] [a7ec07d] cycles_bvh: Cycles: Finish optimization from previous commit, now includes non-SSE2 kernels

[Sergey Sharybin]

Commit: a7ec07d108944d64fb0b15e320cabac952477957
Author: Sergey Sharybin
Date:   Fri Jun 17 14:54:52 2016 +0200
Branches: cycles_bvh
https://developer.blender.org/rBa7ec07d108944d64fb0b15e320cabac952477957

Cycles: Finish optimization from previous commit, now includes non-SSE2 kernels

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

M	intern/cycles/kernel/geom/geom_bvh_shadow.h
M	intern/cycles/kernel/geom/geom_bvh_subsurface.h
M	intern/cycles/kernel/geom/geom_bvh_traversal.h
M	intern/cycles/kernel/geom/geom_bvh_volume.h
M	intern/cycles/kernel/geom/geom_bvh_volume_all.h

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

diff --git a/intern/cycles/kernel/geom/geom_bvh_shadow.h b/intern/cycles/kernel/geom/geom_bvh_shadow.h
index 3b374ce..b1b204d 100644
--- a/intern/cycles/kernel/geom/geom_bvh_shadow.h
+++ b/intern/cycles/kernel/geom/geom_bvh_shadow.h
@@ -108,7 +108,9 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 #if !defined(__KERNEL_SSE2__)
 				traverse_mask = NODE_INTERSECT(kg,
 				                               P,
+#  if BVH_FEATURE(BVH_HAIR)
 				                               dir,
+#  endif
 				                               idir,
 				                               isect_t,
 				                               PATH_RAY_SHADOW,
diff --git a/intern/cycles/kernel/geom/geom_bvh_subsurface.h b/intern/cycles/kernel/geom/geom_bvh_subsurface.h
index 2a9fc11..8e19535 100644
--- a/intern/cycles/kernel/geom/geom_bvh_subsurface.h
+++ b/intern/cycles/kernel/geom/geom_bvh_subsurface.h
@@ -117,7 +117,9 @@ ccl_device void BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 #if !defined(__KERNEL_SSE2__)
 				traverse_mask = NODE_INTERSECT(kg,
 				                               P,
+#  if BVH_FEATURE(BVH_HAIR)
 				                               dir,
+#  endif
 				                               idir,
 				                               isect_t,
 				                               PATH_RAY_ALL_VISIBILITY,
diff --git a/intern/cycles/kernel/geom/geom_bvh_traversal.h b/intern/cycles/kernel/geom/geom_bvh_traversal.h
index b1e21fa..debd950 100644
--- a/intern/cycles/kernel/geom/geom_bvh_traversal.h
+++ b/intern/cycles/kernel/geom/geom_bvh_traversal.h
@@ -119,7 +119,9 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 				if(difl != 0.0f) {
 					traverse_mask = NODE_INTERSECT_ROBUST(kg,
 					                                      P,
+#    if BVH_FEATURE(BVH_HAIR)
 					                                      dir,
+#    endif
 					                                      idir,
 					                                      isect->t,
 					                                      difl,
@@ -132,7 +134,9 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 				{
 					traverse_mask = NODE_INTERSECT(kg,
 					                               P,
+#    if BVH_FEATURE(BVH_HAIR)
 					                               dir,
+#    endif
 					                               idir,
 					                               isect->t,
 					                               visibility,
diff --git a/intern/cycles/kernel/geom/geom_bvh_volume.h b/intern/cycles/kernel/geom/geom_bvh_volume.h
index 91be5f4..5cd5453 100644
--- a/intern/cycles/kernel/geom/geom_bvh_volume.h
+++ b/intern/cycles/kernel/geom/geom_bvh_volume.h
@@ -105,7 +105,9 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 #if !defined(__KERNEL_SSE2__)
 				traverse_mask = NODE_INTERSECT(kg,
 				                               P,
+#  if BVH_FEATURE(BVH_HAIR)
 				                               dir,
+#  endif
 				                               idir,
 				                               isect->t,
 				                               visibility,
diff --git a/intern/cycles/kernel/geom/geom_bvh_volume_all.h b/intern/cycles/kernel/geom/geom_bvh_volume_all.h
index 39a6c7d..b8d246a 100644
--- a/intern/cycles/kernel/geom/geom_bvh_volume_all.h
+++ b/intern/cycles/kernel/geom/geom_bvh_volume_all.h
@@ -109,7 +109,9 @@ ccl_device uint BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 #if !defined(__KERNEL_SSE2__)
 				traverse_mask = NODE_INTERSECT(kg,
 				                               P,
+#  if BVH_FEATURE(BVH_HAIR)
 				                               dir,
+#  endif
 				                               idir,
 				                               isect_t,
 				                               visibility,