Commit: b30cc7071b77731a3a8c2782553e3668bd822fe2 Author: Nikita Sirgienko Date: Tue Mar 30 16:53:43 2021 +0200 Branches: master https://developer.blender.org/rBb30cc7071b77731a3a8c2782553e3668bd822fe2
Fix Cycles build error with "make developer" on some CPUs The combination of building unit tests and WITH_CYCLES_NATIVE_ONLY did not correctly detect when AVX/AVX2 support is available. Differential Revision: https://developer.blender.org/D8201 =================================================================== M intern/cycles/test/util_avxf_avx2_test.cpp M intern/cycles/test/util_avxf_avx_test.cpp =================================================================== diff --git a/intern/cycles/test/util_avxf_avx2_test.cpp b/intern/cycles/test/util_avxf_avx2_test.cpp index c5365a81a51..4a98a6fca73 100644 --- a/intern/cycles/test/util_avxf_avx2_test.cpp +++ b/intern/cycles/test/util_avxf_avx2_test.cpp @@ -18,6 +18,7 @@ #define TEST_CATEGORY_NAME util_avx2 -#if defined(i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64) +#if (defined(i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)) && \ + defined(__AVX2__) # include "util_avxf_test.h" #endif diff --git a/intern/cycles/test/util_avxf_avx_test.cpp b/intern/cycles/test/util_avxf_avx_test.cpp index dbac20c69b3..2ae8afd52ea 100644 --- a/intern/cycles/test/util_avxf_avx_test.cpp +++ b/intern/cycles/test/util_avxf_avx_test.cpp @@ -18,6 +18,7 @@ #define TEST_CATEGORY_NAME util_avx -#if defined(i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64) +#if (defined(i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)) && \ + defined(__AVX__) # include "util_avxf_test.h" #endif _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
