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:
authorThomas Dinges <blender@dingto.org>2015-02-13 11:27:54 +0300
committerThomas Dinges <blender@dingto.org>2015-02-13 11:29:16 +0300
commit270bbc89ec2b311ea6d2467304606116fcc38ed1 (patch)
tree8c9eedb2b54320f8f8db9db78a30317b92056100 /intern/cycles/util
parent34e9f6b9564b30a4d431d7c3cfa4821a9fe25690 (diff)
Fix Cycles compilation on x86, without SSE.
Diffstat (limited to 'intern/cycles/util')
-rw-r--r--intern/cycles/util/util_sseb.h4
-rw-r--r--intern/cycles/util/util_ssef.h4
-rw-r--r--intern/cycles/util/util_ssei.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/util/util_sseb.h b/intern/cycles/util/util_sseb.h
index b517dc95adc..61892f4a71f 100644
--- a/intern/cycles/util/util_sseb.h
+++ b/intern/cycles/util/util_sseb.h
@@ -153,14 +153,14 @@ __forceinline bool none ( const sseb& b ) { return _mm_movemask_ps(b) == 0x
__forceinline size_t movemask( const sseb& a ) { return _mm_movemask_ps(a); }
-#endif
-
ccl_device_inline void print_sseb(const char *label, const sseb &a)
{
printf("%s: %df %df %df %d\n",
label, a[0], a[1], a[2], a[3]);
}
+#endif
+
CCL_NAMESPACE_END
#endif
diff --git a/intern/cycles/util/util_ssef.h b/intern/cycles/util/util_ssef.h
index dfbc8416b96..80911cd7282 100644
--- a/intern/cycles/util/util_ssef.h
+++ b/intern/cycles/util/util_ssef.h
@@ -580,8 +580,6 @@ ccl_device_inline const ssef set_sign_bit(const ssef &a)
return a ^ cast(ssei(S1 << 31, S2 << 31, S3 << 31, S4 << 31));
}
-#endif
-
ccl_device_inline void print_ssef(const char *label, const ssef &a)
{
printf("%s: %.8f %.8f %.8f %.8f\n",
@@ -592,6 +590,8 @@ ccl_device_inline void print_ssef(const char *label, const ssef &a)
(double)a[3]);
}
+#endif
+
CCL_NAMESPACE_END
#endif
diff --git a/intern/cycles/util/util_ssei.h b/intern/cycles/util/util_ssei.h
index 45d2542acce..b2a71a8d396 100644
--- a/intern/cycles/util/util_ssei.h
+++ b/intern/cycles/util/util_ssei.h
@@ -286,14 +286,14 @@ __forceinline void store4i_nt(void* ptr, const ssei& v) {
#endif
}
-#endif
-
ccl_device_inline void print_ssei(const char *label, const ssei &a)
{
printf("%s: %df %df %df %d\n",
label, a[0], a[1], a[2], a[3]);
}
+#endif
+
CCL_NAMESPACE_END
#endif