From 4c9b32324d6ce1a6e31b157930f614ed5545079b Mon Sep 17 00:00:00 2001
From: BeeverFeever <scottyadam6@gmail.com>
Date: Mon, 25 Dec 2023 12:51:33 +1100
Subject: [PATCH] Add tests for ivec -= and += functions

---
 test/src/test_ivec2.h | 224 ++++++++++++++++++++++++++++++++++++
 test/src/test_ivec3.h | 240 +++++++++++++++++++++++++++++++++++++++
 test/src/test_ivec4.h | 257 +++++++++++++++++++++++++++++++++++++++++-
 test/tests.h          | 192 +++++++++++++++++++++++++++++++
 4 files changed, 912 insertions(+), 1 deletion(-)

diff --git a/test/src/test_ivec2.h b/test/src/test_ivec2.h
index 1b50623..c7ae1de 100644
--- a/test/src/test_ivec2.h
+++ b/test/src/test_ivec2.h
@@ -126,6 +126,230 @@ TEST_IMPL(GLM_PREFIX, ivec2_scale) {
   TEST_SUCCESS
 }
 
+TEST_IMPL(GLM_PREFIX, ivec2_addadd) {
+  ivec2 a = {2, -3},
+        b = {-3, 4},
+        c = {1, 2},
+        d = {1, 2};
+
+  GLM(ivec2_addadd)(a, b, c);
+
+  ASSERT(test_eq(d[0] + a[0] + b[0], c[0]))
+  ASSERT(test_eq(d[1] + a[1] + b[1], c[1]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec2_addadds) {
+  ivec2 a = {2, -3},
+        c = {1, 2},
+        d = {1, 2};
+  int s = 9;
+
+  GLM(ivec2_addadds)(a, s, c);
+
+  ASSERT(test_eq(d[0] + a[0] + s, c[0]))
+  ASSERT(test_eq(d[1] + a[1] + s, c[1]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec2_subadd) {
+  ivec2 a = {2, -3},
+        b = {-3, 4},
+        c = {1, 2},
+        d = {1, 2};
+
+  GLM(ivec2_subadd)(a, b, c);
+
+  ASSERT(test_eq(d[0] + (a[0] - b[0]), c[0]))
+  ASSERT(test_eq(d[1] + (a[1] - b[1]), c[1]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec2_subadds) {
+  ivec2 a = {2, -3},
+        c = {1, 2},
+        d = {1, 2};
+  int s = 9;
+
+  GLM(ivec2_subadds)(a, s, c);
+
+  ASSERT(test_eq(d[0] + a[0] - s, c[0]))
+  ASSERT(test_eq(d[1] + a[1] - s, c[1]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec2_muladd) {
+  ivec2 a = {2, -3},
+        b = {-3, 4},
+        c = {1, 2},
+        d = {1, 2};
+
+  GLM(ivec2_muladd)(a, b, c);
+
+  ASSERT(test_eq(d[0] + a[0] * b[0], c[0]))
+  ASSERT(test_eq(d[1] + a[1] * b[1], c[1]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec2_muladds) {
+  ivec2 a = {2, -3},
+        c = {1, 2},
+        d = {1, 2};
+  int s = 9;
+
+  GLM(ivec2_muladds)(a, s, c);
+
+  ASSERT(test_eq(d[0] + a[0] * s, c[0]))
+  ASSERT(test_eq(d[1] + a[1] * s, c[1]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec2_maxadd) {
+  ivec2 a = {2, -3},
+        b = {-3, 4},
+        c = {1, 2},
+        d = {1, 2};
+
+  GLM(ivec2_maxadd)(a, b, c);
+  
+  ASSERT(test_eq(d[0] += glm_imax(a[0], b[0]), c[0]))
+  ASSERT(test_eq(d[1] += glm_imax(a[1], b[1]), c[1]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec2_minadd) {
+  ivec2 a = {2, -3},
+        b = {-3, 4},
+        c = {1, 2},
+        d = {1, 2};
+
+  GLM(ivec2_minadd)(a, b, c);
+  
+  ASSERT(test_eq(d[0] += glm_imin(a[0], b[0]), c[0]))
+  ASSERT(test_eq(d[1] += glm_imin(a[1], b[1]), c[1]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec2_subsub) {
+  ivec2 a = {2, -3},
+        b = {-3, 4},
+        c = {1, 2},
+        d = {1, 2};
+
+  GLM(ivec2_subsub)(a, b, c);
+
+  ASSERT(test_eq(d[0] - (a[0] - b[0]), c[0]))
+  ASSERT(test_eq(d[1] - (a[1] - b[1]), c[1]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec2_subsubs) {
+  ivec2 a = {2, -3},
+        c = {1, 2},
+        d = {1, 2};
+  int s = 9;
+
+  GLM(ivec2_subsubs)(a, s, c);
+
+  ASSERT(test_eq(d[0] - (a[0] - s), c[0]))
+  ASSERT(test_eq(d[1] - (a[1] - s), c[1]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec2_addsub) {
+  ivec2 a = {2, -3},
+        b = {-3, 4},
+        c = {1, 2},
+        d = {1, 2};
+
+  GLM(ivec2_addsub)(a, b, c);
+
+  ASSERT(test_eq(d[0] - (a[0] + b[0]), c[0]))
+  ASSERT(test_eq(d[1] - (a[1] + b[1]), c[1]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec2_addsubs) {
+  ivec2 a = {2, -3},
+        c = {1, 2},
+        d = {1, 2};
+  int s = 9;
+
+  GLM(ivec2_addsubs)(a, s, c);
+
+  ASSERT(test_eq(d[0] - (a[0] + s), c[0]))
+  ASSERT(test_eq(d[1] - (a[1] + s), c[1]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec2_mulsub) {
+  ivec2 a = {2, -3},
+        b = {-3, 4},
+        c = {1, 2},
+        d = {1, 2};
+
+  GLM(ivec2_mulsub)(a, b, c);
+
+  ASSERT(test_eq(d[0] - a[0] * b[0], c[0]))
+  ASSERT(test_eq(d[1] - a[1] * b[1], c[1]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec2_mulsubs) {
+  ivec2 a = {2, -3},
+        c = {1, 2},
+        d = {1, 2};
+  int s = 9;
+
+  GLM(ivec2_mulsubs)(a, s, c);
+
+  ASSERT(test_eq(d[0] - a[0] * s, c[0]))
+  ASSERT(test_eq(d[1] - a[1] * s, c[1]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec2_maxsub) {
+  ivec2 a = {2, -3},
+        b = {-3, 4},
+        c = {1, 2},
+        d = {1, 2};
+
+  GLM(ivec2_maxsub)(a, b, c);
+  
+  ASSERT(test_eq(d[0] -= glm_imax(a[0], b[0]), c[0]))
+  ASSERT(test_eq(d[1] -= glm_imax(a[1], b[1]), c[1]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec2_minsub) {
+  ivec2 a = {2, -3},
+        b = {-3, 4},
+        c = {1, 2},
+        d = {1, 2};
+
+  GLM(ivec2_minsub)(a, b, c);
+
+  ASSERT(test_eq(d[0] -= glm_imin(a[0], b[0]), c[0]))
+  ASSERT(test_eq(d[1] -= glm_imin(a[1], b[1]), c[1]))
+
+  TEST_SUCCESS
+}
+
 TEST_IMPL(GLM_PREFIX, ivec2_distance2) {
   ivec2 a = {-1, 3};
   ivec2 b = {5, 4};
diff --git a/test/src/test_ivec3.h b/test/src/test_ivec3.h
index f29ad1d..a651d61 100644
--- a/test/src/test_ivec3.h
+++ b/test/src/test_ivec3.h
@@ -131,6 +131,246 @@ TEST_IMPL(GLM_PREFIX, ivec3_scale) {
   TEST_SUCCESS
 }
 
+TEST_IMPL(GLM_PREFIX, ivec3_addadd) {
+  ivec3 a = {2, -3, 8},
+        b = {-3, 4, 5},
+        c = {1, 2, 6},
+        d = {1, 2, 6};
+
+  GLM(ivec3_addadd)(a, b, c);
+
+  ASSERT(test_eq(d[0] + a[0] + b[0], c[0]))
+  ASSERT(test_eq(d[1] + a[1] + b[1], c[1]))
+  ASSERT(test_eq(d[2] + a[2] + b[2], c[2]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec3_addadds) {
+  ivec3 a = {2, -3, 5},
+        c = {1, 2, -9},
+        d = {1, 2, -9};
+  int s = 9;
+
+  GLM(ivec3_addadds)(a, s, c);
+
+  ASSERT(test_eq(d[0] + a[0] + s, c[0]))
+  ASSERT(test_eq(d[1] + a[1] + s, c[1]))
+  ASSERT(test_eq(d[2] + a[2] + s, c[2]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec3_subadd) {
+  ivec3 a = {2, -3, 8},
+        b = {-3, 4, 5},
+        c = {1, 2, 6},
+        d = {1, 2, 6};
+
+  GLM(ivec3_subadd)(a, b, c);
+
+  ASSERT(test_eq(d[0] + a[0] - b[0], c[0]))
+  ASSERT(test_eq(d[1] + a[1] - b[1], c[1]))
+  ASSERT(test_eq(d[2] + a[2] - b[2], c[2]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec3_subadds) {
+  ivec3 a = {2, -3, 5},
+        c = {1, 2, -9},
+        d = {1, 2, -9};
+  int s = 9;
+
+  GLM(ivec3_subadds)(a, s, c);
+
+  ASSERT(test_eq(d[0] + a[0] - s, c[0]))
+  ASSERT(test_eq(d[1] + a[1] - s, c[1]))
+  ASSERT(test_eq(d[2] + a[2] - s, c[2]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec3_muladd) {
+  ivec3 a = {2, -3, 8},
+        b = {-3, 4, 5},
+        c = {1, 2, 6},
+        d = {1, 2, 6};
+
+  GLM(ivec3_muladd)(a, b, c);
+
+  ASSERT(test_eq(d[0] + a[0] * b[0], c[0]))
+  ASSERT(test_eq(d[1] + a[1] * b[1], c[1]))
+  ASSERT(test_eq(d[2] + a[2] * b[2], c[2]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec3_muladds) {
+  ivec3 a = {2, -3, 5},
+        c = {1, 2, -9},
+        d = {1, 2, -9};
+  int s = 9;
+
+  GLM(ivec3_muladds)(a, s, c);
+
+  ASSERT(test_eq(d[0] + a[0] * s, c[0]))
+  ASSERT(test_eq(d[1] + a[1] * s, c[1]))
+  ASSERT(test_eq(d[2] + a[2] * s, c[2]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec3_maxadd) {
+  ivec3 a = {2, -3, 8},
+        b = {-3, 4, 5},
+        c = {1, 2, 6},
+        d = {1, 2, 6};
+
+  GLM(ivec3_maxadd)(a, b, c);
+  
+  ASSERT(test_eq(d[0] += glm_imax(a[0], b[0]), c[0]))
+  ASSERT(test_eq(d[1] += glm_imax(a[1], b[1]), c[1]))
+  ASSERT(test_eq(d[2] += glm_imax(a[2], b[2]), c[2]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec3_minadd) {
+  ivec3 a = {2, -3, 8},
+        b = {-3, 4, 5},
+        c = {1, 2, 6},
+        d = {1, 2, 6};
+
+  GLM(ivec3_minadd)(a, b, c);
+  
+  ASSERT(test_eq(d[0] += glm_imin(a[0], b[0]), c[0]))
+  ASSERT(test_eq(d[1] += glm_imin(a[1], b[1]), c[1]))
+  ASSERT(test_eq(d[2] += glm_imin(a[2], b[2]), c[2]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec3_subsub) {
+  ivec3 a = {2, -3, 8},
+        b = {-3, 4, 5},
+        c = {1, 2, 6},
+        d = {1, 2, 6};
+
+  GLM(ivec3_subsub)(a, b, c);
+
+  ASSERT(test_eq(d[0] - (a[0] - b[0]), c[0]))
+  ASSERT(test_eq(d[1] - (a[1] - b[1]), c[1]))
+  ASSERT(test_eq(d[2] - (a[2] - b[2]), c[2]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec3_subsubs) {
+  ivec3 a = {2, -3, 5},
+        c = {1, 2, -9},
+        d = {1, 2, -9};
+  int s = 9;
+
+  GLM(ivec3_subsubs)(a, s, c);
+
+  ASSERT(test_eq(d[0] - (a[0] - s), c[0]))
+  ASSERT(test_eq(d[1] - (a[1] - s), c[1]))
+  ASSERT(test_eq(d[2] - (a[2] - s), c[2]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec3_addsub) {
+  ivec3 a = {2, -3, 8},
+        b = {-3, 4, 5},
+        c = {1, 2, 6},
+        d = {1, 2, 6};
+
+  GLM(ivec3_addsub)(a, b, c);
+
+  ASSERT(test_eq(d[0] - (a[0] + b[0]), c[0]))
+  ASSERT(test_eq(d[1] - (a[1] + b[1]), c[1]))
+  ASSERT(test_eq(d[2] - (a[2] + b[2]), c[2]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec3_addsubs) {
+  ivec3 a = {2, -3, 5},
+        c = {1, 2, -9},
+        d = {1, 2, -9};
+  int s = 9;
+
+  GLM(ivec3_addsubs)(a, s, c);
+
+  ASSERT(test_eq(d[0] - (a[0] + s), c[0]))
+  ASSERT(test_eq(d[1] - (a[1] + s), c[1]))
+  ASSERT(test_eq(d[2] - (a[2] + s), c[2]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec3_mulsub) {
+  ivec3 a = {2, -3, 8},
+        b = {-3, 4, 5},
+        c = {1, 2, 6},
+        d = {1, 2, 6};
+
+  GLM(ivec3_mulsub)(a, b, c);
+
+  ASSERT(test_eq(d[0] - a[0] * b[0], c[0]))
+  ASSERT(test_eq(d[1] - a[1] * b[1], c[1]))
+  ASSERT(test_eq(d[2] - a[2] * b[2], c[2]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec3_mulsubs) {
+  ivec3 a = {2, -3, 5},
+        c = {1, 2, -9},
+        d = {1, 2, -9};
+  int s = 9;
+
+  GLM(ivec3_mulsubs)(a, s, c);
+
+  ASSERT(test_eq(d[0] - a[0] * s, c[0]))
+  ASSERT(test_eq(d[1] - a[1] * s, c[1]))
+  ASSERT(test_eq(d[2] - a[2] * s, c[2]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec3_maxsub) {
+  ivec3 a = {2, -3, 8},
+        b = {-3, 4, 5},
+        c = {1, 2, 6},
+        d = {1, 2, 6};
+
+  GLM(ivec3_maxsub)(a, b, c);
+
+  ASSERT(test_eq(d[0] -= glm_imax(a[0], b[0]), c[0]))
+  ASSERT(test_eq(d[1] -= glm_imax(a[1], b[1]), c[1]))
+  ASSERT(test_eq(d[2] -= glm_imax(a[2], b[2]), c[2]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec3_minsub) {
+  ivec3 a = {2, -3, 8},
+        b = {-3, 4, 5},
+        c = {1, 2, 6},
+        d = {1, 2, 6};
+
+  GLM(ivec3_minsub)(a, b, c);
+
+  ASSERT(test_eq(d[0] -= glm_imin(a[0], b[0]), c[0]))
+  ASSERT(test_eq(d[1] -= glm_imin(a[1], b[1]), c[1]))
+  ASSERT(test_eq(d[2] -= glm_imin(a[2], b[2]), c[2]))
+
+  TEST_SUCCESS
+}
+
 TEST_IMPL(GLM_PREFIX, ivec3_distance2) {
   ivec3 a = {-1, 3, 0};
   ivec3 b = {5, 4, 2};
diff --git a/test/src/test_ivec4.h b/test/src/test_ivec4.h
index f93d291..6ff674a 100644
--- a/test/src/test_ivec4.h
+++ b/test/src/test_ivec4.h
@@ -8,7 +8,7 @@
 #include "test_common.h"
 
 TEST_IMPL(GLM_PREFIX, ivec4) {
-  ivec3 v3 = {2, 3, 5};
+  ivec4 v3 = {2, 3, 5};
   ivec4 v4;
 
   GLM(ivec4)(v3, 7, v4);
@@ -141,6 +141,261 @@ TEST_IMPL(GLM_PREFIX, ivec4_scale) {
   TEST_SUCCESS
 }
 
+TEST_IMPL(GLM_PREFIX, ivec4_addadd) {
+  ivec4 a = {2, -3, 8, -7},
+        b = {-3, 4, 5, -2},
+        c = {1, 2, 6, 15},
+        d = {1, 2, 6, 15};
+
+  GLM(ivec4_addadd)(a, b, c);
+
+  ASSERT(test_eq(d[0] + a[0] + b[0], c[0]))
+  ASSERT(test_eq(d[1] + a[1] + b[1], c[1]))
+  ASSERT(test_eq(d[2] + a[2] + b[2], c[2]))
+  ASSERT(test_eq(d[3] + a[3] + b[3], c[3]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec4_addadds) {
+  ivec4 a = {2, -3, 4, 7},
+        c = {1, 2, -8, 5},
+        d = {1, 2, -8, 5};
+  int s = 9;
+
+  GLM(ivec4_addadds)(a, s, c);
+
+  ASSERT(test_eq(d[0] + a[0] + s, c[0]))
+  ASSERT(test_eq(d[1] + a[1] + s, c[1]))
+  ASSERT(test_eq(d[2] + a[2] + s, c[2]))
+  ASSERT(test_eq(d[3] + a[3] + s, c[3]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec4_subadd) {
+  ivec4 a = {2, -3, 8, -7},
+        b = {-3, 4, 5, -2},
+        c = {1, 2, 6, 15},
+        d = {1, 2, 6, 15};
+
+  GLM(ivec4_subadd)(a, b, c);
+
+  ASSERT(test_eq(d[0] + a[0] - b[0], c[0]))
+  ASSERT(test_eq(d[1] + a[1] - b[1], c[1]))
+  ASSERT(test_eq(d[2] + a[2] - b[2], c[2]))
+  ASSERT(test_eq(d[3] + a[3] - b[3], c[3]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec4_subadds) {
+  ivec4 a = {2, -3, 4, 7},
+        c = {1, 2, -8, 5},
+        d = {1, 2, -8, 5};
+  int s = 9;
+
+  GLM(ivec4_subadds)(a, s, c);
+
+  ASSERT(test_eq(d[0] + a[0] - s, c[0]))
+  ASSERT(test_eq(d[1] + a[1] - s, c[1]))
+  ASSERT(test_eq(d[2] + a[2] - s, c[2]))
+  ASSERT(test_eq(d[3] + a[3] - s, c[3]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec4_muladd) {
+  ivec4 a = {2, -3, 8, -7},
+        b = {-3, 4, 5, -2},
+        c = {1, 2, 6, 15},
+        d = {1, 2, 6, 15};
+
+  GLM(ivec4_muladd)(a, b, c);
+
+  ASSERT(test_eq(d[0] + a[0] * b[0], c[0]))
+  ASSERT(test_eq(d[1] + a[1] * b[1], c[1]))
+  ASSERT(test_eq(d[2] + a[2] * b[2], c[2]))
+  ASSERT(test_eq(d[3] + a[3] * b[3], c[3]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec4_muladds) {
+  ivec4 a = {2, -3, 4, 7},
+        c = {1, 2, -8, 5},
+        d = {1, 2, -8, 5};
+  int s = 9;
+
+  GLM(ivec4_muladds)(a, s, c);
+
+  ASSERT(test_eq(d[0] + a[0] * s, c[0]))
+  ASSERT(test_eq(d[1] + a[1] * s, c[1]))
+  ASSERT(test_eq(d[2] + a[2] * s, c[2]))
+  ASSERT(test_eq(d[3] + a[3] * s, c[3]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec4_maxadd) {
+  ivec4 a = {2, -3, 8, -7},
+        b = {-3, 4, 5, -2},
+        c = {1, 2, 6, 15},
+        d = {1, 2, 6, 15};
+
+  GLM(ivec4_maxadd)(a, b, c);
+  
+  ASSERT(test_eq(d[0] += glm_imax(a[0], b[0]), c[0]))
+  ASSERT(test_eq(d[1] += glm_imax(a[1], b[1]), c[1]))
+  ASSERT(test_eq(d[2] += glm_imax(a[2], b[2]), c[2]))
+  ASSERT(test_eq(d[3] += glm_imax(a[3], b[3]), c[3]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec4_minadd) {
+  ivec4 a = {2, -3, 8, -7},
+        b = {-3, 4, 5, -2},
+        c = {1, 2, 6, 15},
+        d = {1, 2, 6, 15};
+
+  GLM(ivec4_minadd)(a, b, c);
+  
+  ASSERT(test_eq(d[0] += glm_imin(a[0], b[0]), c[0]))
+  ASSERT(test_eq(d[1] += glm_imin(a[1], b[1]), c[1]))
+  ASSERT(test_eq(d[2] += glm_imin(a[2], b[2]), c[2]))
+  ASSERT(test_eq(d[3] += glm_imin(a[3], b[3]), c[3]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec4_subsub) {
+  ivec4 a = {2, -3, 8, -7},
+        b = {-3, 4, 5, -2},
+        c = {1, 2, 6, 15},
+        d = {1, 2, 6, 15};
+
+  GLM(ivec4_subsub)(a, b, c);
+
+  ASSERT(test_eq(d[0] - (a[0] - b[0]), c[0]))
+  ASSERT(test_eq(d[1] - (a[1] - b[1]), c[1]))
+  ASSERT(test_eq(d[2] - (a[2] - b[2]), c[2]))
+  ASSERT(test_eq(d[3] - (a[3] - b[3]), c[3]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec4_subsubs) {
+  ivec4 a = {2, -3, 4, 7},
+        c = {1, 2, -8, 5},
+        d = {1, 2, -8, 5};
+  int s = 9;
+
+  GLM(ivec4_subsubs)(a, s, c);
+
+  ASSERT(test_eq(d[0] - (a[0] - s), c[0]))
+  ASSERT(test_eq(d[1] - (a[1] - s), c[1]))
+  ASSERT(test_eq(d[2] - (a[2] - s), c[2]))
+  ASSERT(test_eq(d[3] - (a[3] - s), c[3]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec4_addsub) {
+  ivec4 a = {2, -3, 8, -7},
+        b = {-3, 4, 5, -2},
+        c = {1, 2, 6, 15},
+        d = {1, 2, 6, 15};
+
+  GLM(ivec4_addsub)(a, b, c);
+
+  ASSERT(test_eq(d[0] - (a[0] + b[0]), c[0]))
+  ASSERT(test_eq(d[1] - (a[1] + b[1]), c[1]))
+  ASSERT(test_eq(d[2] - (a[2] + b[2]), c[2]))
+  ASSERT(test_eq(d[3] - (a[3] + b[3]), c[3]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec4_addsubs) {
+  ivec4 a = {2, -3, 4, 7},
+        c = {1, 2, -8, 5},
+        d = {1, 2, -8, 5};
+  int s = 9;
+
+  GLM(ivec4_addsubs)(a, s, c);
+
+  ASSERT(test_eq(d[0] - (a[0] + s), c[0]))
+  ASSERT(test_eq(d[1] - (a[1] + s), c[1]))
+  ASSERT(test_eq(d[2] - (a[2] + s), c[2]))
+  ASSERT(test_eq(d[3] - (a[3] + s), c[3]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec4_mulsub) {
+  ivec4 a = {2, -3, 8, -7},
+        b = {-3, 4, 5, -2},
+        c = {1, 2, 6, 15},
+        d = {1, 2, 6, 15};
+
+  GLM(ivec4_mulsub)(a, b, c);
+
+  ASSERT(test_eq(d[0] - a[0] * b[0], c[0]))
+  ASSERT(test_eq(d[1] - a[1] * b[1], c[1]))
+  ASSERT(test_eq(d[2] - a[2] * b[2], c[2]))
+  ASSERT(test_eq(d[3] - a[3] * b[3], c[3]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec4_mulsubs) {
+  ivec4 a = {2, -3, 4, 7},
+        c = {1, 2, -8, 5},
+        d = {1, 2, -8, 5};
+  int s = 9;
+
+  GLM(ivec4_mulsubs)(a, s, c);
+
+  ASSERT(test_eq(d[0] - a[0] * s, c[0]))
+  ASSERT(test_eq(d[1] - a[1] * s, c[1]))
+  ASSERT(test_eq(d[2] - a[2] * s, c[2]))
+  ASSERT(test_eq(d[3] - a[3] * s, c[3]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec4_maxsub) {
+  ivec4 a = {2, -3, 8, -7},
+        b = {-3, 4, 5, -2},
+        c = {1, 2, 6, 15},
+        d = {1, 2, 6, 15};
+
+  GLM(ivec4_maxsub)(a, b, c);
+
+  ASSERT(test_eq(d[0] -= glm_imax(a[0], b[0]), c[0]))
+  ASSERT(test_eq(d[1] -= glm_imax(a[1], b[1]), c[1]))
+  ASSERT(test_eq(d[2] -= glm_imax(a[2], b[2]), c[2]))
+  ASSERT(test_eq(d[3] -= glm_imax(a[3], b[3]), c[3]))
+
+  TEST_SUCCESS
+}
+
+TEST_IMPL(GLM_PREFIX, ivec4_minsub) {
+  ivec4 a = {2, -3, 8, -7},
+        b = {-3, 4, 5, -2},
+        c = {1, 2, 6, 15},
+        d = {1, 2, 6, 15};
+
+  GLM(ivec4_minsub)(a, b, c);
+
+  ASSERT(test_eq(d[0] -= glm_imin(a[0], b[0]), c[0]))
+  ASSERT(test_eq(d[1] -= glm_imin(a[1], b[1]), c[1]))
+  ASSERT(test_eq(d[2] -= glm_imin(a[2], b[2]), c[2]))
+  ASSERT(test_eq(d[3] -= glm_imin(a[3], b[3]), c[3]))
+
+  TEST_SUCCESS
+}
 TEST_IMPL(GLM_PREFIX, ivec4_distance2) {
   ivec4 a = {-1, 3, 0, 4};
   ivec4 b = {5, 4, 2, 6};
diff --git a/test/tests.h b/test/tests.h
index 2f26675..eb3b58b 100644
--- a/test/tests.h
+++ b/test/tests.h
@@ -898,6 +898,22 @@ TEST_DECLARE(glm_ivec2_sub)
 TEST_DECLARE(glm_ivec2_subs)
 TEST_DECLARE(glm_ivec2_mul)
 TEST_DECLARE(glm_ivec2_scale)
+TEST_DECLARE(glm_ivec2_addadd)
+TEST_DECLARE(glm_ivec2_addadds)
+TEST_DECLARE(glm_ivec2_subadd)
+TEST_DECLARE(glm_ivec2_subadds)
+TEST_DECLARE(glm_ivec2_muladd)
+TEST_DECLARE(glm_ivec2_muladds)
+TEST_DECLARE(glm_ivec2_maxadd)
+TEST_DECLARE(glm_ivec2_minadd)
+TEST_DECLARE(glm_ivec2_subsub)
+TEST_DECLARE(glm_ivec2_subsubs)
+TEST_DECLARE(glm_ivec2_addsub)
+TEST_DECLARE(glm_ivec2_addsubs)
+TEST_DECLARE(glm_ivec2_mulsub)
+TEST_DECLARE(glm_ivec2_mulsubs)
+TEST_DECLARE(glm_ivec2_maxsub)
+TEST_DECLARE(glm_ivec2_minsub)
 TEST_DECLARE(glm_ivec2_distance2)
 TEST_DECLARE(glm_ivec2_distance)
 TEST_DECLARE(glm_ivec2_fill)
@@ -918,6 +934,22 @@ TEST_DECLARE(glmc_ivec2_sub)
 TEST_DECLARE(glmc_ivec2_subs)
 TEST_DECLARE(glmc_ivec2_mul)
 TEST_DECLARE(glmc_ivec2_scale)
+TEST_DECLARE(glmc_ivec2_addadd)
+TEST_DECLARE(glmc_ivec2_addadds)
+TEST_DECLARE(glmc_ivec2_subadd)
+TEST_DECLARE(glmc_ivec2_subadds)
+TEST_DECLARE(glmc_ivec2_muladd)
+TEST_DECLARE(glmc_ivec2_muladds)
+TEST_DECLARE(glmc_ivec2_maxadd)
+TEST_DECLARE(glmc_ivec2_minadd)
+TEST_DECLARE(glmc_ivec2_subsub)
+TEST_DECLARE(glmc_ivec2_subsubs)
+TEST_DECLARE(glmc_ivec2_addsub)
+TEST_DECLARE(glmc_ivec2_addsubs)
+TEST_DECLARE(glmc_ivec2_mulsub)
+TEST_DECLARE(glmc_ivec2_mulsubs)
+TEST_DECLARE(glmc_ivec2_maxsub)
+TEST_DECLARE(glmc_ivec2_minsub)
 TEST_DECLARE(glmc_ivec2_distance2)
 TEST_DECLARE(glmc_ivec2_distance)
 TEST_DECLARE(glmc_ivec2_fill)
@@ -939,6 +971,22 @@ TEST_DECLARE(glm_ivec3_sub)
 TEST_DECLARE(glm_ivec3_subs)
 TEST_DECLARE(glm_ivec3_mul)
 TEST_DECLARE(glm_ivec3_scale)
+TEST_DECLARE(glm_ivec3_addadd)
+TEST_DECLARE(glm_ivec3_addadds)
+TEST_DECLARE(glm_ivec3_subadd)
+TEST_DECLARE(glm_ivec3_subadds)
+TEST_DECLARE(glm_ivec3_muladd)
+TEST_DECLARE(glm_ivec3_muladds)
+TEST_DECLARE(glm_ivec3_maxadd)
+TEST_DECLARE(glm_ivec3_minadd)
+TEST_DECLARE(glm_ivec3_subsub)
+TEST_DECLARE(glm_ivec3_subsubs)
+TEST_DECLARE(glm_ivec3_addsub)
+TEST_DECLARE(glm_ivec3_addsubs)
+TEST_DECLARE(glm_ivec3_mulsub)
+TEST_DECLARE(glm_ivec3_mulsubs)
+TEST_DECLARE(glm_ivec3_maxsub)
+TEST_DECLARE(glm_ivec3_minsub)
 TEST_DECLARE(glm_ivec3_distance2)
 TEST_DECLARE(glm_ivec3_distance)
 TEST_DECLARE(glm_ivec3_fill)
@@ -958,6 +1006,22 @@ TEST_DECLARE(glmc_ivec3_sub)
 TEST_DECLARE(glmc_ivec3_subs)
 TEST_DECLARE(glmc_ivec3_mul)
 TEST_DECLARE(glmc_ivec3_scale)
+TEST_DECLARE(glmc_ivec3_addadd)
+TEST_DECLARE(glmc_ivec3_addadds)
+TEST_DECLARE(glmc_ivec3_subadd)
+TEST_DECLARE(glmc_ivec3_subadds)
+TEST_DECLARE(glmc_ivec3_muladd)
+TEST_DECLARE(glmc_ivec3_muladds)
+TEST_DECLARE(glmc_ivec3_maxadd)
+TEST_DECLARE(glmc_ivec3_minadd)
+TEST_DECLARE(glmc_ivec3_subsub)
+TEST_DECLARE(glmc_ivec3_subsubs)
+TEST_DECLARE(glmc_ivec3_addsub)
+TEST_DECLARE(glmc_ivec3_addsubs)
+TEST_DECLARE(glmc_ivec3_mulsub)
+TEST_DECLARE(glmc_ivec3_mulsubs)
+TEST_DECLARE(glmc_ivec3_maxsub)
+TEST_DECLARE(glmc_ivec3_minsub)
 TEST_DECLARE(glmc_ivec3_distance2)
 TEST_DECLARE(glmc_ivec3_distance)
 TEST_DECLARE(glmc_ivec3_fill)
@@ -978,6 +1042,22 @@ TEST_DECLARE(glm_ivec4_sub)
 TEST_DECLARE(glm_ivec4_subs)
 TEST_DECLARE(glm_ivec4_mul)
 TEST_DECLARE(glm_ivec4_scale)
+TEST_DECLARE(glm_ivec4_addadd)
+TEST_DECLARE(glm_ivec4_addadds)
+TEST_DECLARE(glm_ivec4_subadd)
+TEST_DECLARE(glm_ivec4_subadds)
+TEST_DECLARE(glm_ivec4_muladd)
+TEST_DECLARE(glm_ivec4_muladds)
+TEST_DECLARE(glm_ivec4_maxadd)
+TEST_DECLARE(glm_ivec4_minadd)
+TEST_DECLARE(glm_ivec4_subsub)
+TEST_DECLARE(glm_ivec4_subsubs)
+TEST_DECLARE(glm_ivec4_addsub)
+TEST_DECLARE(glm_ivec4_addsubs)
+TEST_DECLARE(glm_ivec4_mulsub)
+TEST_DECLARE(glm_ivec4_mulsubs)
+TEST_DECLARE(glm_ivec4_maxsub)
+TEST_DECLARE(glm_ivec4_minsub)
 TEST_DECLARE(glm_ivec4_distance2)
 TEST_DECLARE(glm_ivec4_distance)
 TEST_DECLARE(glm_ivec4_maxv)
@@ -995,6 +1075,22 @@ TEST_DECLARE(glmc_ivec4_sub)
 TEST_DECLARE(glmc_ivec4_subs)
 TEST_DECLARE(glmc_ivec4_mul)
 TEST_DECLARE(glmc_ivec4_scale)
+TEST_DECLARE(glmc_ivec4_addadd)
+TEST_DECLARE(glmc_ivec4_addadds)
+TEST_DECLARE(glmc_ivec4_subadd)
+TEST_DECLARE(glmc_ivec4_subadds)
+TEST_DECLARE(glmc_ivec4_muladd)
+TEST_DECLARE(glmc_ivec4_muladds)
+TEST_DECLARE(glmc_ivec4_maxadd)
+TEST_DECLARE(glmc_ivec4_minadd)
+TEST_DECLARE(glmc_ivec4_subsub)
+TEST_DECLARE(glmc_ivec4_subsubs)
+TEST_DECLARE(glmc_ivec4_addsub)
+TEST_DECLARE(glmc_ivec4_addsubs)
+TEST_DECLARE(glmc_ivec4_mulsub)
+TEST_DECLARE(glmc_ivec4_mulsubs)
+TEST_DECLARE(glmc_ivec4_maxsub)
+TEST_DECLARE(glmc_ivec4_minsub)
 TEST_DECLARE(glmc_ivec4_distance2)
 TEST_DECLARE(glmc_ivec4_distance)
 TEST_DECLARE(glmc_ivec4_maxv)
@@ -1909,6 +2005,22 @@ TEST_LIST {
   TEST_ENTRY(glm_ivec2_subs)
   TEST_ENTRY(glm_ivec2_mul)
   TEST_ENTRY(glm_ivec2_scale)
+  TEST_ENTRY(glm_ivec2_addadd)
+  TEST_ENTRY(glm_ivec2_addadds)
+  TEST_ENTRY(glm_ivec2_subadd)
+  TEST_ENTRY(glm_ivec2_subadds)
+  TEST_ENTRY(glm_ivec2_muladd)
+  TEST_ENTRY(glm_ivec2_muladds)
+  TEST_ENTRY(glm_ivec2_maxadd)
+  TEST_ENTRY(glm_ivec2_minadd)
+  TEST_ENTRY(glm_ivec2_subsub)
+  TEST_ENTRY(glm_ivec2_subsubs)
+  TEST_ENTRY(glm_ivec2_addsub)
+  TEST_ENTRY(glm_ivec2_addsubs)
+  TEST_ENTRY(glm_ivec2_mulsub)
+  TEST_ENTRY(glm_ivec2_mulsubs)
+  TEST_ENTRY(glm_ivec2_maxsub)
+  TEST_ENTRY(glm_ivec2_minsub)
   TEST_ENTRY(glm_ivec2_distance2)
   TEST_ENTRY(glm_ivec2_distance)
   TEST_ENTRY(glm_ivec2_fill)
@@ -1929,6 +2041,22 @@ TEST_LIST {
   TEST_ENTRY(glmc_ivec2_subs)
   TEST_ENTRY(glmc_ivec2_mul)
   TEST_ENTRY(glmc_ivec2_scale)
+  TEST_ENTRY(glmc_ivec2_addadd)
+  TEST_ENTRY(glmc_ivec2_addadds)
+  TEST_ENTRY(glmc_ivec2_subadd)
+  TEST_ENTRY(glmc_ivec2_subadds)
+  TEST_ENTRY(glmc_ivec2_muladd)
+  TEST_ENTRY(glmc_ivec2_muladds)
+  TEST_ENTRY(glmc_ivec2_maxadd)
+  TEST_ENTRY(glmc_ivec2_minadd)
+  TEST_ENTRY(glmc_ivec2_subsub)
+  TEST_ENTRY(glmc_ivec2_subsubs)
+  TEST_ENTRY(glmc_ivec2_addsub)
+  TEST_ENTRY(glmc_ivec2_addsubs)
+  TEST_ENTRY(glmc_ivec2_mulsub)
+  TEST_ENTRY(glmc_ivec2_mulsubs)
+  TEST_ENTRY(glmc_ivec2_maxsub)
+  TEST_ENTRY(glmc_ivec2_minsub)
   TEST_ENTRY(glmc_ivec2_distance2)
   TEST_ENTRY(glmc_ivec2_distance)
   TEST_ENTRY(glmc_ivec2_fill)
@@ -1950,6 +2078,22 @@ TEST_LIST {
   TEST_ENTRY(glm_ivec3_subs)
   TEST_ENTRY(glm_ivec3_mul)
   TEST_ENTRY(glm_ivec3_scale)
+  TEST_ENTRY(glm_ivec3_addadd)
+  TEST_ENTRY(glm_ivec3_addadds)
+  TEST_ENTRY(glm_ivec3_subadd)
+  TEST_ENTRY(glm_ivec3_subadds)
+  TEST_ENTRY(glm_ivec3_muladd)
+  TEST_ENTRY(glm_ivec3_muladds)
+  TEST_ENTRY(glm_ivec3_maxadd)
+  TEST_ENTRY(glm_ivec3_minadd)
+  TEST_ENTRY(glm_ivec3_subsub)
+  TEST_ENTRY(glm_ivec3_subsubs)
+  TEST_ENTRY(glm_ivec3_addsub)
+  TEST_ENTRY(glm_ivec3_addsubs)
+  TEST_ENTRY(glm_ivec3_mulsub)
+  TEST_ENTRY(glm_ivec3_mulsubs)
+  TEST_ENTRY(glm_ivec3_maxsub)
+  TEST_ENTRY(glm_ivec3_minsub)
   TEST_ENTRY(glm_ivec3_distance2)
   TEST_ENTRY(glm_ivec3_distance)
   TEST_ENTRY(glm_ivec3_fill)
@@ -1969,6 +2113,22 @@ TEST_LIST {
   TEST_ENTRY(glmc_ivec3_subs)
   TEST_ENTRY(glmc_ivec3_mul)
   TEST_ENTRY(glmc_ivec3_scale)
+  TEST_ENTRY(glmc_ivec3_addadd)
+  TEST_ENTRY(glmc_ivec3_addadds)
+  TEST_ENTRY(glmc_ivec3_subadd)
+  TEST_ENTRY(glmc_ivec3_subadds)
+  TEST_ENTRY(glmc_ivec3_muladd)
+  TEST_ENTRY(glmc_ivec3_muladds)
+  TEST_ENTRY(glmc_ivec3_maxadd)
+  TEST_ENTRY(glmc_ivec3_minadd)
+  TEST_ENTRY(glmc_ivec3_subsub)
+  TEST_ENTRY(glmc_ivec3_subsubs)
+  TEST_ENTRY(glmc_ivec3_addsub)
+  TEST_ENTRY(glmc_ivec3_addsubs)
+  TEST_ENTRY(glmc_ivec3_mulsub)
+  TEST_ENTRY(glmc_ivec3_mulsubs)
+  TEST_ENTRY(glmc_ivec3_maxsub)
+  TEST_ENTRY(glmc_ivec3_minsub)
   TEST_ENTRY(glmc_ivec3_distance2)
   TEST_ENTRY(glmc_ivec3_distance)
   TEST_ENTRY(glmc_ivec3_fill)
@@ -1989,6 +2149,22 @@ TEST_LIST {
   TEST_ENTRY(glm_ivec4_subs)
   TEST_ENTRY(glm_ivec4_mul)
   TEST_ENTRY(glm_ivec4_scale)
+  TEST_ENTRY(glm_ivec4_addadd)
+  TEST_ENTRY(glm_ivec4_addadds)
+  TEST_ENTRY(glm_ivec4_subadd)
+  TEST_ENTRY(glm_ivec4_subadds)
+  TEST_ENTRY(glm_ivec4_muladd)
+  TEST_ENTRY(glm_ivec4_muladds)
+  TEST_ENTRY(glm_ivec4_maxadd)
+  TEST_ENTRY(glm_ivec4_minadd)
+  TEST_ENTRY(glm_ivec4_subsub)
+  TEST_ENTRY(glm_ivec4_subsubs)
+  TEST_ENTRY(glm_ivec4_addsub)
+  TEST_ENTRY(glm_ivec4_addsubs)
+  TEST_ENTRY(glm_ivec4_mulsub)
+  TEST_ENTRY(glm_ivec4_mulsubs)
+  TEST_ENTRY(glm_ivec4_maxsub)
+  TEST_ENTRY(glm_ivec4_minsub)
   TEST_ENTRY(glm_ivec4_distance2)
   TEST_ENTRY(glm_ivec4_distance)
   TEST_ENTRY(glm_ivec4_maxv)
@@ -2005,6 +2181,22 @@ TEST_LIST {
   TEST_ENTRY(glmc_ivec4_subs)
   TEST_ENTRY(glmc_ivec4_mul)
   TEST_ENTRY(glmc_ivec4_scale)
+  TEST_ENTRY(glmc_ivec4_addadd)
+  TEST_ENTRY(glmc_ivec4_addadds)
+  TEST_ENTRY(glmc_ivec4_subadd)
+  TEST_ENTRY(glmc_ivec4_subadds)
+  TEST_ENTRY(glmc_ivec4_muladd)
+  TEST_ENTRY(glmc_ivec4_muladds)
+  TEST_ENTRY(glmc_ivec4_maxadd)
+  TEST_ENTRY(glmc_ivec4_minadd)
+  TEST_ENTRY(glmc_ivec4_subsub)
+  TEST_ENTRY(glmc_ivec4_subsubs)
+  TEST_ENTRY(glmc_ivec4_addsub)
+  TEST_ENTRY(glmc_ivec4_addsubs)
+  TEST_ENTRY(glmc_ivec4_mulsub)
+  TEST_ENTRY(glmc_ivec4_mulsubs)
+  TEST_ENTRY(glmc_ivec4_maxsub)
+  TEST_ENTRY(glmc_ivec4_minsub)
   TEST_ENTRY(glmc_ivec4_distance2)
   TEST_ENTRY(glmc_ivec4_distance)
   TEST_ENTRY(glmc_ivec4_maxv)