aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2018-01-16 09:39:28 -0800
committerChris Robinson <[email protected]>2018-01-16 09:39:28 -0800
commit5deb1df8dbc4c9484cdd424aa2f9a1e964937834 (patch)
treeda1674af391ff7d52f9327f7748fcb77b8c39bd2
parent14a0df03e859882c421d4069fe41c72322466602 (diff)
Add min/max/clamp functions for size_t
-rw-r--r--Alc/ALu.c4
-rw-r--r--OpenAL32/Include/alu.h7
2 files changed, 11 insertions, 0 deletions
diff --git a/Alc/ALu.c b/Alc/ALu.c
index 04227ce4..909c689a 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -71,6 +71,10 @@ extern inline ALuint64 minu64(ALuint64 a, ALuint64 b);
extern inline ALuint64 maxu64(ALuint64 a, ALuint64 b);
extern inline ALuint64 clampu64(ALuint64 val, ALuint64 min, ALuint64 max);
+extern inline size_t minz(size_t a, size_t b);
+extern inline size_t maxz(size_t a, size_t b);
+extern inline size_t clampz(size_t val, size_t min, size_t max);
+
extern inline ALfloat lerp(ALfloat val1, ALfloat val2, ALfloat mu);
extern inline ALfloat cubic(ALfloat val1, ALfloat val2, ALfloat val3, ALfloat val4, ALfloat mu);
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index e450d68e..a6e0efa8 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -385,6 +385,13 @@ inline ALuint64 maxu64(ALuint64 a, ALuint64 b)
inline ALuint64 clampu64(ALuint64 val, ALuint64 min, ALuint64 max)
{ return minu64(max, maxu64(min, val)); }
+inline size_t minz(size_t a, size_t b)
+{ return ((a > b) ? b : a); }
+inline size_t maxz(size_t a, size_t b)
+{ return ((a > b) ? a : b); }
+inline size_t clampz(size_t val, size_t min, size_t max)
+{ return minz(max, maxz(min, val)); }
+
inline ALfloat lerp(ALfloat val1, ALfloat val2, ALfloat mu)
{