From bec41ffe514116ee3994086208103b8dfcda5a33 Mon Sep 17 00:00:00 2001 From: christophe-lunarg Date: Wed, 9 Dec 2020 21:43:38 +0100 Subject: [PATCH] Fix AVX2 detection --- test/CMakeLists.txt | 2 +- test/core/core_setup_message.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 2fd15de4..e7f85f19 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -106,7 +106,7 @@ if(GLM_TEST_FORCE_PURE) message(STATUS "GLM: No SIMD instruction set") elseif(GLM_TEST_ENABLE_SIMD_AVX2) - add_definitions(-DGLM_FORCE_PURE) + add_definitions(-DGLM_FORCE_INTRINSICS) if((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) add_compile_options(-mavx2) diff --git a/test/core/core_setup_message.cpp b/test/core/core_setup_message.cpp index fc93fdd2..7594743d 100644 --- a/test/core/core_setup_message.cpp +++ b/test/core/core_setup_message.cpp @@ -175,9 +175,9 @@ int test_instruction_set() std::printf("ARM "); if(GLM_ARCH & GLM_ARCH_NEON_BIT) std::printf("NEON "); - if(GLM_ARCH & GLM_ARCH_AVX2) + if(GLM_ARCH & GLM_ARCH_AVX2_BIT) std::printf("AVX2 "); - if(GLM_ARCH & GLM_ARCH_AVX) + if(GLM_ARCH & GLM_ARCH_AVX_BIT) std::printf("AVX "); if(GLM_ARCH & GLM_ARCH_SSE42_BIT) std::printf("SSE4.2 ");