[Bf-blender-cvs] [de22e55] master: Cycles: Fix compilation error of AVX2 kernel without SSE math

[Sergey Sharybin]

Commit: de22e55291029126d1964de1c616d6b70a62e6bf
Author: Sergey Sharybin
Date:   Wed Oct 26 20:49:33 2016 +0200
Branches: master
https://developer.blender.org/rBde22e55291029126d1964de1c616d6b70a62e6bf

Cycles: Fix compilation error of AVX2 kernel without SSE math

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

M	intern/cycles/kernel/geom/geom_triangle_intersect.h

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

diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h
index 5d76fc3..eb73405 100644
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h
@@ -120,7 +120,7 @@ ccl_device_inline bool triangle_intersect(KernelGlobals *kg,
 	/* Calculate vertices relative to ray origin. */
 	const uint tri_vindex = kernel_tex_fetch(__prim_tri_index, triAddr);
 
-#if defined(__KERNEL_AVX2__)
+#if defined(__KERNEL_AVX2__) && defined(__KERNEL_SSE__)
 	const avxf avxf_P(P.m128, P.m128);
 
 	const avxf tri_ab = kernel_tex_fetch_avxf(__prim_tri_verts, tri_vindex + 0);
@@ -282,7 +282,7 @@ ccl_device_inline void triangle_intersect_subsurface(
 	             tri_b = kernel_tex_fetch(__prim_tri_verts, tri_vindex+1),
 	             tri_c = kernel_tex_fetch(__prim_tri_verts, tri_vindex+2);
 
-#if defined(__KERNEL_AVX2__)
+#if defined(__KERNEL_AVX2__) && defined(__KERNEL_SSE__)
 	const avxf avxf_P(P.m128, P.m128);
 
 	const avxf tri_ab = kernel_tex_fetch_avxf(__prim_tri_verts, tri_vindex + 0);