Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-06-16 23:00:43 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-06-16 23:00:43 +0400
commit3144ae2c341e06307e4ecab83e9c7bed7a061d37 (patch)
tree94cfeff0500af6c0affaf9b8371ce336a9fe2717 /intern/cycles/util/util_simd.cpp
parent2f527a88b66845a50f686ce255a02d5e04ef3937 (diff)
Cycles: Slight modification to the previous commit
This way util_simd.cpp would not require modifications if/when SSE2 is suddenly supported on 32bit platforms. This also allowed to unleash some issues with util_simd.h related on the fact that there size_t and int are actually the same types.
Diffstat (limited to 'intern/cycles/util/util_simd.cpp')
-rw-r--r--intern/cycles/util/util_simd.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/intern/cycles/util/util_simd.cpp b/intern/cycles/util/util_simd.cpp
index 8f5e78d9fbd..0436823e62a 100644
--- a/intern/cycles/util/util_simd.cpp
+++ b/intern/cycles/util/util_simd.cpp
@@ -15,15 +15,13 @@
* limitations under the License
*/
-/* SSE optimization disabled for now on 32 bit, see bug #36316 */
-#if !(defined(__GNUC__) && (defined(i386) || defined(_M_IX86)))
+#ifdef WITH_KERNEL_SSE2
+#define __KERNEL_SSE2__
#include "util_simd.h"
CCL_NAMESPACE_BEGIN
-#ifdef WITH_KERNEL_SSE2
-
const __m128 _mm_lookupmask_ps[16] = {
_mm_castsi128_ps(_mm_set_epi32( 0, 0, 0, 0)),
_mm_castsi128_ps(_mm_set_epi32( 0, 0, 0,-1)),
@@ -43,8 +41,7 @@ const __m128 _mm_lookupmask_ps[16] = {
_mm_castsi128_ps(_mm_set_epi32(-1,-1,-1,-1))
};
-#endif // WITH_KERNEL_SSE2
CCL_NAMESPACE_END
-#endif
+#endif // WITH_KERNEL_SSE2