Commit: 270bbc89ec2b311ea6d2467304606116fcc38ed1
Author: Thomas Dinges
Date: Fri Feb 13 09:27:54 2015 +0100
Branches: master
https://developer.blender.org/rB270bbc89ec2b311ea6d2467304606116fcc38ed1
Fix Cycles compilation on x86, without SSE.
===================================================================
M intern/cycles/util/util_sseb.h
M intern/cycles/util/util_ssef.h
M intern/cycles/util/util_ssei.h
===================================================================
diff --git a/intern/cycles/util/util_sseb.h b/intern/cycles/util/util_sseb.h
index b517dc9..61892f4 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 dfbc841..80911cd 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 45d2542..b2a71a8 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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
