merge in mnc-release history after reset to mnc-dev
diff --git a/api/rs_math.spec b/api/rs_math.spec
index 6e7daf6..bf4d9c0 100644
--- a/api/rs_math.spec
+++ b/api/rs_math.spec
@@ -989,6 +989,16 @@
end:
function: max
+version: 9
+attrib: const
+w: 2, 3, 4
+t: f32
+ret: #2#1
+arg: #2#1 a
+arg: #2 b
+end:
+
+function: max
version: 9 20
attrib: const
w: 1
@@ -1072,6 +1082,16 @@
end:
function: min
+version: 9
+attrib: const
+w: 2, 3, 4
+t: f32
+ret: #2#1
+arg: #2#1 a
+arg: #2 b
+end:
+
+function: min
version: 9 20
attrib: const
w: 1
diff --git a/scriptc/rs_math.rsh b/scriptc/rs_math.rsh
index 9125854..9b39680 100644
--- a/scriptc/rs_math.rsh
+++ b/scriptc/rs_math.rsh
@@ -1630,6 +1630,15 @@
extern float4 __attribute__((const, overloadable))
max(float4 a, float4 b);
+extern float2 __attribute__((const, overloadable))
+ max(float2 a, float b);
+
+extern float3 __attribute__((const, overloadable))
+ max(float3 a, float b);
+
+extern float4 __attribute__((const, overloadable))
+ max(float4 a, float b);
+
#if !defined(RS_VERSION) || (RS_VERSION <= 20)
static inline char __attribute__((const, overloadable))
max(char a, char b) {
@@ -2047,6 +2056,15 @@
extern float4 __attribute__((const, overloadable))
min(float4 a, float4 b);
+extern float2 __attribute__((const, overloadable))
+ min(float2 a, float b);
+
+extern float3 __attribute__((const, overloadable))
+ min(float3 a, float b);
+
+extern float4 __attribute__((const, overloadable))
+ min(float4 a, float b);
+
#if !defined(RS_VERSION) || (RS_VERSION <= 20)
static inline char __attribute__((const, overloadable))
min(char a, char b) {
