Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: trailing space

Browse Source
This commit is contained in:
Campbell Barton
2018-08-30 01:05:13 +10:00
parent ddf8c49736
commit 76a9752be2
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/cmake/platform/platform_win32.cmake
View File

@@ -454,7 +454,7 @@ if(WITH_OPENCOLORIO)
set(OPENCOLORIO ${LIBDIR}/opencolorio) set(OPENCOLORIO ${LIBDIR}/opencolorio)
set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include) set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
set(OPENCOLORIO_LIBPATH ${LIBDIR}/opencolorio/lib) set(OPENCOLORIO_LIBPATH ${LIBDIR}/opencolorio/lib)
set(OPENCOLORIO_LIBRARIES set(OPENCOLORIO_LIBRARIES
optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib
optimized ${OPENCOLORIO_LIBPATH}/tinyxml.lib optimized ${OPENCOLORIO_LIBPATH}/tinyxml.lib
optimized ${OPENCOLORIO_LIBPATH}/libyaml-cpp.lib optimized ${OPENCOLORIO_LIBPATH}/libyaml-cpp.lib

2
intern/cycles/bvh/bvh8.cpp
View File

@@ -357,7 +357,7 @@ void BVH8::pack_nodes(const BVHNode *root)
idx = nextNodeIdx; idx = nextNodeIdx;
nextNodeIdx += node_is_unaligned(nodes[i], bvh8) nextNodeIdx += node_is_unaligned(nodes[i], bvh8)
? BVH_UNALIGNED_ONODE_SIZE ? BVH_UNALIGNED_ONODE_SIZE
: BVH_ONODE_SIZE; : BVH_ONODE_SIZE;
} }
stack.push_back(BVHStackEntry(nodes[i], idx)); stack.push_back(BVHStackEntry(nodes[i], idx));
} }

11
intern/cycles/util/util_avxb.h
View File

@@ -34,7 +34,7 @@ struct avxb
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// Constructors, Assignment & Cast Operators /// Constructors, Assignment & Cast Operators
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
__forceinline avxb ( ) {} __forceinline avxb ( ) {}
__forceinline avxb ( const avxb& other ) { m256 = other.m256; } __forceinline avxb ( const avxb& other ) { m256 = other.m256; }
__forceinline avxb& operator=( const avxb& other ) { m256 = other.m256; return *this; } __forceinline avxb& operator=( const avxb& other ) { m256 = other.m256; return *this; }
@@ -43,10 +43,10 @@ struct avxb
__forceinline operator const __m256&( void ) const { return m256; } __forceinline operator const __m256&( void ) const { return m256; }
__forceinline operator const __m256i( void ) const { return _mm256_castps_si256(m256); } __forceinline operator const __m256i( void ) const { return _mm256_castps_si256(m256); }
__forceinline operator const __m256d( void ) const { return _mm256_castps_pd(m256); } __forceinline operator const __m256d( void ) const { return _mm256_castps_pd(m256); }
//__forceinline avxb ( bool a ) //__forceinline avxb ( bool a )
// : m256(_mm_lookupmask_ps[(size_t(a) << 3) | (size_t(a) << 2) | (size_t(a) << 1) | size_t(a)]) {} // : m256(_mm_lookupmask_ps[(size_t(a) << 3) | (size_t(a) << 2) | (size_t(a) << 1) | size_t(a)]) {}
//__forceinline avxb ( bool a, bool b) //__forceinline avxb ( bool a, bool b)
// : m256(_mm_lookupmask_ps[(size_t(b) << 3) | (size_t(a) << 2) | (size_t(b) << 1) | size_t(a)]) {} // : m256(_mm_lookupmask_ps[(size_t(b) << 3) | (size_t(a) << 2) | (size_t(b) << 1) | size_t(a)]) {}
//__forceinline avxb ( bool a, bool b, bool c, bool d) //__forceinline avxb ( bool a, bool b, bool c, bool d)
// : m256(_mm_lookupmask_ps[(size_t(d) << 3) | (size_t(c) << 2) | (size_t(b) << 1) | size_t(a)]) {} // : m256(_mm_lookupmask_ps[(size_t(d) << 3) | (size_t(c) << 2) | (size_t(b) << 1) | size_t(a)]) {}
@@ -101,9 +101,9 @@ __forceinline const avxb operator ==( const avxb& a, const avxb& b ) { return _m
__forceinline const avxb select( const avxb& m, const avxb& t, const avxb& f ) { __forceinline const avxb select( const avxb& m, const avxb& t, const avxb& f ) {
#if defined(__KERNEL_SSE41__) #if defined(__KERNEL_SSE41__)
return _mm256_blendv_ps(f, t, m); return _mm256_blendv_ps(f, t, m);
#else #else
return _mm256_or_ps(_mm256_and_ps(m, t), _mm256_andnot_ps(m, f)); return _mm256_or_ps(_mm256_and_ps(m, t), _mm256_andnot_ps(m, f));
#endif #endif
} }
@@ -189,4 +189,3 @@ ccl_device_inline void print_avxb(const char *label, const avxb &a)
CCL_NAMESPACE_END CCL_NAMESPACE_END
//#endif //#endif

1
intern/cycles/util/util_avxf.h
View File

@@ -237,4 +237,3 @@ __forceinline const avxb operator <=(const avxf& a, const avxf& b) {
_mm256_set_m128(_mm_loadu_ps(hiaddr), _mm_loadu_ps(loaddr)) _mm256_set_m128(_mm_loadu_ps(hiaddr), _mm_loadu_ps(loaddr))
CCL_NAMESPACE_END CCL_NAMESPACE_END