suppress sign conversion warnings

Add Enhanced Support for Anonymous Structs

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.8.2)
 project(cglm
-  VERSION 0.9.0
+  VERSION 0.9.1
   HOMEPAGE_URL https://github.com/recp/cglm
   DESCRIPTION "OpenGL Mathematics (glm) for C"
   LANGUAGES C

README.md

@@ -242,6 +242,38 @@ add_subdirectory(external/cglm/)
 # or you can use find_package to configure cglm
 ```
 
+#### Use CMake to build for WebAssembly
+
+Since math functions like `sinf` is used, this can not be targeted at `wasm32-unknown-unknown`, one of [wasi-sdk](https://github.com/WebAssembly/wasi-sdk) or [emscripten](https://github.com/emscripten-core/emsdk) should be used.
+
+Should note that shared build is not yet supported for WebAssembly.
+
+For [simd128](https://github.com/WebAssembly/simd) support, add `-msimd128` to `CMAKE_C_FLAGS`, in command line `-DCMAKE_C_FLAGS="-msimd128"`.
+
+For tests, the cmake option `CGLM_USE_TEST` would still work, you'll need a wasi runtime for running tests, see our [ci config file](.github/workflows/cmake-wasm.yml) for a detailed example.
+
+##### Use CMake and WASI SDK to build for WebAssembly
+
+```bash
+$ cmake .. \
+  -DCMAKE_TOOLCHAIN_FILE=/path/to/wasi-sdk-19.0/share/cmake/wasi-sdk.cmake \
+  -DWASI_SDK_PREFIX=/path/to/wasi-sdk-19.0
+```
+
+Where `/path/to/wasi-sdk-19.0/` is the path to extracted [wasi sdk](https://github.com/WebAssembly/wasi-sdk).
+
+In this case it would by default make a static build.
+
+##### Use CMake and Emscripten SDK to build for WebAssembly
+
+```bash
+$ emcmake cmake .. \
+  -DCMAKE_EXE_LINKER_FLAGS="-s STANDALONE_WASM" \
+  -DCGLM_STATIC=ON
+```
+
+The `emcmake` here is the cmake wrapper for Emscripten from installed [emsdk](https://github.com/emscripten-core/emsdk).
+
 ### Meson (All platforms)
 
 ```bash
@@ -257,7 +289,7 @@ $ sudo ninja install # [Optional]
 c_std=c11
 buildtype=release
 default_library=shared
-enable_tests=false # to run tests: ninja test
+build_tests=true # to run tests: ninja test
 ```
 #### Use with your Meson project
 * Example:

cglm.podspec

@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
 
   # Description
   s.name         = "cglm"
-  s.version      = "0.8.9"
+  s.version      = "0.9.0"
   s.summary      = "📽 Highly Optimized Graphics Math (glm) for C"
   s.description  = <<-DESC
 cglm is math library for graphics programming for C. See the documentation or README for all features.

configure.ac

@@ -7,7 +7,7 @@
 #*****************************************************************************
 
 AC_PREREQ([2.69])
-AC_INIT([cglm], [0.9.0], [info@recp.me])
+AC_INIT([cglm], [0.9.1], [info@recp.me])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects serial-tests])
 
 # Don't use the default cflags (-O2 -g), we set ours manually in Makefile.am.

docs/source/conf.py

@@ -62,9 +62,9 @@ author = u'Recep Aslantas'
 # built documents.
 #
 # The short X.Y version.
-version = u'0.9.0'
+version = u'0.9.1'
 # The full version, including alpha/beta/rc tags.
-release = u'0.9.0'
+release = u'0.9.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/mat2.rst

@@ -32,6 +32,7 @@ Functions:
 #. :c:func:`glm_mat2_swap_col`
 #. :c:func:`glm_mat2_swap_row`
 #. :c:func:`glm_mat2_rmc`
+#. :c:func:`glm_mat2_make`
 
 Functions documentation
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -177,3 +178,13 @@ Functions documentation
 
     Returns:
         scalar value e.g. Matrix1x1
+
+.. c:function:: void glm_mat2_make(float * __restrict src, mat2 dest)
+
+    Create mat2 matrix from pointer
+
+    | NOTE: **@src** must contain 4 elements.
+
+    Parameters:
+      | *[in]*  **src**  pointer to an array of floats
+      | *[out]* **dest** destination matrix2x2

docs/source/mat3.rst

@@ -34,6 +34,7 @@ Functions:
 #. :c:func:`glm_mat3_swap_col`
 #. :c:func:`glm_mat3_swap_row`
 #. :c:func:`glm_mat3_rmc`
+#. :c:func:`glm_mat3_make`
 
 Functions documentation
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -187,3 +188,13 @@ Functions documentation
 
     Returns:
         scalar value e.g. Matrix1x1
+
+.. c:function:: void glm_mat3_make(float * __restrict src, mat3 dest)
+
+    Create mat3 matrix from pointer
+
+    | NOTE: **@src** must contain 9 elements.
+
+    Parameters:
+      | *[in]*  **src**  pointer to an array of floats
+      | *[out]* **dest** destination matrix3x3

docs/source/mat4.rst

@@ -47,6 +47,7 @@ Functions:
 #. :c:func:`glm_mat4_swap_col`
 #. :c:func:`glm_mat4_swap_row`
 #. :c:func:`glm_mat4_rmc`
+#. :c:func:`glm_mat4_make`
 
 Functions documentation
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -302,3 +303,13 @@ Functions documentation
 
     Returns:
         scalar value e.g. Matrix1x1
+
+.. c:function:: void glm_mat4_make(float * __restrict src, mat4 dest)
+
+    Create mat4 matrix from pointer
+
+    | NOTE: **@src** must contain 16 elements.
+
+    Parameters:
+      | *[in]*  **src**  pointer to an array of floats
+      | *[out]* **dest** destination matrix4x4

include/cglm/call/mat2.h

@@ -73,6 +73,10 @@ CGLM_EXPORT
 float
 glmc_mat2_rmc(vec2 r, mat2 m, vec2 c);
 
+CGLM_EXPORT
+void
+glmc_mat2_make(float * __restrict src, mat2 dest);
+
 #ifdef __cplusplus
 }
 #endif

include/cglm/call/mat3.h

@@ -80,6 +80,10 @@ CGLM_EXPORT
 float
 glmc_mat3_rmc(vec3 r, mat3 m, vec3 c);
 
+CGLM_EXPORT
+void
+glmc_mat3_make(float * __restrict src, mat3 dest);
+
 #ifdef __cplusplus
 }
 #endif

include/cglm/call/mat4.h

@@ -121,6 +121,10 @@ CGLM_EXPORT
 float
 glmc_mat4_rmc(vec4 r, mat4 m, vec4 c);
 
+CGLM_EXPORT
+void
+glmc_mat4_make(float * __restrict src, mat4 dest);
+
 #ifdef __cplusplus
 }
 #endif

include/cglm/io.h

@@ -13,6 +13,7 @@
    CGLM_INLINE void glm_vec3_print(vec3 vec, FILE *ostream);
    CGLM_INLINE void glm_ivec3_print(ivec3 vec, FILE *ostream);
    CGLM_INLINE void glm_versor_print(versor vec, FILE *ostream);
+   CGLM_INLINE void glm_arch_print(FILE *ostream);
  */
 
 /*
@@ -52,12 +53,20 @@
 #  define CGLM_PRINT_MAX_TO_SHORT 1e5f
 #endif
 
-#ifndef CGLM_PRINT_COLOR
+#ifndef GLM_TESTS_NO_COLORFUL_OUTPUT
-#  define CGLM_PRINT_COLOR        "\033[36m"
+#  ifndef CGLM_PRINT_COLOR
-#endif
+#    define CGLM_PRINT_COLOR        "\033[36m"
-
+#  endif
-#ifndef CGLM_PRINT_COLOR_RESET
+#  ifndef CGLM_PRINT_COLOR_RESET
-#  define CGLM_PRINT_COLOR_RESET  "\033[0m"
+#    define CGLM_PRINT_COLOR_RESET  "\033[0m"
+#  endif
+#else
+#  ifndef CGLM_PRINT_COLOR
+#    define CGLM_PRINT_COLOR
+#  endif
+#  ifndef CGLM_PRINT_COLOR_RESET
+#    define CGLM_PRINT_COLOR_RESET
+#  endif
 #endif
 
 /*!
@@ -67,26 +76,40 @@
  */
 CGLM_INLINE
 void
-glm_arch_print_name(FILE* __restrict ostream) {
+glm_arch_print(FILE* __restrict ostream) {
+  fprintf(ostream, CGLM_PRINT_COLOR "arch: "
 #if defined(CGLM_SIMD_WASM)
-  fprintf(ostream, CGLM_PRINT_COLOR "\ncglm arch: wasm SIMD128"
+  "wasm SIMD128"
-    "\n\n" CGLM_PRINT_COLOR_RESET);
 #elif defined(CGLM_SIMD_x86)
-  fprintf(ostream, CGLM_PRINT_COLOR "\ncglm arch: x86 SSE*" 
+  "x86 SSE* "
-#ifdef __AVX__
+#  ifdef __AVX__
-    " AVX"
+  " AVX"
-#endif
+#  endif
-    "\n\n" CGLM_PRINT_COLOR_RESET);
 #elif defined(CGLM_SIMD_ARM)
-  fprintf(ostream, CGLM_PRINT_COLOR "\ncglm arch: arm"
+  "arm"
-#ifndef __ARM_NEON_FP
+#  ifndef __ARM_NEON_FP
     " NEON_FP"
-#endif
+#  endif
-#ifdef CGLM_ARM64
+#  ifdef CGLM_ARM64
     " ARM64"
+#  endif
+#else
+  "uncommon"
 #endif
-    "\n\n" CGLM_PRINT_COLOR_RESET);
+  CGLM_PRINT_COLOR_RESET);
-#endif
+}
+
+/*!
+ * @brief prints current SIMD path in general
+ *
+ * @param[in] ostream    stream to print e.g. stdout, stderr, FILE ...
+ */
+CGLM_INLINE
+void
+glm_arch_print_name(FILE* __restrict ostream) {
+  fprintf(ostream, CGLM_PRINT_COLOR "\ncglm ");
+  glm_arch_print(ostream);
+  fprintf(ostream, "\n\n" CGLM_PRINT_COLOR_RESET);
 }
 
 CGLM_INLINE
@@ -369,6 +392,8 @@ glm_aabb_print(vec3                    bbox[2],
 #define glm_vec2_print(v, s) (void)v; (void)s;
 #define glm_versor_print(v, s) (void)v; (void)s;
 #define glm_aabb_print(v, t, s) (void)v; (void)t; (void)s;
+#define glm_arch_print(s) (void)s;
+#define glm_arch_print_name(s) (void)s;
 
 #endif
 #endif /* cglm_io_h */

include/cglm/mat2.h

@@ -28,6 +28,7 @@
    CGLM_INLINE void  glm_mat2_swap_col(mat2 mat, int col1, int col2)
    CGLM_INLINE void  glm_mat2_swap_row(mat2 mat, int row1, int row2)
    CGLM_INLINE float glm_mat2_rmc(vec2 r, mat2 m, vec2 c)
+   CGLM_INLINE void  glm_mat2_make(float * restrict src, mat2 dest)
  */
 
 #ifndef cglm_mat2_h
@@ -345,4 +346,19 @@ glm_mat2_rmc(vec2 r, mat2 m, vec2 c) {
   return glm_vec2_dot(r, tmp);
 }
 
+/*!
+ * @brief Create mat2 matrix from pointer
+ *
+ * @param[in]  src  pointer to an array of floats
+ * @param[out] dest matrix
+ */
+CGLM_INLINE
+void
+glm_mat2_make(float * __restrict src, mat2 dest) {
+  dest[0][0] = src[0];
+  dest[0][1] = src[1];
+  dest[1][0] = src[2];
+  dest[1][1] = src[3];
+}
+
 #endif /* cglm_mat2_h */

include/cglm/mat3.h

@@ -30,6 +30,7 @@
    CGLM_INLINE void  glm_mat3_swap_col(mat3 mat, int col1, int col2);
    CGLM_INLINE void  glm_mat3_swap_row(mat3 mat, int row1, int row2);
    CGLM_INLINE float glm_mat3_rmc(vec3 r, mat3 m, vec3 c);
+   CGLM_INLINE void  glm_mat3_make(float * restrict src, mat3 dest);
  */
 
 #ifndef cglm_mat3_h
@@ -427,4 +428,26 @@ glm_mat3_rmc(vec3 r, mat3 m, vec3 c) {
   return glm_vec3_dot(r, tmp);
 }
 
+/*!
+ * @brief Create mat3 matrix from pointer
+ *
+ * @param[in]  src  pointer to an array of floats
+ * @param[out] dest matrix
+ */
+CGLM_INLINE
+void
+glm_mat3_make(float * __restrict src, mat3 dest) {
+  dest[0][0] = src[0];
+  dest[0][1] = src[1];
+  dest[0][2] = src[2];
+
+  dest[1][0] = src[3];
+  dest[1][1] = src[4];
+  dest[1][2] = src[5];
+
+  dest[2][0] = src[6];
+  dest[2][1] = src[7];
+  dest[2][2] = src[8];
+}
+
 #endif /* cglm_mat3_h */

include/cglm/mat4.h

@@ -43,6 +43,7 @@
    CGLM_INLINE void  glm_mat4_swap_col(mat4 mat, int col1, int col2);
    CGLM_INLINE void  glm_mat4_swap_row(mat4 mat, int row1, int row2);
    CGLM_INLINE float glm_mat4_rmc(vec4 r, mat4 m, vec4 c);
+   CGLM_INLINE void  glm_mat4_make(float * restrict src, mat4 dest);
  */
 
 #ifndef cglm_mat_h
@@ -781,4 +782,24 @@ glm_mat4_rmc(vec4 r, mat4 m, vec4 c) {
   return glm_vec4_dot(r, tmp);
 }
 
+/*!
+ * @brief Create mat4 matrix from pointer
+ *
+ * @param[in]  src  pointer to an array of floats
+ * @param[out] dest matrix
+ */
+CGLM_INLINE
+void
+glm_mat4_make(float * __restrict src, mat4 dest) {
+  dest[0][0] = src[0];   dest[1][0] = src[4];
+  dest[0][1] = src[1];   dest[1][1] = src[5];
+  dest[0][2] = src[2];   dest[1][2] = src[6];
+  dest[0][3] = src[3];   dest[1][3] = src[7];
+
+  dest[2][0] = src[8];   dest[3][0] = src[12];
+  dest[2][1] = src[9];   dest[3][1] = src[13];
+  dest[2][2] = src[10];  dest[3][2] = src[14];
+  dest[2][3] = src[11];  dest[3][3] = src[15];
+}
+
 #endif /* cglm_mat_h */

include/cglm/simd/x86.h

@@ -54,7 +54,8 @@
 #  endif
 #endif
 
-#define GLMM_NEGZEROf 0x80000000 /*  0x80000000 ---> -0.0f  */
+/* Note that `0x80000000` corresponds to `INT_MIN` for a 32-bit int. */
+#define GLMM_NEGZEROf ((int)0x80000000) /*  0x80000000 ---> -0.0f  */
 
 #define GLMM__SIGNMASKf(X, Y, Z, W)                                           \
    _mm_castsi128_ps(_mm_set_epi32(X, Y, Z, W))
@@ -64,7 +65,7 @@
 #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_float32x4_SIGNMASK_NEG _mm_castsi128_ps(_mm_set1_epi32(GLMM_NEGZEROf)) /* _mm_set1_ps(-0.0f) */
 #define glmm_float32x8_SIGNMASK_NEG _mm256_castsi256_ps(_mm256_set1_epi32(GLMM_NEGZEROf))
 
 static inline

include/cglm/struct/mat2.h

@@ -27,6 +27,7 @@
    CGLM_INLINE void  glms_mat2_swap_col(mat2 mat, int col1, int col2)
    CGLM_INLINE void  glms_mat2_swap_row(mat2 mat, int row1, int row2)
    CGLM_INLINE float glms_mat2_rmc(vec2 r, mat2 m, vec2 c)
+   CGLM_INLINE float glms_mat42_make(float * __restrict src);
  */
 
 #ifndef cglms_mat2_h
@@ -258,4 +259,18 @@ glms_mat2_(rmc)(vec2s r, mat2s m, vec2s c) {
   return glm_mat2_rmc(r.raw, m.raw, c.raw);
 }
 
+/*!
+ * @brief Create mat2 matrix from pointer
+ *
+ * @param[in]  src  pointer to an array of floats
+ * @return constructed matrix from raw pointer
+ */
+CGLM_INLINE
+mat2s
+glms_mat2_(make)(float * __restrict src) {
+  mat2s r;
+  glm_mat2_make(src, r.raw);
+  return r;
+}
+
 #endif /* cglms_mat2_h */

include/cglm/struct/mat3.h

@@ -28,6 +28,7 @@
    CGLM_INLINE mat3s  glms_mat3_swap_col(mat3s mat, int col1, int col2);
    CGLM_INLINE mat3s  glms_mat3_swap_row(mat3s mat, int row1, int row2);
    CGLM_INLINE float  glms_mat3_rmc(vec3s r, mat3s m, vec3s c);
+   CGLM_INLINE float  glms_mat3_make(float * __restrict src);
  */
 
 #ifndef cglms_mat3s_h
@@ -285,4 +286,18 @@ glms_mat3_(rmc)(vec3s r, mat3s m, vec3s c) {
   return glm_mat3_rmc(r.raw, m.raw, c.raw);
 }
 
+/*!
+ * @brief Create mat3 matrix from pointer
+ *
+ * @param[in]  src  pointer to an array of floats
+ * @return constructed matrix from raw pointer
+ */
+CGLM_INLINE
+mat3s
+glms_mat3_(make)(float * __restrict src) {
+  mat3s r;
+  glm_mat3_make(src, r.raw);
+  return r;
+}
+
 #endif /* cglms_mat3s_h */

include/cglm/struct/mat4.h

@@ -42,6 +42,7 @@
    CGLM_INLINE mat4s   glms_mat4_swap_col(mat4s mat, int col1, int col2);
    CGLM_INLINE mat4s   glms_mat4_swap_row(mat4s mat, int row1, int row2);
    CGLM_INLINE float   glms_mat4_rmc(vec4s r, mat4s m, vec4s c);
+   CGLM_INLINE float   glms_mat4_make(float * __restrict src);
  */
 
 #ifndef cglms_mat4s_h
@@ -459,4 +460,18 @@ glms_mat4_(rmc)(vec4s r, mat4s m, vec4s c) {
   return glm_mat4_rmc(r.raw, m.raw, c.raw);
 }
 
+/*!
+ * @brief Create mat4 matrix from pointer
+ *
+ * @param[in]  src  pointer to an array of floats
+ * @return constructed matrix from raw pointer
+ */
+CGLM_INLINE
+mat4s
+glms_mat4_(make)(float * __restrict src) {
+  mat4s r;
+  glm_mat4_make(src, r.raw);
+  return r;
+}
+
 #endif /* cglms_mat4s_h */

include/cglm/types-struct.h

@@ -25,10 +25,17 @@
       * only #define governing the use of anonymous structs, so for backward
       * compatibility, we still honor that choice and disable them. */
 #    define CGLM_USE_ANONYMOUS_STRUCT 0
-#  elif __STDC_VERSION__ >= 20112L || defined(_MSVC_VER)
+#  elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || \
+        (defined(__cplusplus)      && __cplusplus >= 201103L)
      /* We're compiling for C11 or this is the MSVC compiler. In either
       * case, anonymous structs are available, so use them. */
 #    define CGLM_USE_ANONYMOUS_STRUCT 1
+#  elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
+     /* GCC 4.6 and onwards support anonymous structs as an extension */
+#    define CGLM_USE_ANONYMOUS_STRUCT 1
+#  elif defined(__clang__) && __clang_major__ >= 3
+     /* Clang 3.0 and onwards support anonymous structs as an extension */
+#    define CGLM_USE_ANONYMOUS_STRUCT 1
 #  elif defined(_MSC_VER) && (_MSC_VER >= 1900) /*  Visual Studio 2015 */
      /* We can support anonymous structs
       * since Visual Studio 2015 or 2017 (1910) maybe? */

include/cglm/version.h

@@ -10,6 +10,6 @@
 
 #define CGLM_VERSION_MAJOR 0
 #define CGLM_VERSION_MINOR 9
-#define CGLM_VERSION_PATCH 0
+#define CGLM_VERSION_PATCH 1
 
 #endif /* cglm_version_h */

meson.build

@@ -1,5 +1,5 @@
 project('cglm', 'c',
-    version : '0.9.0',
+    version : '0.9.1',
     license : 'mit',
     default_options : [
         'c_std=c11',

src/mat2.c

@@ -97,3 +97,9 @@ float
 glmc_mat2_rmc(vec2 r, mat2 m, vec2 c) {
   return glm_mat2_rmc(r, m, c);
 }
+
+CGLM_EXPORT
+void
+glmc_mat2_make(float * __restrict src, mat2 dest) {
+  glm_mat2_make(src, dest);
+}

src/mat3.c

@@ -103,3 +103,9 @@ float
 glmc_mat3_rmc(vec3 r, mat3 m, vec3 c) {
   return glm_mat3_rmc(r, m, c);
 }
+
+CGLM_EXPORT
+void
+glmc_mat3_make(float * __restrict src, mat3 dest) {
+  glm_mat3_make(src, dest);
+}

src/mat4.c

@@ -163,3 +163,9 @@ float
 glmc_mat4_rmc(vec4 r, mat4 m, vec4 c) {
   return glm_mat4_rmc(r, m, c);
 }
+
+CGLM_EXPORT
+void
+glmc_mat4_make(float * __restrict src, mat4 dest) {
+  glm_mat4_make(src, dest);
+}

test/runner.c

@@ -25,7 +25,9 @@ main(int argc, const char * argv[]) {
   total  = 0.0;
   count  = sizeof(tests) / sizeof(tests[0]);
 
-  fprintf(stderr, CYAN "\nWelcome to cglm tests\n\n" RESET);
+  fprintf(stderr, CYAN "\nWelcome to cglm tests ( " RESET);
+  glm_arch_print(stderr);
+  fprintf(stderr, CYAN " )\n\n" RESET);
 
   srand((unsigned int)time(NULL));
 

test/src/test_mat2.h

@@ -8,6 +8,7 @@
 #include "test_common.h"
 
 #define A_MATRIX2x2 {{1,2},{5,6}}
+#define MAT2_ARRAY {1, 5, 2, 7}
 
 #ifndef CGLM_TEST_MAT2_ONCE
 #define CGLM_TEST_MAT2_ONCE
@@ -80,7 +81,7 @@ TEST_IMPL(GLM_PREFIX, mat2_identity) {
 }
 
 TEST_IMPL(GLM_PREFIX, mat2_identity_array) {
-  int i, count;
+  size_t i, count;
   mat2 matrices[4] = {
     A_MATRIX2x2,
     A_MATRIX2x2,
@@ -283,4 +284,19 @@ TEST_IMPL(GLM_PREFIX, mat2_rmc) {
   TEST_SUCCESS
 }
 
+TEST_IMPL(GLM_PREFIX, mat2_make) {
+  mat2 dest;
+  unsigned int i, j;
+  float src[4] = MAT2_ARRAY;
+
+  GLM(mat2_make)(src, dest);
+
+  for (i = 0, j = 0; i < sizeof(src) / sizeof(float); i+=2, j++) {
+    ASSERT(test_eq(dest[j][0], src[i]))
+    ASSERT(test_eq(dest[j][1], src[i+1]))
+  }
+
+  TEST_SUCCESS
+}
+
 #undef A_MATRIX2x2

test/src/test_mat3.h

@@ -8,6 +8,7 @@
 #include "test_common.h"
 
 #define A_MATRIX {{1,2,3},{5,6,7},{9,10,11}}
+#define MAT3_ARRAY {1, 5, 2, 7, 12, 1, 4, 6, 0}
 
 TEST_IMPL(GLM_PREFIX, mat3_copy) {
   mat3 m1 = A_MATRIX;
@@ -35,7 +36,7 @@ TEST_IMPL(GLM_PREFIX, mat3_identity) {
 }
 
 TEST_IMPL(GLM_PREFIX, mat3_identity_array) {
-  int i, count;
+  size_t i, count;
   mat3 matrices[4] = {
     A_MATRIX,
     A_MATRIX,
@@ -308,4 +309,21 @@ TEST_IMPL(GLM_PREFIX, mat3_rmc) {
   TEST_SUCCESS
 }
 
+
+TEST_IMPL(GLM_PREFIX, mat3_make) {
+  mat3 dest;
+  unsigned int i, j;
+  float src[9] = MAT3_ARRAY;
+
+  GLM(mat3_make)(src, dest);
+
+  for (i = 0, j = 0; i < sizeof(src) / sizeof(float); i+=3, j++) {
+    ASSERT(test_eq(dest[j][0], src[i]))
+    ASSERT(test_eq(dest[j][1], src[i+1]))
+    ASSERT(test_eq(dest[j][2], src[i+2]))
+  }
+
+  TEST_SUCCESS
+}
+
 #undef A_MATRIX

test/src/test_mat4.h

@@ -9,6 +9,7 @@
 
 #define A_MATRIX  {{1,2,3,4},{5,6,7,8},{9,10,11,12},{13,14,15,16}}
 #define A_MATRIX3 {{1,2,3},{5,6,7},{9,10,11}}
+#define MAT4_ARRAY {1, 5, 2, 7, 12, 1, 4, 6, 0, 8, 1, 0, 6, 5, 0, 1}
 
 TEST_IMPL(GLM_PREFIX, mat4_ucopy) {
   mat4 m1 = A_MATRIX;
@@ -47,7 +48,7 @@ TEST_IMPL(GLM_PREFIX, mat4_identity) {
 }
 
 TEST_IMPL(GLM_PREFIX, mat4_identity_array) {
-  int i, count;
+  size_t i, count;
   mat4 matrices[4] = {
     A_MATRIX,
     A_MATRIX,
@@ -484,5 +485,22 @@ TEST_IMPL(GLM_PREFIX, mat4_rmc) {
   TEST_SUCCESS
 }
 
+TEST_IMPL(GLM_PREFIX, mat4_make) {
+  mat4 dest;
+  unsigned int i, j;
+  float src[16] = MAT4_ARRAY;
+
+  GLM(mat4_make)(src, dest);
+
+  for (i = 0, j = 0; i < sizeof(src) / sizeof(float); i+=4, j++) {
+    ASSERT(test_eq(dest[j][0], src[i]))
+    ASSERT(test_eq(dest[j][1], src[i+1]))
+    ASSERT(test_eq(dest[j][2], src[i+2]))
+    ASSERT(test_eq(dest[j][3], src[i+3]))
+  }
+
+  TEST_SUCCESS
+}
+
 #undef A_MATRIX
 #undef A_MATRIX3

test/src/test_quat.h

@@ -56,7 +56,7 @@ TEST_IMPL(GLM_PREFIX, quat_identity) {
 }
 
 TEST_IMPL(GLM_PREFIX, quat_identity_array) {
-  int i, count;
+  size_t i, count;
   versor quats[4] = {
     {1.0f, 2.0f, 3.0f, 4.0f},
     {1.0f, 2.0f, 3.0f, 4.0f},

test/tests.h

@@ -124,6 +124,7 @@ TEST_DECLARE(glm_mat4_inv_precise)
 TEST_DECLARE(glm_mat4_swap_col)
 TEST_DECLARE(glm_mat4_swap_row)
 TEST_DECLARE(glm_mat4_rmc)
+TEST_DECLARE(glm_mat4_make)
 
 TEST_DECLARE(glmc_mat4_ucopy)
 TEST_DECLARE(glmc_mat4_copy)
@@ -150,6 +151,7 @@ TEST_DECLARE(glmc_mat4_inv_fast)
 TEST_DECLARE(glmc_mat4_swap_col)
 TEST_DECLARE(glmc_mat4_swap_row)
 TEST_DECLARE(glmc_mat4_rmc)
+TEST_DECLARE(glmc_mat4_make)
 
 /* mat3 */
 TEST_DECLARE(glm_mat3_copy)
@@ -168,6 +170,7 @@ TEST_DECLARE(glm_mat3_inv)
 TEST_DECLARE(glm_mat3_swap_col)
 TEST_DECLARE(glm_mat3_swap_row)
 TEST_DECLARE(glm_mat3_rmc)
+TEST_DECLARE(glm_mat3_make)
 
 TEST_DECLARE(glmc_mat3_copy)
 TEST_DECLARE(glmc_mat3_identity)
@@ -185,6 +188,7 @@ TEST_DECLARE(glmc_mat3_inv)
 TEST_DECLARE(glmc_mat3_swap_col)
 TEST_DECLARE(glmc_mat3_swap_row)
 TEST_DECLARE(glmc_mat3_rmc)
+TEST_DECLARE(glmc_mat3_make)
 
 TEST_DECLARE(MACRO_GLM_MAT2_IDENTITY_INIT)
 TEST_DECLARE(MACRO_GLM_MAT2_ZERO_INIT)
@@ -205,6 +209,7 @@ TEST_DECLARE(glm_mat2_inv)
 TEST_DECLARE(glm_mat2_swap_col)
 TEST_DECLARE(glm_mat2_swap_row)
 TEST_DECLARE(glm_mat2_rmc)
+TEST_DECLARE(glm_mat2_make)
 
 TEST_DECLARE(glmc_mat2_copy)
 TEST_DECLARE(glmc_mat2_identity)
@@ -221,6 +226,7 @@ TEST_DECLARE(glmc_mat2_inv)
 TEST_DECLARE(glmc_mat2_swap_col)
 TEST_DECLARE(glmc_mat2_swap_row)
 TEST_DECLARE(glmc_mat2_rmc)
+TEST_DECLARE(glmc_mat2_make)
 
 /* camera (incl [LR]H cross [NZ]O) */
 TEST_DECLARE(glm_perspective_lh_zo)
@@ -965,6 +971,7 @@ TEST_LIST {
   TEST_ENTRY(glm_mat4_swap_col)
   TEST_ENTRY(glm_mat4_swap_row)
   TEST_ENTRY(glm_mat4_rmc)
+  TEST_ENTRY(glm_mat4_make)
   
   TEST_ENTRY(glmc_mat4_ucopy)
   TEST_ENTRY(glmc_mat4_copy)
@@ -991,6 +998,7 @@ TEST_LIST {
   TEST_ENTRY(glmc_mat4_swap_col)
   TEST_ENTRY(glmc_mat4_swap_row)
   TEST_ENTRY(glmc_mat4_rmc)
+  TEST_ENTRY(glmc_mat4_make)
   
   /* mat3 */
   TEST_ENTRY(glm_mat3_copy)
@@ -1009,6 +1017,7 @@ TEST_LIST {
   TEST_ENTRY(glm_mat3_swap_col)
   TEST_ENTRY(glm_mat3_swap_row)
   TEST_ENTRY(glm_mat3_rmc)
+  TEST_ENTRY(glm_mat3_make)
 
   TEST_ENTRY(glmc_mat3_copy)
   TEST_ENTRY(glmc_mat3_identity)
@@ -1026,6 +1035,7 @@ TEST_LIST {
   TEST_ENTRY(glmc_mat3_swap_col)
   TEST_ENTRY(glmc_mat3_swap_row)
   TEST_ENTRY(glmc_mat3_rmc)
+  TEST_ENTRY(glmc_mat3_make)
   
   TEST_ENTRY(MACRO_GLM_MAT2_IDENTITY_INIT)
   TEST_ENTRY(MACRO_GLM_MAT2_ZERO_INIT)
@@ -1046,6 +1056,7 @@ TEST_LIST {
   TEST_ENTRY(glm_mat2_swap_col)
   TEST_ENTRY(glm_mat2_swap_row)
   TEST_ENTRY(glm_mat2_rmc)
+  TEST_ENTRY(glm_mat2_make)
 
   TEST_ENTRY(glmc_mat2_copy)
   TEST_ENTRY(glmc_mat2_identity)
@@ -1062,6 +1073,7 @@ TEST_LIST {
   TEST_ENTRY(glmc_mat2_swap_col)
   TEST_ENTRY(glmc_mat2_swap_row)
   TEST_ENTRY(glmc_mat2_rmc)
+  TEST_ENTRY(glmc_mat2_make)
 
   /* camera (incl [LR]H cross [NZ]O) */
   TEST_ENTRY(glm_perspective_lh_zo)