Merge branch 'master' into fix-simd-signmask

wasm: replace usage of -0.f to 0x80000000

Makefile.am

@@ -243,11 +243,6 @@ test_tests_SOURCES=\
     test/runner.c \
     test/src/test_common.c \
     test/src/tests.c \
-    test/src/test_cam.c \
-    test/src/test_cam_lh_zo.c \
-    test/src/test_cam_rh_zo.c \
-    test/src/test_cam_lh_no.c \
-    test/src/test_cam_rh_no.c \
     test/src/test_clamp.c \
     test/src/test_euler.c \
     test/src/test_bezier.c \

include/cglm/simd/arm.h

@@ -52,6 +52,10 @@ glmm_float32x4_init(float x, float y, float z, float w) {
 #  define glmm_float32x4_init(x, y, z, w) { x, y, z, w }
 #endif
 
+#define glmm_float32x4_SIGNMASK_PNPN glmm_float32x4_init( 0.f, -0.f,  0.f, -0.f)
+#define glmm_float32x4_SIGNMASK_NPNP glmm_float32x4_init(-0.f,  0.f, -0.f,  0.f)
+#define glmm_float32x4_SIGNMASK_NPPN glmm_float32x4_init(-0.f,  0.f,  0.f, -0.f)
+
 static inline
 float32x4_t
 glmm_abs(float32x4_t v) {

include/cglm/simd/intrin.h

@@ -99,7 +99,6 @@
 #  endif
 #endif
 
-
 /* WebAssembly */
 #if defined(__wasm__) && defined(__wasm_simd128__)
 #  ifndef CGLM_SIMD_WASM

include/cglm/simd/neon/mat4.h

@@ -108,7 +108,7 @@ glm_mat4_det_neon(mat4 mat) {
   float32x4_t   r0, r1, r2, r3, x0, x1, x2;
   float32x2_t   ij, op, mn, kl, nn, mm, jj, ii, gh, ef, t12, t34;
   float32x4x2_t a1;
-  float32x4_t   x3 = glmm_float32x4_init(0.f, -0.f, 0.f, -0.f);
+  float32x4_t   x3 = glmm_float32x4_SIGNMASK_PNPN;
 
   /* 127 <- 0, [square] det(A) = det(At) */
   r0 = glmm_load(mat[0]);              /* d c b a */
@@ -181,7 +181,7 @@ glm_mat4_inv_neon(mat4 mat, mat4 dest) {
                 x0, x1, x2, x3, x4, x5, x6, x7, x8;
   float32x4x2_t a1;
   float32x2_t   lp, ko, hg, jn, im, fe, ae, bf, cg, dh;
-  float32x4_t   x9 = glmm_float32x4_init(-0.f, 0.f, -0.f, 0.f);
+  float32x4_t   x9 = glmm_float32x4_SIGNMASK_NPNP;
 
   x8 = vrev64q_f32(x9);
 

include/cglm/simd/neon/quat.h

@@ -23,7 +23,8 @@ glm_quat_mul_neon(versor p, versor q, versor dest) {
    */
 
   glmm_128 xp, xq, xqr, r, x, y, z, s2, s3;
-  glmm_128 s1 = glmm_float32x4_init(-0.f, 0.f, 0.f, -0.f);
+  glmm_128 s1 = glmm_float32x4_SIGNMASK_NPPN;
+
   float32x2_t   qh, ql;
   
   xp  = glmm_load(p); /* 3 2 1 0 */

include/cglm/simd/sse2/affine.h

@@ -98,7 +98,7 @@ glm_inv_tr_sse2(mat4 mat) {
   x2 = glmm_shuff1(r3, 0, 0, 0, 0);
   x3 = glmm_shuff1(r3, 1, 1, 1, 1);
   x4 = glmm_shuff1(r3, 2, 2, 2, 2);
-  x5 = _mm_set1_ps(-0.f);
+  x5 = glmm_float32x4_SIGNMASK_NEG;
 
   x0 = glmm_fmadd(r0, x2, glmm_fmadd(r1, x3, _mm_mul_ps(r2, x4)));
   x0 = _mm_xor_ps(x0, x5);

include/cglm/simd/sse2/mat4.h

@@ -153,7 +153,7 @@ glm_mat4_det_sse2(mat4 mat) {
                   _mm_shuffle_ps(x0, x1, _MM_SHUFFLE(2, 2, 3, 1)),
                   x2);
   
-  x2 = _mm_xor_ps(x2, _mm_set_ps(-0.f, 0.f, -0.f, 0.f));
+  x2 = _mm_xor_ps(x2, glmm_float32x4_SIGNMASK_NPNP);
   
   return glmm_hadd(_mm_mul_ps(x2, r0));
 }
@@ -166,7 +166,8 @@ glm_mat4_inv_fast_sse2(mat4 mat, mat4 dest) {
          t0, t1, t2, t3, t4, t5,
          x0, x1, x2, x3, x4, x5, x6, x7, x8, x9;
 
-  x8 = _mm_set_ps(-0.f, 0.f, -0.f, 0.f);
+  /* x8 = _mm_set_ps(-0.f, 0.f, -0.f, 0.f); */
+  x8 = glmm_float32x4_SIGNMASK_NPNP;
   x9 = glmm_shuff1(x8, 2, 1, 2, 1);
 
   /* 127 <- 0 */
@@ -302,7 +303,8 @@ glm_mat4_inv_sse2(mat4 mat, mat4 dest) {
          t0, t1, t2, t3, t4, t5,
          x0, x1, x2, x3, x4, x5, x6, x7, x8, x9;
 
-  x8 = _mm_set_ps(-0.f, 0.f, -0.f, 0.f);
+  /* x8 = _mm_set_ps(-0.f, 0.f, -0.f, 0.f); */
+  x8 = glmm_float32x4_SIGNMASK_NPNP;
   x9 = glmm_shuff1(x8, 2, 1, 2, 1);
 
   /* 127 <- 0 */

include/cglm/simd/sse2/quat.h

@@ -26,7 +26,7 @@ glm_quat_mul_sse2(versor p, versor q, versor dest) {
 
   xp = glmm_load(p); /* 3 2 1 0 */
   xq = glmm_load(q);
-  x1 = _mm_set_ps(-0.f, 0.f, -0.f, 0.f); /* TODO: _mm_set1_ss() + shuff ? */
+  x1 = glmm_float32x4_SIGNMASK_NPNP; /* TODO: _mm_set1_ss() + shuff ? */
   r  = _mm_mul_ps(glmm_splat_w(xp), xq);
 
   x2 = _mm_unpackhi_ps(x1, x1);

include/cglm/simd/wasm.h

@@ -26,6 +26,16 @@
 #define glmm_splat_z(x) glmm_splat(x, 2)
 #define glmm_splat_w(x) glmm_splat(x, 3)
 
+#define GLMM_NEGZEROf 0x80000000 /*  0x80000000 ---> -0.0f  */
+
+/* _mm_set_ps(X, Y, Z, W); */
+#define GLMM__SIGNMASKf(X, Y, Z, W) wasm_i32x4_const(X, Y, Z, W)
+
+#define glmm_float32x4_SIGNMASK_PNPN GLMM__SIGNMASKf(0, GLMM_NEGZEROf, 0, GLMM_NEGZEROf)
+#define glmm_float32x4_SIGNMASK_NPNP GLMM__SIGNMASKf(GLMM_NEGZEROf, 0, GLMM_NEGZEROf, 0)
+#define glmm_float32x4_SIGNMASK_NPPN GLMM__SIGNMASKf(GLMM_NEGZEROf, 0, 0, GLMM_NEGZEROf)
+#define glmm_float32x4_SIGNMASK_NEG wasm_i32x4_const_splat(GLMM_NEGZEROf)
+
 static inline
 glmm_128
 glmm_abs(glmm_128 x) {

include/cglm/simd/wasm/mat4.h

@@ -164,8 +164,8 @@ glm_mat4_det_wasm(mat4 mat) {
   x2 = glmm_fmadd(glmm_shuff1(r1, 2, 3, 3, 3),
                   wasm_i32x4_shuffle(x0, x1, 1, 3, 6, 6),
                   x2);
-  
+  /* x2 = wasm_v128_xor(x2, wasm_f32x4_const(0.f, -0.f, 0.f, -0.f)); */
-  x2 = wasm_v128_xor(x2, wasm_f32x4_const(0.f, -0.f, 0.f, -0.f));
+  x2 = wasm_v128_xor(x2, glmm_float32x4_SIGNMASK_PNPN);
   
   return glmm_hadd(wasm_f32x4_mul(x2, r0));
 }
@@ -178,7 +178,8 @@ glm_mat4_inv_fast_wasm(mat4 mat, mat4 dest) {
          t0, t1, t2, t3, t4, t5,
          x0, x1, x2, x3, x4, x5, x6, x7, x8, x9;
 
-  x8 = wasm_f32x4_const(0.f, -0.f, 0.f, -0.f);
+  /* x8 = wasm_f32x4_const(0.f, -0.f, 0.f, -0.f); */
+  x8 = glmm_float32x4_SIGNMASK_PNPN;
   x9 = glmm_shuff1(x8, 2, 1, 2, 1);
 
   /* 127 <- 0 */
@@ -318,7 +319,8 @@ glm_mat4_inv_wasm(mat4 mat, mat4 dest) {
          t0, t1, t2, t3, t4, t5,
          x0, x1, x2, x3, x4, x5, x6, x7, x8, x9;
 
-  x8 = wasm_f32x4_const(0.f, -0.f, 0.f, -0.f);
+  /* x8 = wasm_f32x4_const(0.f, -0.f, 0.f, -0.f); */
+  x8 = glmm_float32x4_SIGNMASK_PNPN;
   x9 = glmm_shuff1(x8, 2, 1, 2, 1);
 
   /* 127 <- 0 */

include/cglm/simd/wasm/quat.h

@@ -26,7 +26,8 @@ glm_quat_mul_wasm(versor p, versor q, versor dest) {
 
   xp = glmm_load(p); /* 3 2 1 0 */
   xq = glmm_load(q);
-  x1 = wasm_f32x4_const(0.f, -0.f, 0.f, -0.f); /* TODO: _mm_set1_ss() + shuff ? */
+  /* x1 = wasm_f32x4_const(0.f, -0.f, 0.f, -0.f); */
+  x1 = glmm_float32x4_SIGNMASK_PNPN; /* TODO: _mm_set1_ss() + shuff ? */
   r  = wasm_f32x4_mul(glmm_splat_w(xp), xq);
   /* x2 = _mm_unpackhi_ps(x1, x1); */
   x2 = wasm_i32x4_shuffle(x1, x1, 2, 6, 3, 7);

include/cglm/simd/x86.h

@@ -54,10 +54,23 @@
 #  endif
 #endif
 
+#define GLMM_NEGZEROf 0x80000000 /*  0x80000000 ---> -0.0f  */
+
+#define GLMM__SIGNMASKf(X, Y, Z, W)                                           \
+   _mm_castsi128_ps(_mm_set_epi32(X, Y, Z, W))
+  /* _mm_set_ps(X, Y, Z, W); */
+
+#define glmm_float32x4_SIGNMASK_PNPN GLMM__SIGNMASKf(0, GLMM_NEGZEROf, 0, GLMM_NEGZEROf)
+#define glmm_float32x4_SIGNMASK_NPNP GLMM__SIGNMASKf(GLMM_NEGZEROf, 0, GLMM_NEGZEROf, 0)
+#define glmm_float32x4_SIGNMASK_NPPN GLMM__SIGNMASKf(GLMM_NEGZEROf, 0, 0, GLMM_NEGZEROf)
+
+#define glmm_float32x4_SIGNMASK_NEG _mm_castsi128_ps(_mm_set1_epi32(0x80000000)) /* _mm_set1_ps(-0.0f) */
+#define glmm_float32x8_SIGNMASK_NEG _mm256_castsi256_ps(_mm256_set1_epi32(GLMM_NEGZEROf))
+
 static inline
 __m128
 glmm_abs(__m128 x) {
-  return _mm_andnot_ps(_mm_set1_ps(-0.0f), x);
+  return _mm_andnot_ps(glmm_float32x4_SIGNMASK_NEG, x);
 }
 
 static inline
@@ -256,7 +269,8 @@ glmm_fnmsub(__m128 a, __m128 b, __m128 c) {
 #ifdef __FMA__
   return _mm_fnmsub_ps(a, b, c);
 #else
-  return _mm_xor_ps(_mm_add_ps(_mm_mul_ps(a, b), c), _mm_set1_ps(-0.0f));
+  return _mm_xor_ps(_mm_add_ps(_mm_mul_ps(a, b), c),
+                    glmm_float32x4_SIGNMASK_NEG);
 #endif
 }
 
@@ -298,7 +312,7 @@ glmm256_fnmsub(__m256 a, __m256 b, __m256 c) {
   return _mm256_fmsub_ps(a, b, c);
 #else
   return _mm256_xor_ps(_mm256_sub_ps(_mm256_mul_ps(a, b), c),
-                       _mm256_set1_ps(-0.0f));
+                       glmm_float32x8_SIGNMASK_NEG);
 #endif
 }
 #endif

include/cglm/struct/box.h

@@ -31,7 +31,7 @@ glms_aabb_(transform)(vec3s box[2], mat4s m, vec3s dest[2]) {
   vec3 rawBox[2];
   vec3 rawDest[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   glm_aabb_transform(rawBox, m.raw, rawDest);
   glms_vec3_pack(dest, rawDest, 2);
 }
@@ -53,10 +53,10 @@ glms_aabb_(merge)(vec3s box1[2], vec3s box2[2], vec3s dest[2]) {
   vec3 rawBox2[2];
   vec3 rawDest[2];
 
-  glms_vec3_unpack(rawBox1, box1, 2);
+  glms_vec3_(unpack)(rawBox1, box1, 2);
-  glms_vec3_unpack(rawBox2, box2, 2);
+  glms_vec3_(unpack)(rawBox2, box2, 2);
   glm_aabb_merge(rawBox1, rawBox2, rawDest);
-  glms_vec3_pack(dest, rawDest, 2);
+  glms_vec3_(pack)(dest, rawDest, 2);
 }
 
 /*!
@@ -77,10 +77,10 @@ glms_aabb_(crop)(vec3s box[2], vec3s cropBox[2], vec3s dest[2]) {
   vec3 rawCropBox[2];
   vec3 rawDest[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
-  glms_vec3_unpack(rawCropBox, cropBox, 2);
+  glms_vec3_(unpack)(rawCropBox, cropBox, 2);
   glm_aabb_crop(rawBox, rawCropBox, rawDest);
-  glms_vec3_pack(dest, rawDest, 2);
+  glms_vec3_(pack)(dest, rawDest, 2);
 }
 
 /*!
@@ -101,8 +101,8 @@ glms_aabb_(crop_until)(vec3s box[2],
                        vec3s cropBox[2],
                        vec3s clampBox[2],
                        vec3s dest[2]) {
-  glms_aabb_crop(box, cropBox, dest);
+  glms_aabb_(crop)(box, cropBox, dest);
-  glms_aabb_merge(clampBox, dest, dest);
+  glms_aabb_(merge)(clampBox, dest, dest);
 }
 
 /*!
@@ -125,8 +125,8 @@ glms_aabb_(frustum)(vec3s box[2], vec4s planes[6]) {
   vec3 rawBox[2];
   vec4 rawPlanes[6];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
-  glms_vec4_unpack(rawPlanes, planes, 6);
+  glms_vec4_(unpack)(rawPlanes, planes, 6);
   return glm_aabb_frustum(rawBox, rawPlanes);
 }
 
@@ -138,8 +138,8 @@ glms_aabb_(frustum)(vec3s box[2], vec4s planes[6]) {
 CGLM_INLINE
 void
 glms_aabb_(invalidate)(vec3s box[2]) {
-  box[0] = glms_vec3_broadcast(FLT_MAX);
+  box[0] = glms_vec3_(broadcast)(FLT_MAX);
-  box[1] = glms_vec3_broadcast(-FLT_MAX);
+  box[1] = glms_vec3_(broadcast)(-FLT_MAX);
 }
 
 /*!
@@ -151,7 +151,7 @@ CGLM_INLINE
 bool
 glms_aabb_(isvalid)(vec3s box[2]) {
   vec3 rawBox[2];
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   return glm_aabb_isvalid(rawBox);
 }
 
@@ -174,7 +174,7 @@ glms_aabb_(size)(vec3s box[2]) {
 CGLM_INLINE
 float
 glms_aabb_(radius)(vec3s box[2]) {
-  return glms_aabb_size(box) * 0.5f;
+  return glms_aabb_(size)(box) * 0.5f;
 }
 
 /*!
@@ -186,7 +186,7 @@ glms_aabb_(radius)(vec3s box[2]) {
 CGLM_INLINE
 vec3s
 glms_aabb_(center)(vec3s box[2]) {
-  return glms_vec3_center(box[0], box[1]);
+  return glms_vec3_(center)(box[0], box[1]);
 }
 
 /*!
@@ -201,8 +201,8 @@ glms_aabb_(aabb)(vec3s box[2], vec3s other[2]) {
   vec3 rawBox[2];
   vec3 rawOther[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
-  glms_vec3_unpack(rawOther, other, 2);
+  glms_vec3_(unpack)(rawOther, other, 2);
   return glm_aabb_aabb(rawBox, rawOther);
 }
 
@@ -220,7 +220,7 @@ bool
 glms_aabb_(sphere)(vec3s box[2], vec4s s) {
   vec3 rawBox[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   return glm_aabb_sphere(rawBox, s.raw);
 }
 
@@ -235,7 +235,7 @@ bool
 glms_aabb_(point)(vec3s box[2], vec3s point) {
   vec3 rawBox[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   return glm_aabb_point(rawBox, point.raw);
 }
 
@@ -251,8 +251,8 @@ glms_aabb_(contains)(vec3s box[2], vec3s other[2]) {
   vec3 rawBox[2];
   vec3 rawOther[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
-  glms_vec3_unpack(rawOther, other, 2);
+  glms_vec3_(unpack)(rawOther, other, 2);
   return glm_aabb_contains(rawBox, rawOther);
 }
 

include/cglm/struct/clipspace/ortho_lh_no.h

@@ -64,7 +64,7 @@ glms_ortho_aabb_lh_no(vec3s box[2]) {
   mat4s dest;
   vec3  rawBox[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   glm_ortho_aabb_lh_no(rawBox, dest.raw);
 
   return dest;
@@ -87,7 +87,7 @@ glms_ortho_aabb_p_lh_no(vec3s box[2], float padding) {
   mat4s dest;
   vec3  rawBox[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   glm_ortho_aabb_p_lh_no(rawBox, padding, dest.raw);
 
   return dest;
@@ -110,7 +110,7 @@ glms_ortho_aabb_pz_lh_no(vec3s box[2], float padding) {
   mat4s dest;
   vec3  rawBox[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   glm_ortho_aabb_pz_lh_no(rawBox, padding, dest.raw);
 
   return dest;

include/cglm/struct/clipspace/ortho_lh_zo.h

@@ -64,7 +64,7 @@ glms_ortho_aabb_lh_zo(vec3s box[2]) {
   mat4s dest;
   vec3  rawBox[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   glm_ortho_aabb_lh_zo(rawBox, dest.raw);
 
   return dest;
@@ -87,7 +87,7 @@ glms_ortho_aabb_p_lh_zo(vec3s box[2], float padding) {
   mat4s dest;
   vec3  rawBox[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   glm_ortho_aabb_p_lh_zo(rawBox, padding, dest.raw);
 
   return dest;
@@ -110,7 +110,7 @@ glms_ortho_aabb_pz_lh_zo(vec3s box[2], float padding) {
   mat4s dest;
   vec3  rawBox[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   glm_ortho_aabb_pz_lh_zo(rawBox, padding, dest.raw);
 
   return dest;

include/cglm/struct/clipspace/ortho_rh_no.h

@@ -64,7 +64,7 @@ glms_ortho_aabb_rh_no(vec3s box[2]) {
   mat4s dest;
   vec3  rawBox[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   glm_ortho_aabb_rh_no(rawBox, dest.raw);
 
   return dest;
@@ -87,7 +87,7 @@ glms_ortho_aabb_p_rh_no(vec3s box[2], float padding) {
   mat4s dest;
   vec3  rawBox[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   glm_ortho_aabb_p_rh_no(rawBox, padding, dest.raw);
 
   return dest;
@@ -110,7 +110,7 @@ glms_ortho_aabb_pz_rh_no(vec3s box[2], float padding) {
   mat4s dest;
   vec3  rawBox[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   glm_ortho_aabb_pz_rh_no(rawBox, padding, dest.raw);
 
   return dest;

include/cglm/struct/clipspace/ortho_rh_zo.h

@@ -64,7 +64,7 @@ glms_ortho_aabb_rh_zo(vec3s box[2]) {
   mat4s dest;
   vec3  rawBox[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   glm_ortho_aabb_rh_zo(rawBox, dest.raw);
 
   return dest;
@@ -87,7 +87,7 @@ glms_ortho_aabb_p_rh_zo(vec3s box[2], float padding) {
   mat4s dest;
   vec3  rawBox[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   glm_ortho_aabb_p_rh_zo(rawBox, padding, dest.raw);
 
   return dest;
@@ -110,7 +110,7 @@ glms_ortho_aabb_pz_rh_zo(vec3s box[2], float padding) {
   mat4s dest;
   vec3  rawBox[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   glm_ortho_aabb_pz_rh_zo(rawBox, padding, dest.raw);
 
   return dest;

include/cglm/struct/frustum.h

@@ -57,7 +57,7 @@ void
 glms_frustum_planes(mat4s m, vec4s dest[6]) {
   vec4 rawDest[6];
   glm_frustum_planes(m.raw, rawDest);
-  glms_vec4_pack(dest, rawDest, 6);
+  glms_vec4_(pack)(dest, rawDest, 6);
 }
 
 /*!
@@ -88,7 +88,7 @@ void
 glms_frustum_corners(mat4s invMat, vec4s dest[8]) {
   vec4 rawDest[8];
   glm_frustum_corners(invMat.raw, rawDest);
-  glms_vec4_pack(dest, rawDest, 8);
+  glms_vec4_(pack)(dest, rawDest, 8);
 }
 
 /*!
@@ -103,7 +103,7 @@ glms_frustum_center(vec4s corners[8]) {
   vec4 rawCorners[8];
   vec4s r;
 
-  glms_vec4_unpack(rawCorners, corners, 8);
+  glms_vec4_(unpack)(rawCorners, corners, 8);
   glm_frustum_center(rawCorners, r.raw);
   return r;
 }
@@ -121,9 +121,9 @@ glms_frustum_box(vec4s corners[8], mat4s m, vec3s box[2]) {
   vec4 rawCorners[8];
   vec3 rawBox[2];
 
-  glms_vec4_unpack(rawCorners, corners, 8);
+  glms_vec4_(unpack)(rawCorners, corners, 8);
   glm_frustum_box(rawCorners, m.raw, rawBox);
-  glms_vec3_pack(box, rawBox, 2);
+  glms_vec3_(pack)(box, rawBox, 2);
 }
 
 /*!
@@ -147,9 +147,9 @@ glms_frustum_corners_at(vec4s corners[8],
   vec4 rawCorners[8];
   vec4 rawPlaneCorners[4];
 
-  glms_vec4_unpack(rawCorners, corners, 8);
+  glms_vec4_(unpack)(rawCorners, corners, 8);
   glm_frustum_corners_at(rawCorners, splitDist, farDist, rawPlaneCorners);
-  glms_vec4_pack(planeCorners, rawPlaneCorners, 8);
+  glms_vec4_(pack)(planeCorners, rawPlaneCorners, 8);
 }
 
 #endif /* cglms_frustums_h */

include/cglm/struct/io.h

@@ -75,7 +75,7 @@ glms_aabb_print(vec3s                   bbox[2],
                 FILE       * __restrict ostream) {
   vec3 rawBbox[2];
 
-  glms_vec3_unpack(rawBbox, bbox, 2);
+  glms_vec3_(unpack)(rawBbox, bbox, 2);
   glm_aabb_print(rawBbox, tag, ostream);
 }
 

include/cglm/struct/mat4.h

@@ -240,7 +240,7 @@ glms_mat4_(mulN)(mat4s * __restrict matrices[], uint32_t len) {
   size_t i;
 
   for (i = 0; i < len; i++) {
-    r = glms_mat4_mul(r, *matrices[i]);
+    r = glms_mat4_(mul)(r, *matrices[i]);
   }
   
   return r;

include/cglm/vec4.h

@@ -709,7 +709,7 @@ glm_vec4_negate_to(vec4 v, vec4 dest) {
 #if defined(__wasm__) && defined(__wasm_simd128__)
   glmm_store(dest, wasm_f32x4_neg(glmm_load(v)));
 #elif defined( __SSE__ ) || defined( __SSE2__ )
-  glmm_store(dest, _mm_xor_ps(glmm_load(v), _mm_set1_ps(-0.0f)));
+  glmm_store(dest, _mm_xor_ps(glmm_load(v), glmm_float32x4_SIGNMASK_NEG));
 #elif defined(CGLM_NEON_FP)
   vst1q_f32(dest, vnegq_f32(vld1q_f32(v)));
 #else

meson.build

@@ -108,11 +108,6 @@ if get_option('build_tests') == true
 test_src = files(
     'test/runner.c',
     'test/src/test_bezier.c',
-    'test/src/test_cam.c',
-    'test/src/test_cam_lh_no.c',
-    'test/src/test_cam_lh_zo.c',
-    'test/src/test_cam_rh_no.c',
-    'test/src/test_cam_rh_zo.c',
     'test/src/test_clamp.c',
     'test/src/test_common.c',
     'test/src/test_euler.c',

test/CMakeLists.txt

@@ -5,11 +5,6 @@ set(TESTFILES
   runner.c
   src/test_euler.c
   src/test_bezier.c
-  src/test_cam.c
-  src/test_cam_lh_zo.c
-  src/test_cam_rh_zo.c
-  src/test_cam_lh_no.c
-  src/test_cam_rh_no.c
   src/test_struct.c
   src/test_clamp.c
   src/test_common.c

test/src/test_cam.c

@@ -1,55 +0,0 @@
-/*
- * Copyright (c), Recep Aslantas.
- *
- * MIT License (MIT), http://opensource.org/licenses/MIT
- * Full license can be found in the LICENSE file
- */
-
-#include "test_common.h"
-
-TEST_IMPL(camera_lookat) {
-  mat4 view1, view2;
-  vec3 center,
-       eye = {0.024f, 14.6f, 67.04f},
-       dir = {0.0f, 0.0f, -1.0f},
-       up  = {0.0f, 1.0f, 0.0f};
-
-  glm_vec3_add(eye, dir, center);
-  glm_lookat(eye, center, up, view1);
-
-  glm_look(eye, dir, up, view2);
-
-  ASSERTIFY(test_assert_mat4_eq(view1, view2))
-
-  TEST_SUCCESS
-}
-
-TEST_IMPL(camera_decomp) {
-  mat4  proj, proj2;
-  vec4  sizes;
-  float aspect, fovy, nearZ, farZ;
-
-  aspect  = 0.782f;
-  fovy    = glm_rad(49.984f);
-  nearZ   = 0.1f;
-  farZ    = 100.0f;
-
-  glm_perspective(fovy, aspect, nearZ, farZ, proj);
-  ASSERT(fabsf(aspect  - glm_persp_aspect(proj)) < GLM_FLT_EPSILON)
-  ASSERT(fabsf(fovy    - glm_persp_fovy(proj))   < GLM_FLT_EPSILON)
-  ASSERT(fabsf(49.984f - glm_deg(glm_persp_fovy(proj))) < GLM_FLT_EPSILON)
-
-  glm_persp_sizes(proj, fovy, sizes);
-
-  glm_frustum(-sizes[0] * 0.5f,
-               sizes[0] * 0.5f,
-              -sizes[1] * 0.5f,
-               sizes[1] * 0.5f,
-               nearZ,
-               farZ,
-               proj2);
-
-  ASSERTIFY(test_assert_mat4_eq(proj, proj2))
-
-  TEST_SUCCESS
-}

test/src/test_cam.h

@@ -66,3 +66,50 @@ TEST_IMPL(GLM_PREFIX, frustum) {
 
   TEST_SUCCESS
 }
+
+TEST_IMPL(GLM_PREFIX, camera_lookat) {
+  mat4 view1, view2;
+  vec3 center,
+       eye = {0.024f, 14.6f, 67.04f},
+       dir = {0.0f, 0.0f, -1.0f},
+       up  = {0.0f, 1.0f, 0.0f};
+
+  glm_vec3_add(eye, dir, center);
+  glm_lookat(eye, center, up, view1);
+
+  glm_look(eye, dir, up, view2);
+
+  ASSERTIFY(test_assert_mat4_eq(view1, view2))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, camera_decomp) {
+  mat4  proj, proj2;
+  vec4  sizes;
+  float aspect, fovy, nearZ, farZ;
+
+  aspect  = 0.782f;
+  fovy    = glm_rad(49.984f);
+  nearZ   = 0.1f;
+  farZ    = 100.0f;
+
+  glm_perspective(fovy, aspect, nearZ, farZ, proj);
+  ASSERT(fabsf(aspect  - glm_persp_aspect(proj)) < GLM_FLT_EPSILON)
+  ASSERT(fabsf(fovy    - glm_persp_fovy(proj))   < GLM_FLT_EPSILON)
+  ASSERT(fabsf(49.984f - glm_deg(glm_persp_fovy(proj))) < GLM_FLT_EPSILON)
+
+  glm_persp_sizes(proj, fovy, sizes);
+
+  glm_frustum(-sizes[0] * 0.5f,
+               sizes[0] * 0.5f,
+              -sizes[1] * 0.5f,
+               sizes[1] * 0.5f,
+               nearZ,
+               farZ,
+               proj2);
+
+  ASSERTIFY(test_assert_mat4_eq(proj, proj2))
+
+  TEST_SUCCESS
+}

test/src/test_cam_lh_no.h

@@ -6,15 +6,17 @@
  */
 
 #include "test_common.h"
+#include "../../include/cglm/clipspace/persp_lh_no.h"
+#include "../../include/cglm/call/clipspace/persp_lh_no.h"
 
-TEST_IMPL(perspective_lh_no) {
+TEST_IMPL(GLM_PREFIX, perspective_lh_no) {
   mat4 dst;
   const float fovy     = glm_rad(45.0f);
   const float aspect   = 640/480.0f;
   const float zNearVal = 0.1f;
   const float zFarVal  = 100.0f;
 
-  glm_perspective_lh_no(fovy, aspect, zNearVal, zFarVal, dst);
+  GLM(perspective_lh_no)(fovy, aspect, zNearVal, zFarVal, dst);
 
   /* Sanity mk. I: longhand version */
   ASSERT(test_eq(dst[0][0],  1.0f / (tanf(fovy / 2) * aspect)))

test/src/test_cam_lh_zo.h

@@ -6,15 +6,17 @@
  */
 
 #include "test_common.h"
+#include "../../include/cglm/clipspace/persp_lh_zo.h"
+#include "../../include/cglm/call/clipspace/persp_lh_zo.h"
 
-TEST_IMPL(perspective_lh_zo) {
+TEST_IMPL(GLM_PREFIX, perspective_lh_zo) {
   mat4 dst;
   const float fovy     = glm_rad(45.0f);
   const float aspect   = 640/480.0f;
   const float zNearVal = 0.1f;
   const float zFarVal  = 100.0f;
 
-  glm_perspective_lh_zo(fovy, aspect, zNearVal, zFarVal, dst);
+  GLM(perspective_lh_zo)(fovy, aspect, zNearVal, zFarVal, dst);
 
   /* Sanity mk. I: longhand version */
   ASSERT(test_eq(dst[0][0],  1.0f / (tanf(fovy / 2) * aspect)))

test/src/test_cam_rh_no.h

@@ -6,15 +6,17 @@
  */
 
 #include "test_common.h"
+#include "../../include/cglm/clipspace/persp_rh_no.h"
+#include "../../include/cglm/call/clipspace/persp_rh_no.h"
 
-TEST_IMPL(perspective_rh_no) {
+TEST_IMPL(GLM_PREFIX, perspective_rh_no) {
   mat4 dst;
   const float fovy     = glm_rad(45.0f);
   const float aspect   = 640/480.0f;
   const float zNearVal = 0.1f;
   const float zFarVal  = 100.0f;
 
-  glm_perspective_rh_no(fovy, aspect, zNearVal, zFarVal, dst);
+  GLM(perspective_rh_no)(fovy, aspect, zNearVal, zFarVal, dst);
 
   /* Sanity mk. I: longhand version */
   ASSERT(test_eq(dst[0][0],  1.0f / (tanf(fovy / 2) * aspect)))

test/src/test_cam_rh_zo.h

@@ -6,15 +6,17 @@
  */
 
 #include "test_common.h"
+#include "../../include/cglm/clipspace/persp_rh_zo.h"
+#include "../../include/cglm/call/clipspace/persp_rh_zo.h"
 
-TEST_IMPL(perspective_rh_zo) {
+TEST_IMPL(GLM_PREFIX, perspective_rh_zo) {
   mat4 dst;
   const float fovy     = glm_rad(45.0f);
   const float aspect   = 640/480.0f;
   const float zNearVal = 0.1f;
   const float zFarVal  = 100.0f;
 
-  glm_perspective_rh_zo(fovy, aspect, zNearVal, zFarVal, dst);
+  GLM(perspective_rh_zo)(fovy, aspect, zNearVal, zFarVal, dst);
 
   /* Sanity mk. I: longhand version */
   ASSERT(test_eq(dst[0][0],  1 / (tanf(fovy / 2) * aspect)))

test/src/test_common.h

@@ -10,6 +10,10 @@
 
 #include "../include/common.h"
 
+#if !defined(_WIN32) && !defined(_MSC_VER)
+#  pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#endif
+
 void
 test_rand_mat4(mat4 dest);
 

test/src/tests.c

@@ -28,7 +28,11 @@
 #include "test_affine2d.h"
 #include "test_affine_mat.h"
 #include "test_ray.h"
-#include "test_camera.h"
+#include "test_cam.h"
+#include "test_cam_lh_no.h"
+#include "test_cam_lh_zo.h"
+#include "test_cam_rh_no.h"
+#include "test_cam_rh_zo.h"
 
 #undef GLM
 #undef GLM_PREFIX
@@ -55,7 +59,11 @@
 #include "test_affine2d.h"
 #include "test_affine_mat.h"
 #include "test_ray.h"
-#include "test_camera.h"
+#include "test_cam.h"
+#include "test_cam_lh_no.h"
+#include "test_cam_lh_zo.h"
+#include "test_cam_rh_no.h"
+#include "test_cam_rh_zo.h"
 
 #undef GLM
 #undef GLM_PREFIX

test/tests.h

@@ -223,12 +223,19 @@ TEST_DECLARE(glmc_mat2_swap_row)
 TEST_DECLARE(glmc_mat2_rmc)
 
 /* camera (incl [LR]H cross [NZ]O) */
-TEST_DECLARE(perspective_lh_zo)
+TEST_DECLARE(glm_perspective_lh_zo)
-TEST_DECLARE(perspective_rh_zo)
+TEST_DECLARE(glm_perspective_rh_zo)
-TEST_DECLARE(perspective_lh_no)
+TEST_DECLARE(glm_perspective_lh_no)
-TEST_DECLARE(perspective_rh_no)
+TEST_DECLARE(glm_perspective_rh_no)
-TEST_DECLARE(camera_lookat)
+TEST_DECLARE(glm_camera_lookat)
-TEST_DECLARE(camera_decomp)
+TEST_DECLARE(glm_camera_decomp)
+
+TEST_DECLARE(glmc_perspective_lh_zo)
+TEST_DECLARE(glmc_perspective_rh_zo)
+TEST_DECLARE(glmc_perspective_lh_no)
+TEST_DECLARE(glmc_perspective_rh_no)
+TEST_DECLARE(glmc_camera_lookat)
+TEST_DECLARE(glmc_camera_decomp)
 
 TEST_DECLARE(glm_frustum)
 
@@ -1057,12 +1064,19 @@ TEST_LIST {
   TEST_ENTRY(glmc_mat2_rmc)
 
   /* camera (incl [LR]H cross [NZ]O) */
-  TEST_ENTRY(perspective_lh_zo)
+  TEST_ENTRY(glm_perspective_lh_zo)
-  TEST_ENTRY(perspective_rh_zo)
+  TEST_ENTRY(glm_perspective_rh_zo)
-  TEST_ENTRY(perspective_lh_no)
+  TEST_ENTRY(glm_perspective_lh_no)
-  TEST_ENTRY(perspective_rh_no)
+  TEST_ENTRY(glm_perspective_rh_no)
-  TEST_ENTRY(camera_lookat)
+  TEST_ENTRY(glm_camera_lookat)
-  TEST_ENTRY(camera_decomp)
+  TEST_ENTRY(glm_camera_decomp)
+
+  TEST_ENTRY(glmc_perspective_lh_zo)
+  TEST_ENTRY(glmc_perspective_rh_zo)
+  TEST_ENTRY(glmc_perspective_lh_no)
+  TEST_ENTRY(glmc_perspective_rh_no)
+  TEST_ENTRY(glmc_camera_lookat)
+  TEST_ENTRY(glmc_camera_decomp)
   
   TEST_ENTRY(glm_frustum)
   

win/cglm-test.vcxproj

@@ -46,11 +46,6 @@
     <ClCompile Include="..\test\runner.c" />
     <ClCompile Include="..\test\src\tests.c" />
     <ClCompile Include="..\test\src\test_bezier.c" />
-    <ClCompile Include="..\test\src\test_cam.c" />
-    <ClCompile Include="..\test\src\test_cam_lh_no.c" />
-    <ClCompile Include="..\test\src\test_cam_lh_zo.c" />
-    <ClCompile Include="..\test\src\test_cam_rh_no.c" />
-    <ClCompile Include="..\test\src\test_cam_rh_zo.c" />
     <ClCompile Include="..\test\src\test_clamp.c" />
     <ClCompile Include="..\test\src\test_common.c" />
     <ClCompile Include="..\test\src\test_euler.c" />
@@ -61,7 +56,11 @@
     <ClInclude Include="..\test\src\test_affine.h" />
     <ClInclude Include="..\test\src\test_affine2d.h" />
     <ClInclude Include="..\test\src\test_affine_mat.h" />
-    <ClInclude Include="..\test\src\test_camera.h" />
+    <ClInclude Include="..\test\src\test_cam.h" />
+    <ClInclude Include="..\test\src\test_cam_lh_no.h" />
+    <ClInclude Include="..\test\src\test_cam_lh_zo.h" />
+    <ClInclude Include="..\test\src\test_cam_rh_no.h" />
+    <ClInclude Include="..\test\src\test_cam_rh_zo.h" />
     <ClInclude Include="..\test\src\test_common.h" />
     <ClInclude Include="..\test\src\test_ivec2.h" />
     <ClInclude Include="..\test\src\test_ivec3.h" />
@@ -72,10 +71,10 @@
     <ClInclude Include="..\test\src\test_plane.h" />
     <ClInclude Include="..\test\src\test_project.h" />
     <ClInclude Include="..\test\src\test_quat.h" />
+    <ClInclude Include="..\test\src\test_ray.h" />
     <ClInclude Include="..\test\src\test_vec2.h" />
     <ClInclude Include="..\test\src\test_vec3.h" />
     <ClInclude Include="..\test\src\test_vec4.h" />
-    <ClInclude Include="..\test\src\test_ray.h" />
     <ClInclude Include="..\test\tests.h" />
   </ItemGroup>
   <ItemGroup>

win/cglm-test.vcxproj.filters

@@ -17,9 +17,6 @@
     <ClCompile Include="..\test\src\test_bezier.c">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\test\src\test_cam.c">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\test\src\test_clamp.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -35,18 +32,6 @@
     <ClCompile Include="..\test\src\tests.c">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\test\src\test_cam_lh_no.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test\src\test_cam_lh_zo.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test\src\test_cam_rh_no.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test\src\test_cam_rh_zo.c">
-      <Filter>src</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\test\tests.h">
@@ -58,46 +43,28 @@
     <ClInclude Include="..\test\include\common.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="..\test\src\test_mat3.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\test\src\test_mat4.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\test\src\test_project.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\test\src\test_quat.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\test\src\test_vec3.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\test\src\test_vec4.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\test\src\test_affine.h">
       <Filter>src</Filter>
     </ClInclude>
     <ClInclude Include="..\test\src\test_affine_mat.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\test\src\test_mat2.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\test\src\test_plane.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\test\src\test_vec2.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\test\src\test_ray.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\test\src\test_affine2d.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\test\src\test_camera.h">
+    <ClInclude Include="..\test\src\test_cam.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\test\src\test_cam_lh_no.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\test\src\test_cam_lh_zo.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\test\src\test_cam_rh_no.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\test\src\test_cam_rh_zo.h">
       <Filter>src</Filter>
     </ClInclude>
     <ClInclude Include="..\test\src\test_ivec2.h">
@@ -109,5 +76,35 @@
     <ClInclude Include="..\test\src\test_ivec4.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\test\src\test_mat2.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\test\src\test_mat3.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\test\src\test_mat4.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\test\src\test_plane.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\test\src\test_project.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\test\src\test_quat.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\test\src\test_ray.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\test\src\test_vec2.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\test\src\test_vec3.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\test\src\test_vec4.h">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>