[Bf-blender-cvs] [96726059380] master: Fix build error on Windows/Linux after recent AVX changes

Brecht Van Lommel noreply at git.blender.org
Thu Apr 2 17:09:33 CEST 2020


Commit: 967260593807c1e6f294c1ce8b5a220526f4597a
Author: Brecht Van Lommel
Date:   Thu Apr 2 17:08:24 2020 +0200
Branches: master
https://developer.blender.org/rB967260593807c1e6f294c1ce8b5a220526f4597a

Fix build error on Windows/Linux after recent AVX changes

===================================================================

M	intern/cycles/util/util_avxf.h

===================================================================

diff --git a/intern/cycles/util/util_avxf.h b/intern/cycles/util/util_avxf.h
index 6781290bb83..47d416afbb7 100644
--- a/intern/cycles/util/util_avxf.h
+++ b/intern/cycles/util/util_avxf.h
@@ -266,20 +266,20 @@ template<size_t i0> __forceinline const avxf shuffle(const avxf &a)
 
 template<size_t i> __forceinline float extract(const avxf &a)
 {
-  return _mm256_cvtss_f32(shuffle<i, i, i, i>(a));
+  return _mm256_cvtss_f32(shuffle<i, i, i, i>(a).m256);
 }
 template<> __forceinline float extract<0>(const avxf &a)
 {
-  return _mm256_cvtss_f32(a);
+  return _mm256_cvtss_f32(a.m256);
 }
 
 __forceinline ssef low(const avxf &a)
 {
-  return _mm256_extractf128_ps(a, 0);
+  return _mm256_extractf128_ps(a.m256, 0);
 }
 __forceinline ssef high(const avxf &a)
 {
-  return _mm256_extractf128_ps(a, 1);
+  return _mm256_extractf128_ps(a.m256, 1);
 }
 
 template<int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7>



More information about the Bf-blender-cvs mailing list