From 595ad42cb889d530b7d570ad2419ce1ffeb5c7b8 Mon Sep 17 00:00:00 2001 From: Recep Aslantas Date: Mon, 13 Feb 2017 12:18:52 +0300 Subject: [PATCH] re-organize folder structure * move SIMD instructions (SSE2, AVX) to arch folder --- include/{ => arch/simd}/cglm-affine-mat-avx.h | 2 +- include/{ => arch/simd}/cglm-affine-mat-sse2.h | 2 +- include/{ => arch/simd}/cglm-intrin.h | 0 include/{ => arch/simd}/cglm-mat-simd-avx.h | 2 +- include/{ => arch/simd}/cglm-mat-simd-sse2.h | 2 +- include/{ => arch/simd}/cglm-mat3-simd-sse2.h | 2 +- include/{ => arch/simd}/cglm-quat-simd.h | 2 +- include/cglm-affine-mat.h | 4 ++-- include/cglm-mat.h | 4 ++-- include/cglm-mat3.h | 2 +- include/cglm-quat.h | 4 ++-- include/cglm-vec-ext.h | 2 +- include/cglm-vec.h | 2 +- makefile.am | 14 +++++++------- 14 files changed, 22 insertions(+), 22 deletions(-) rename include/{ => arch/simd}/cglm-affine-mat-avx.h (98%) rename include/{ => arch/simd}/cglm-affine-mat-sse2.h (98%) rename include/{ => arch/simd}/cglm-intrin.h (100%) rename include/{ => arch/simd}/cglm-mat-simd-avx.h (98%) rename include/{ => arch/simd}/cglm-mat-simd-sse2.h (99%) rename include/{ => arch/simd}/cglm-mat3-simd-sse2.h (98%) rename include/{ => arch/simd}/cglm-quat-simd.h (98%) diff --git a/include/cglm-affine-mat-avx.h b/include/arch/simd/cglm-affine-mat-avx.h similarity index 98% rename from include/cglm-affine-mat-avx.h rename to include/arch/simd/cglm-affine-mat-avx.h index 0d9559a..0372f87 100644 --- a/include/cglm-affine-mat-avx.h +++ b/include/arch/simd/cglm-affine-mat-avx.h @@ -9,7 +9,7 @@ #define cglm_affine_mat_avx_h #ifdef __AVX__ -#include "cglm-common.h" +#include "../../cglm-common.h" #include "cglm-intrin.h" #include diff --git a/include/cglm-affine-mat-sse2.h b/include/arch/simd/cglm-affine-mat-sse2.h similarity index 98% rename from include/cglm-affine-mat-sse2.h rename to include/arch/simd/cglm-affine-mat-sse2.h index d120a73..4ec7b0d 100644 --- a/include/cglm-affine-mat-sse2.h +++ b/include/arch/simd/cglm-affine-mat-sse2.h @@ -9,7 +9,7 @@ #define cglm_affine_mat_sse2_h #if defined( __SSE__ ) || defined( __SSE2__ ) -#include "cglm-common.h" +#include "../../cglm-common.h" #include "cglm-intrin.h" CGLM_INLINE diff --git a/include/cglm-intrin.h b/include/arch/simd/cglm-intrin.h similarity index 100% rename from include/cglm-intrin.h rename to include/arch/simd/cglm-intrin.h diff --git a/include/cglm-mat-simd-avx.h b/include/arch/simd/cglm-mat-simd-avx.h similarity index 98% rename from include/cglm-mat-simd-avx.h rename to include/arch/simd/cglm-mat-simd-avx.h index fca883c..3a83ad8 100644 --- a/include/cglm-mat-simd-avx.h +++ b/include/arch/simd/cglm-mat-simd-avx.h @@ -9,7 +9,7 @@ #define cglm_mat_simd_avx_h #ifdef __AVX__ -#include "cglm-common.h" +#include "../../cglm-common.h" #include "cglm-intrin.h" #include diff --git a/include/cglm-mat-simd-sse2.h b/include/arch/simd/cglm-mat-simd-sse2.h similarity index 99% rename from include/cglm-mat-simd-sse2.h rename to include/arch/simd/cglm-mat-simd-sse2.h index 5803e39..cab8039 100644 --- a/include/cglm-mat-simd-sse2.h +++ b/include/arch/simd/cglm-mat-simd-sse2.h @@ -9,7 +9,7 @@ #define cglm_mat_sse_h #if defined( __SSE__ ) || defined( __SSE2__ ) -#include "cglm-common.h" +#include "../../cglm-common.h" #include "cglm-intrin.h" CGLM_INLINE diff --git a/include/cglm-mat3-simd-sse2.h b/include/arch/simd/cglm-mat3-simd-sse2.h similarity index 98% rename from include/cglm-mat3-simd-sse2.h rename to include/arch/simd/cglm-mat3-simd-sse2.h index e45c2ea..7f63ce3 100644 --- a/include/cglm-mat3-simd-sse2.h +++ b/include/arch/simd/cglm-mat3-simd-sse2.h @@ -9,7 +9,7 @@ #define cglm_mat3_sse_h #if defined( __SSE__ ) || defined( __SSE2__ ) -#include "cglm-common.h" +#include "../../cglm-common.h" #include "cglm-intrin.h" CGLM_INLINE diff --git a/include/cglm-quat-simd.h b/include/arch/simd/cglm-quat-simd.h similarity index 98% rename from include/cglm-quat-simd.h rename to include/arch/simd/cglm-quat-simd.h index c5ddd50..7f606ee 100644 --- a/include/cglm-quat-simd.h +++ b/include/arch/simd/cglm-quat-simd.h @@ -8,7 +8,7 @@ #ifndef cglm_quat_simd_h #define cglm_quat_simd_h -#include "cglm-common.h" +#include "../../cglm-common.h" #include "cglm-intrin.h" CGLM_INLINE diff --git a/include/cglm-affine-mat.h b/include/cglm-affine-mat.h index 2170300..6ae5673 100644 --- a/include/cglm-affine-mat.h +++ b/include/cglm-affine-mat.h @@ -11,8 +11,8 @@ #include "cglm-common.h" #include "cglm-mat.h" #include "cglm-mat3.h" -#include "cglm-affine-mat-sse2.h" -#include "cglm-affine-mat-avx.h" +#include "arch/simd/cglm-affine-mat-sse2.h" +#include "arch/simd/cglm-affine-mat-avx.h" #include diff --git a/include/cglm-mat.h b/include/cglm-mat.h index d184489..a5ea734 100644 --- a/include/cglm-mat.h +++ b/include/cglm-mat.h @@ -14,8 +14,8 @@ #define cglm_mat_h #include "cglm-common.h" -#include "cglm-mat-simd-sse2.h" -#include "cglm-mat-simd-avx.h" +#include "arch/simd/cglm-mat-simd-sse2.h" +#include "arch/simd/cglm-mat-simd-avx.h" #include diff --git a/include/cglm-mat3.h b/include/cglm-mat3.h index b937cd9..fcd5342 100644 --- a/include/cglm-mat3.h +++ b/include/cglm-mat3.h @@ -9,7 +9,7 @@ #define cglm_mat3_h #include "cglm-common.h" -#include "cglm-mat3-simd-sse2.h" +#include "arch/simd/cglm-mat3-simd-sse2.h" #define GLM_MAT3_IDENTITY_INIT {{1.0f, 0.0f, 0.0f}, \ {0.0f, 1.0f, 0.0f}, \ diff --git a/include/cglm-quat.h b/include/cglm-quat.h index 9ccfa61..61c398d 100644 --- a/include/cglm-quat.h +++ b/include/cglm-quat.h @@ -9,9 +9,9 @@ #define cglm_quat_h #include "cglm-common.h" -#include "cglm-intrin.h" -#include "cglm-quat-simd.h" #include "cglm-vec.h" +#include "arch/simd/cglm-intrin.h" +#include "arch/simd/cglm-quat-simd.h" #define GLM_QUAT_IDENTITY_INIT {0.0f, 0.0f, 0.0f, 1.0f} #define GLM_QUAT_IDENTITY (versor){0.0f, 0.0f, 0.0f, 1.0f} diff --git a/include/cglm-vec-ext.h b/include/cglm-vec-ext.h index 83ceee9..b102e25 100644 --- a/include/cglm-vec-ext.h +++ b/include/cglm-vec-ext.h @@ -13,7 +13,7 @@ #define cglm_vec_ext_h #include "cglm-common.h" -#include "cglm-intrin.h" +#include "arch/simd/cglm-intrin.h" #include /*! diff --git a/include/cglm-vec.h b/include/cglm-vec.h index e35a980..3c83b76 100644 --- a/include/cglm-vec.h +++ b/include/cglm-vec.h @@ -14,8 +14,8 @@ #define cglm_vec_h #include "cglm-common.h" -#include "cglm-intrin.h" #include "cglm-vec-ext.h" +#include "arch/simd/cglm-intrin.h" /*! * @brief copy all members of [a] to [dest] diff --git a/makefile.am b/makefile.am index a103d5a..7c2b4b0 100644 --- a/makefile.am +++ b/makefile.am @@ -33,14 +33,14 @@ nobase_include_HEADERS = include/cglm.h \ include/cglm-mat.h \ include/cglm-affine-mat.h \ include/cglm-platform.h \ - include/cglm-mat-simd-avx.h \ - include/cglm-affine-mat-avx.h \ include/cglm-opengl.h \ - include/cglm-quat-simd.h \ - include/cglm-affine-mat-sse2.h \ - include/cglm-mat3-simd-sse2.h \ - include/cglm-mat-simd-sse2.h \ - include/cglm-intrin.h \ + include/arch/simd/cglm-mat-simd-avx.h \ + include/arch/simd/cglm-affine-mat-avx.h \ + include/arch/simd/cglm-quat-simd.h \ + include/arch/simd/cglm-affine-mat-sse2.h \ + include/arch/simd/cglm-mat3-simd-sse2.h \ + include/arch/simd/cglm-mat-simd-sse2.h \ + include/arch/simd/cglm-intrin.h \ include/call/cglmc-euler.h \ include/call/cglmc-quat.h \ include/call/cglmc-cam.h \