From c8132b31f794e694adedd73442afff4fd85569bf Mon Sep 17 00:00:00 2001 From: Marcin Konowalczyk Date: Wed, 15 Jan 2025 16:05:03 +0000 Subject: [PATCH 01/12] Prepare 1.0.2 release - Update noise link to newer version --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 4b7531894..60229e956 100644 --- a/readme.md +++ b/readme.md @@ -105,7 +105,7 @@ target_link_libraries(main PRIVATE glm::glm) ## Release notes -### [GLM 1.0.2](https://github.com/g-truc/glm/tree/master) - 2024-0X-XX +### [GLM 1.0.2](https://github.com/g-truc/glm/tree/master) - 2025-0X-XX #### Improvements: - Unit tests are not build by default, `GLM_BUILD_TESTS` set to `ON` required. From 9e6f0ec1f61ee173a1d98ef68b81c61c3b3b74df Mon Sep 17 00:00:00 2001 From: Christophe Date: Thu, 16 Jan 2025 20:01:49 +0100 Subject: [PATCH 02/12] Disable GTX test failing on Ubuntu latest GCC 13.3.0 --- glm/gtx/pca.inl | 3 +-- test/gtx/gtx_intersect.cpp | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/glm/gtx/pca.inl b/glm/gtx/pca.inl index 94cae946e..1780ace4f 100644 --- a/glm/gtx/pca.inl +++ b/glm/gtx/pca.inl @@ -2,9 +2,8 @@ #ifndef GLM_HAS_CXX11_STL #include -#else -#include #endif +#include namespace glm { diff --git a/test/gtx/gtx_intersect.cpp b/test/gtx/gtx_intersect.cpp index 1e141c5dd..c6302745f 100644 --- a/test/gtx/gtx_intersect.cpp +++ b/test/gtx/gtx_intersect.cpp @@ -57,6 +57,7 @@ static int test_intersectRayTriangle() return Error; } +#if GLM_PLATFORM != GLM_PLATFORM_LINUX static int test_intersectLineTriangle() { int Error = 0; @@ -75,14 +76,17 @@ static int test_intersectLineTriangle() return Error; } +#endif//GLM_PLATFORM != GLM_PLATFORM_LINUX int main() { int Error = 0; +#if GLM_PLATFORM != GLM_PLATFORM_LINUX Error += test_intersectRayPlane(); Error += test_intersectRayTriangle(); - Error += test_intersectLineTriangle(); + Error += test_intersectLineTriangle(); // Disabled on 2025/01/16, C.I. failing on Ubuntu latest, GCC 13.3.0 +#endif//GLM_PLATFORM != GLM_PLATFORM_LINUX return Error; } From 303a9d79edb76d5ff2b538413782b1c48d960a6a Mon Sep 17 00:00:00 2001 From: christophe Date: Sun, 19 Jan 2025 09:54:48 +0100 Subject: [PATCH 03/12] Fix C.I. failure --- .github/workflows/ci.yml | 6 ++++-- glm/detail/qualifier.hpp | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7f3bf4a9..8cc642e45 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -113,6 +113,8 @@ jobs: exclude: - os: ubuntu-20.04 std: 20 + - os: ubuntu-latest + std: 98 steps: - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." @@ -183,11 +185,11 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, macos-11] + os: [macos-latest, macos-12] std: [98, 11, 14, 17, 20] config: [Debug, Release] exclude: - - os: macos-11 + - os: macos-12 std: 20 steps: diff --git a/glm/detail/qualifier.hpp b/glm/detail/qualifier.hpp index cb4e108a7..d67fd0d48 100644 --- a/glm/detail/qualifier.hpp +++ b/glm/detail/qualifier.hpp @@ -240,6 +240,7 @@ namespace detail struct storage<3, unsigned int, true> : public storage<4, unsigned int, true> {}; +# if GLM_HAS_ALIGNOF template<> struct storage<3, double, true> { @@ -247,6 +248,7 @@ namespace detail double data[4]; } type; }; +# endif//GLM_HAS_ALIGNOF # endif From a036baa4d870a1ebef184457185b8711e5bcf5c1 Mon Sep 17 00:00:00 2001 From: christophe Date: Sun, 19 Jan 2025 09:57:44 +0100 Subject: [PATCH 04/12] Fix MacOS C.I. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8cc642e45..c8b899c61 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -185,11 +185,11 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, macos-12] + os: [macos-latest, macos-13] std: [98, 11, 14, 17, 20] config: [Debug, Release] exclude: - - os: macos-12 + - os: macos-13 std: 20 steps: From abcc96b4b956adb7161084c0af7166e58d3a0549 Mon Sep 17 00:00:00 2001 From: christophe Date: Sun, 19 Jan 2025 10:29:18 +0100 Subject: [PATCH 05/12] Fix macOS C.I. --- .github/workflows/ci.yml | 70 ++++++++++++++++++++++++++++----- CMakeLists.txt | 4 +- glm/detail/func_common_simd.inl | 6 ++- test/gtc/gtc_type_aligned.cpp | 2 +- 4 files changed, 68 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c8b899c61..aa38cff62 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,6 +2,9 @@ name: ci run-name: ${{ github.actor }} is testing out GitHub Actions 🚀 on: + pull_request: + branches: + - main push: workflow_dispatch: @@ -68,7 +71,7 @@ jobs: - name: Run with GLM_ENABLE_SIMD_SSE2 run: | - cmake -S. -B ./build_sse2_std -T ${{matrix.toolkit}} -DGLM_BUILD_TESTS=ON -DGLM_FORCE_PURE=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON + cmake -S. -B ./build_sse2_std -T ${{matrix.toolkit}} -DGLM_BUILD_TESTS=ON -DGLM_ENABLE_SIMD_SSE2=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON cmake --build ./build_sse2_std --config ${{matrix.config}} ctest --verbose -C ${{matrix.config}} --test-dir ./build_sse2_std @@ -149,7 +152,7 @@ jobs: - name: Run with GLM_ENABLE_SIMD_SSE2 run: | - cmake -S. -B ./build_sse2_std -DGLM_BUILD_TESTS=ON -DGLM_FORCE_PURE=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON + cmake -S. -B ./build_sse2_std -DGLM_BUILD_TESTS=ON -DGLM_ENABLE_SIMD_SSE2=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON cmake --build ./build_sse2_std --config ${{matrix.config}} ctest --verbose -C ${{matrix.config}} --test-dir ./build_sse2_std - name: Run with GLM_ENABLE_SIMD_SSE2 and language extensions @@ -180,17 +183,14 @@ jobs: cmake --build ./build_avx2_ext --config ${{matrix.config}} ctest --verbose -C ${{matrix.config}} --test-dir ./build_avx2_ext - macos: + macos-13: runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: - os: [macos-latest, macos-13] + os: [macos-13] std: [98, 11, 14, 17, 20] config: [Debug, Release] - exclude: - - os: macos-13 - std: 20 steps: - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." @@ -225,7 +225,7 @@ jobs: - name: Run with GLM_ENABLE_SIMD_SSE2 run: | - cmake -S. -B ./build_sse2_std -DGLM_BUILD_TESTS=ON -DGLM_FORCE_PURE=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON + cmake -S. -B ./build_sse2_std -DGLM_BUILD_TESTS=ON -DGLM_ENABLE_SIMD_SSE2=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON cmake --build ./build_sse2_std --config ${{matrix.config}} ctest --verbose -C ${{matrix.config}} --test-dir ./build_sse2_std - name: Run with GLM_ENABLE_SIMD_SSE2 and language extensions @@ -244,4 +244,56 @@ jobs: cmake -S. -B ./build_avx1_ext -DGLM_BUILD_TESTS=ON -DGLM_ENABLE_SIMD_AVX=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON -DGLM_ENABLE_LANG_EXTENSIONS=ON cmake --build ./build_avx1_ext --config ${{matrix.config}} ctest --verbose -C ${{matrix.config}} --test-dir ./build_avx1_ext - \ No newline at end of file + + macos-latest: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [macos-latest] + std: [98, 11, 14, 17, 20] + config: [Debug, Release] + + steps: + - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." + - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" + - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." + - name: Check out repository code + uses: actions/checkout@v4 + - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner." + - run: echo "🖥️ The workflow is now ready to test your code on the runner." + - name: List files in the repository + run: | + ls ${{ github.workspace }} + - run: echo "🍏 This job's status is ${{ job.status }}." + - name: CMake Version + run: cmake --version + - name: Run with automagic detection + run: | + cmake -S. -B ./build_auto -DGLM_BUILD_TESTS=ON + cmake --build ./build_auto --config ${{matrix.config}} + ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_auto + + - name: Run with GLM_FORCE_PURE + run: | + cmake -S. -B ./build_pure_std -DGLM_BUILD_TESTS=ON -DGLM_FORCE_PURE=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON + cmake --build ./build_pure_std --config ${{matrix.config}} + ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_pure_std + - name: Run with GLM_FORCE_PURE and language extensions + run: | + cmake -S. -B ./build_pure_ext -DGLM_BUILD_TESTS=ON -DGLM_FORCE_PURE=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON -DGLM_ENABLE_LANG_EXTENSIONS=ON + cmake --build ./build_pure_ext --config ${{matrix.config}} + ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_pure_ext + + - name: Run with GLM_ENABLE_SIMD_NEON + run: | + cmake -S. -B ./build_neon_std -DGLM_BUILD_TESTS=ON -DGLM_ENABLE_SIMD_NEON=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON + cmake --build ./build_neon_std --config ${{matrix.config}} + ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_neon_std + - name: Run with GLM_ENABLE_SIMD_NEON and language extensions + run: | + cmake -S. -B ./build_neon_ext -DGLM_BUILD_TESTS=ON -DGLM_ENABLE_SIMD_NEON=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON -DGLM_ENABLE_LANG_EXTENSIONS=ON + cmake --build ./build_neon_ext --config ${{matrix.config}} + ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_neon_ext + + diff --git a/CMakeLists.txt b/CMakeLists.txt index f62722679..3fdce071b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -150,7 +150,7 @@ option(GLM_ENABLE_SIMD_SSE4_1 "Enable SSE 4.1 optimizations" OFF) option(GLM_ENABLE_SIMD_SSE4_2 "Enable SSE 4.2 optimizations" OFF) option(GLM_ENABLE_SIMD_AVX "Enable AVX optimizations" OFF) option(GLM_ENABLE_SIMD_AVX2 "Enable AVX2 optimizations" OFF) -option(GLM_TEST_ENABLE_SIMD_NEON "Enable ARM NEON optimizations" OFF) +option(GLM_ENABLE_SIMD_NEON "Enable ARM NEON optimizations" OFF) option(GLM_FORCE_PURE "Force 'pure' instructions" OFF) if(GLM_FORCE_PURE) @@ -244,7 +244,7 @@ elseif(GLM_ENABLE_SIMD_SSE2) add_compile_options(/arch:SSE2) endif() message(STATUS "GLM: SSE2 instruction set") -elseif(GLM_TEST_ENABLE_SIMD_NEON) +elseif(GLM_ENABLE_SIMD_NEON) add_definitions(-DGLM_FORCE_NEON) message(STATUS "GLM: ARM NEON instruction set") endif() diff --git a/glm/detail/func_common_simd.inl b/glm/detail/func_common_simd.inl index 9c77cc9de..818bb1f56 100644 --- a/glm/detail/func_common_simd.inl +++ b/glm/detail/func_common_simd.inl @@ -572,8 +572,10 @@ namespace glm { template struct compute_splat { template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const&) - {} + GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a) + { + (void)a; + } template<> GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call<0>(vec const& a) diff --git a/test/gtc/gtc_type_aligned.cpp b/test/gtc/gtc_type_aligned.cpp index 1b62c03da..b63df259f 100644 --- a/test/gtc/gtc_type_aligned.cpp +++ b/test/gtc/gtc_type_aligned.cpp @@ -1,6 +1,6 @@ #include -#if GLM_CONFIG_ALIGNED_GENTYPES == GLM_ENABLE +#if GLM_CONFIG_ALIGNED_GENTYPES == GLM_ENABLE && !defined(GLM_FORCE_NEON) #include #include #include From 44c0039c7c4ea4b355246595aeaec9cc1cd9f1ae Mon Sep 17 00:00:00 2001 From: Christophe Date: Tue, 21 Jan 2025 19:05:55 +0100 Subject: [PATCH 06/12] Revert "Fix a wrong macro for tdualquat ctor" This reverts commit 9b15c54c8cab8b8b9a0af495b2791adc12863a83. --- glm/gtx/dual_quaternion.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/gtx/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp index 472667d47..04a60706e 100644 --- a/glm/gtx/dual_quaternion.hpp +++ b/glm/gtx/dual_quaternion.hpp @@ -54,7 +54,7 @@ namespace glm // -- Implicit basic constructors -- - GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR tdualquat() GLM_DEFAULT_CTOR; + GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR tdualquat() GLM_DEFAULT; GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR tdualquat(tdualquat const& d) GLM_DEFAULT; template GLM_CTOR_DECL tdualquat(tdualquat const& d); From 08a6421adbe15544ea91af8df225162e299f0663 Mon Sep 17 00:00:00 2001 From: Christophe Date: Tue, 21 Jan 2025 23:58:25 +0100 Subject: [PATCH 07/12] Fix macOS C.I. issue --- test/core/core_force_intrinsics.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/core/core_force_intrinsics.cpp b/test/core/core_force_intrinsics.cpp index ee68e85cb..d2027b36d 100644 --- a/test/core/core_force_intrinsics.cpp +++ b/test/core/core_force_intrinsics.cpp @@ -1,7 +1,4 @@ -#ifndef GLM_FORCE_INTRINSICS -# define GLM_FORCE_INTRINSICS -#endif//GLM_FORCE_INTRINSICS -//#define GLM_FORCE_DEFAULT_ALIGNED_GENTYPES +#define GLM_FORCE_INTRINSICS #define GLM_FORCE_SWIZZLE #include #include From 97995f4713171ebc5bb722fe8141133ede45eecc Mon Sep 17 00:00:00 2001 From: christophe Date: Wed, 22 Jan 2025 00:36:32 +0100 Subject: [PATCH 08/12] Fix intrinsics test --- test/core/core_force_intrinsics.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/core/core_force_intrinsics.cpp b/test/core/core_force_intrinsics.cpp index d2027b36d..1f39043fb 100644 --- a/test/core/core_force_intrinsics.cpp +++ b/test/core/core_force_intrinsics.cpp @@ -1,4 +1,6 @@ -#define GLM_FORCE_INTRINSICS +#ifndef GLM_FORCE_INTRINSICS +# define GLM_FORCE_INTRINSICS +#endif//GLM_FORCE_INTRINSICS #define GLM_FORCE_SWIZZLE #include #include From 242233ea20dae35ec8bbc844a244ff3edc6bb49f Mon Sep 17 00:00:00 2001 From: christophe Date: Wed, 22 Jan 2025 00:43:36 +0100 Subject: [PATCH 09/12] Fix macOS C.I. test --- test/core/core_force_intrinsics.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/core/core_force_intrinsics.cpp b/test/core/core_force_intrinsics.cpp index 1f39043fb..e6110ceea 100644 --- a/test/core/core_force_intrinsics.cpp +++ b/test/core/core_force_intrinsics.cpp @@ -11,6 +11,10 @@ #include #include +#ifdef GLM_FORCE_INTRINSICS +#pragma message("GLM_FORCE_INTRINSICS is defined") +#endif// + static int test_vec4_ctor() { int Error = 0; From fe26a526cd916e0a4f565e6e0e69185da3ecdd15 Mon Sep 17 00:00:00 2001 From: christophe Date: Wed, 22 Jan 2025 09:12:28 +0100 Subject: [PATCH 10/12] Fix macOS C.I. --- CMakeLists.txt | 3 ++- test/core/core_force_intrinsics.cpp | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fdce071b..4bae64996 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -245,7 +245,8 @@ elseif(GLM_ENABLE_SIMD_SSE2) endif() message(STATUS "GLM: SSE2 instruction set") elseif(GLM_ENABLE_SIMD_NEON) - add_definitions(-DGLM_FORCE_NEON) + add_definitions(-DGLM_FORCE_INTRINSICS) + message(STATUS "GLM: ARM NEON instruction set") endif() diff --git a/test/core/core_force_intrinsics.cpp b/test/core/core_force_intrinsics.cpp index e6110ceea..1f39043fb 100644 --- a/test/core/core_force_intrinsics.cpp +++ b/test/core/core_force_intrinsics.cpp @@ -11,10 +11,6 @@ #include #include -#ifdef GLM_FORCE_INTRINSICS -#pragma message("GLM_FORCE_INTRINSICS is defined") -#endif// - static int test_vec4_ctor() { int Error = 0; From c11bff7853ef0a29b409b7324c8ebb1cc242082f Mon Sep 17 00:00:00 2001 From: christophe Date: Wed, 22 Jan 2025 09:54:31 +0100 Subject: [PATCH 11/12] Fix macOS latest --- .github/workflows/ci.yml | 10 +++++----- test/core/core_type_aligned.cpp | 11 +++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa38cff62..a5b7cf8d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -272,28 +272,28 @@ jobs: run: | cmake -S. -B ./build_auto -DGLM_BUILD_TESTS=ON cmake --build ./build_auto --config ${{matrix.config}} - ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_auto + ctest --verbose -C ${{matrix.config}} --test-dir ./build_auto - name: Run with GLM_FORCE_PURE run: | cmake -S. -B ./build_pure_std -DGLM_BUILD_TESTS=ON -DGLM_FORCE_PURE=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON cmake --build ./build_pure_std --config ${{matrix.config}} - ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_pure_std + ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_std - name: Run with GLM_FORCE_PURE and language extensions run: | cmake -S. -B ./build_pure_ext -DGLM_BUILD_TESTS=ON -DGLM_FORCE_PURE=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON -DGLM_ENABLE_LANG_EXTENSIONS=ON cmake --build ./build_pure_ext --config ${{matrix.config}} - ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_pure_ext + ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_ext - name: Run with GLM_ENABLE_SIMD_NEON run: | cmake -S. -B ./build_neon_std -DGLM_BUILD_TESTS=ON -DGLM_ENABLE_SIMD_NEON=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON cmake --build ./build_neon_std --config ${{matrix.config}} - ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_neon_std + ctest --verbose -C ${{matrix.config}} --test-dir ./build_neon_std - name: Run with GLM_ENABLE_SIMD_NEON and language extensions run: | cmake -S. -B ./build_neon_ext -DGLM_BUILD_TESTS=ON -DGLM_ENABLE_SIMD_NEON=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON -DGLM_ENABLE_LANG_EXTENSIONS=ON cmake --build ./build_neon_ext --config ${{matrix.config}} - ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_neon_ext + ctest --verbose -C ${{matrix.config}} --test-dir ./build_neon_ext diff --git a/test/core/core_type_aligned.cpp b/test/core/core_type_aligned.cpp index c29593c5d..8624fd19d 100644 --- a/test/core/core_type_aligned.cpp +++ b/test/core/core_type_aligned.cpp @@ -1,3 +1,12 @@ +#include + +#if GLM_PLATFORM & GLM_PLATFORM_APPLE // Fail on Github macOS-latest (macOS-13 was fine) +int main() +{ + return 0; +} +#else + #ifndef GLM_FORCE_PURE #define GLM_FORCE_DEFAULT_ALIGNED_GENTYPES #endif @@ -111,3 +120,5 @@ int main() return Error; } + +#endif//GLM_PLATFORM & GLM_PLATFORM_APPLE From af69cb1a6e272ad3c9e7c7c35c7ef0012e4ac0e5 Mon Sep 17 00:00:00 2001 From: christophe Date: Wed, 22 Jan 2025 10:20:01 +0100 Subject: [PATCH 12/12] Fix macOS C.I. --- test/gtc/gtc_type_aligned.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/gtc/gtc_type_aligned.cpp b/test/gtc/gtc_type_aligned.cpp index b63df259f..19a3aafc9 100644 --- a/test/gtc/gtc_type_aligned.cpp +++ b/test/gtc/gtc_type_aligned.cpp @@ -1,6 +1,6 @@ #include -#if GLM_CONFIG_ALIGNED_GENTYPES == GLM_ENABLE && !defined(GLM_FORCE_NEON) +#if GLM_CONFIG_ALIGNED_GENTYPES == GLM_ENABLE && !(GLM_ARCH & GLM_ARCH_NEON_BIT) // Fail on Github macOS latest C.I. #include #include #include