Attachment #541204 for bug #662248

View | Details | Raw Unified | Return to bug 662248
Collapse All | Expand All

Lines 116-122 __forceinline const sseb unpacklo( const sseb& a, const sseb& b ) { return _mm_u Link Here

(-)a/intern/cycles/util/util_sseb.h (-1 / +1 lines)
116	__forceinline const sseb unpackhi( const sseb& a, const sseb& b ) { return _mm_unpackhi_ps(a, b); }	116	__forceinline const sseb unpackhi( const sseb& a, const sseb& b ) { return _mm_unpackhi_ps(a, b); }
117		117
118	template<size_t i0, size_t i1, size_t i2, size_t i3> __forceinline const sseb shuffle( const sseb& a ) {	118	template<size_t i0, size_t i1, size_t i2, size_t i3> __forceinline const sseb shuffle( const sseb& a ) {
119	return _mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0));	119	return _mm_castsi128_ps(_mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0)));
120	}	120	}
121		121
122	template<> __forceinline const sseb shuffle<0, 1, 0, 1>( const sseb& a ) {	122	template<> __forceinline const sseb shuffle<0, 1, 0, 1>( const sseb& a ) {

Lines 603-609 ccl_device_inline const ssef uint32_to_float(const ssei &in) Link Here

(-)a/intern/cycles/util/util_ssef.h (-1 / +1 lines)
603	template<size_t S1, size_t S2, size_t S3, size_t S4>	603	template<size_t S1, size_t S2, size_t S3, size_t S4>
604	ccl_device_inline const ssef set_sign_bit(const ssef &a)	604	ccl_device_inline const ssef set_sign_bit(const ssef &a)
605	{	605	{
606	return a ^ cast(ssei(S1 << 31, S2 << 31, S3 << 31, S4 << 31));	606	return cast(cast(a) ^ ssei(S1 << 31, S2 << 31, S3 << 31, S4 << 31));
607	}	607	}
608		608
609	////////////////////////////////////////////////////////////////////////////////	609	////////////////////////////////////////////////////////////////////////////////

Lines 34-40 namespace KDL Link Here

(-)a/intern/itasc/kdl/tree.hpp (-1 / +1 lines)
34	//Forward declaration	34	//Forward declaration
35	class TreeElement;	35	class TreeElement;
36	// Eigen allocator is needed for alignment of Eigen data types	36	// Eigen allocator is needed for alignment of Eigen data types
37	typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<std::string, TreeElement> > > SegmentMap;	37	typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<const std::string, TreeElement> > > SegmentMap;
38		38
39	class TreeElement	39	class TreeElement
40	{	40	{

Return to bug 662248