[Bf-blender-cvs] [d55868c] master: Cycles: And yet another compilation fix after half-float commit for clang.

[Sv. Lockal]

Commit: d55868c3b2004cba008e21f5607dc08076594451
Author: Sv. Lockal
Date:   Sun May 10 19:32:32 2015 +0000
Branches: master
https://developer.blender.org/rBd55868c3b2004cba008e21f5607dc08076594451

Cycles: And yet another compilation fix after half-float commit for clang.

Suggested by Brecht, tested with gcc > 4.4 and Clang

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

M	intern/cycles/util/util_optimization.h

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

diff --git a/intern/cycles/util/util_optimization.h b/intern/cycles/util/util_optimization.h
index b230bb1..c951c35 100644
--- a/intern/cycles/util/util_optimization.h
+++ b/intern/cycles/util/util_optimization.h
@@ -102,28 +102,7 @@
 #ifdef _MSC_VER
 #include <intrin.h>
 #else
-
-#ifdef __KERNEL_SSE2__
-#include <xmmintrin.h> /* SSE 1 */
-#include <emmintrin.h> /* SSE 2 */
-#endif
-
-#ifdef __KERNEL_SSE3__
-#include <pmmintrin.h> /* SSE 3 */
-#endif
-
-#ifdef __KERNEL_SSSE3__
-#include <tmmintrin.h> /* SSSE 3 */
-#endif
-
-#ifdef __KERNEL_SSE41__
-#include <smmintrin.h> /* SSE 4.1 */
-#endif
-
-#ifdef __KERNEL_AVX__
-#include <immintrin.h> /* AVX */
-#endif
-
+#include <x86intrin.h>
 #endif
 
 #else