Fix overlap between scalar and vector usage of functions.

Also cleanup for ilogb incorrect definitions (probably
cut & paste errors). Regenerated the rs_core_math.rsh file.

Change-Id: I4ab06bca109bedc9fecb8f14ca3e3f544dd85d52

1 files changed, 0 insertions, 216 deletions

diff --git a/scriptc/rs_core_math.rsh b/scriptc/rs_core_math.rsh
index 848740d4..2b7c362e 100644
--- a/scriptc/rs_core_math.rsh
+++ b/scriptc/rs_core_math.rsh
@@ -3730,15 +3730,6 @@ extern float4 __attribute__((const, overloadable))fmax(float4 x, float4 y);
  *
  * Supported by API versions 9 and newer.
  */
-extern float __attribute__((const, overloadable))fmax(float x, float y);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 9))
-/*
- * Return (x < y ? y : x)
- *
- * Supported by API versions 9 and newer.
- */
 extern float2 __attribute__((const, overloadable))fmax(float2 x, float y);
 #endif
 
@@ -3802,15 +3793,6 @@ extern float4 __attribute__((const, overloadable))fmin(float4 x, float4 y);
  *
  * Supported by API versions 9 and newer.
  */
-extern float __attribute__((const, overloadable))fmin(float x, float y);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 9))
-/*
- * Return (x > y ? y : x)
- *
- * Supported by API versions 9 and newer.
- */
 extern float2 __attribute__((const, overloadable))fmin(float2 x, float y);
 #endif
 
@@ -4080,78 +4062,6 @@ extern int4 __attribute__((const, overloadable))ilogb(float4);
 /*
  * Return (x * 2^y)
  *
- * Supported by API versions 9 and newer.
- */
-extern float __attribute__((const, overloadable))ilogb(float, int);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 9))
-/*
- * Return (x * 2^y)
- *
- * Supported by API versions 9 and newer.
- */
-extern float2 __attribute__((const, overloadable))ilogb(float2, int2);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 9))
-/*
- * Return (x * 2^y)
- *
- * Supported by API versions 9 and newer.
- */
-extern float3 __attribute__((const, overloadable))ilogb(float3, int3);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 9))
-/*
- * Return (x * 2^y)
- *
- * Supported by API versions 9 and newer.
- */
-extern float4 __attribute__((const, overloadable))ilogb(float4, int4);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 9))
-/*
- * Return (x * 2^y)
- *
- * Supported by API versions 9 and newer.
- */
-extern float __attribute__((const, overloadable))ilogb(float, int);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 9))
-/*
- * Return (x * 2^y)
- *
- * Supported by API versions 9 and newer.
- */
-extern float2 __attribute__((const, overloadable))ilogb(float2, int);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 9))
-/*
- * Return (x * 2^y)
- *
- * Supported by API versions 9 and newer.
- */
-extern float3 __attribute__((const, overloadable))ilogb(float3, int);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 9))
-/*
- * Return (x * 2^y)
- *
- * Supported by API versions 9 and newer.
- */
-extern float4 __attribute__((const, overloadable))ilogb(float4, int);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 9))
-/*
- * Return (x * 2^y)
- *
  * @param x Supports 1,2,3,4 components
  * @param y Supports single component or matching vector.
  *
@@ -7027,19 +6937,6 @@ extern float4 __attribute__((const, overloadable))clamp(float4 value, float4 min
  *
  * Supported by API versions 9 and newer.
  */
-extern float __attribute__((const, overloadable))clamp(float value, float min_value, float max_value);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 9))
-/*
- * Clamp a value to a specified high and low bound.
- *
- * @param amount value to be clamped.  Supports 1,2,3,4 components
- * @param min_value Lower bound, must be scalar or matching vector.
- * @param max_value High bound, must match type of low
- *
- * Supported by API versions 9 and newer.
- */
 extern float2 __attribute__((const, overloadable))clamp(float2 value, float min_value, float max_value);
 #endif
 
@@ -7495,19 +7392,6 @@ extern ulong4 __attribute__((const, overloadable))clamp(ulong4 value, ulong4 min
  *
  * Supported by API versions 19 and newer.
  */
-extern char __attribute__((const, overloadable))clamp(char value, char min_value, char max_value);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 19))
-/*
- * Clamp a value to a specified high and low bound.
- *
- * @param amount value to be clamped.  Supports 1,2,3,4 components
- * @param min_value Lower bound, must be scalar or matching vector.
- * @param max_value High bound, must match type of low
- *
- * Supported by API versions 19 and newer.
- */
 extern char2 __attribute__((const, overloadable))clamp(char2 value, char min_value, char max_value);
 #endif
 
@@ -7547,19 +7431,6 @@ extern char4 __attribute__((const, overloadable))clamp(char4 value, char min_val
  *
  * Supported by API versions 19 and newer.
  */
-extern uchar __attribute__((const, overloadable))clamp(uchar value, uchar min_value, uchar max_value);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 19))
-/*
- * Clamp a value to a specified high and low bound.
- *
- * @param amount value to be clamped.  Supports 1,2,3,4 components
- * @param min_value Lower bound, must be scalar or matching vector.
- * @param max_value High bound, must match type of low
- *
- * Supported by API versions 19 and newer.
- */
 extern uchar2 __attribute__((const, overloadable))clamp(uchar2 value, uchar min_value, uchar max_value);
 #endif
 
@@ -7599,19 +7470,6 @@ extern uchar4 __attribute__((const, overloadable))clamp(uchar4 value, uchar min_
  *
  * Supported by API versions 19 and newer.
  */
-extern short __attribute__((const, overloadable))clamp(short value, short min_value, short max_value);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 19))
-/*
- * Clamp a value to a specified high and low bound.
- *
- * @param amount value to be clamped.  Supports 1,2,3,4 components
- * @param min_value Lower bound, must be scalar or matching vector.
- * @param max_value High bound, must match type of low
- *
- * Supported by API versions 19 and newer.
- */
 extern short2 __attribute__((const, overloadable))clamp(short2 value, short min_value, short max_value);
 #endif
 
@@ -7651,19 +7509,6 @@ extern short4 __attribute__((const, overloadable))clamp(short4 value, short min_
  *
  * Supported by API versions 19 and newer.
  */
-extern ushort __attribute__((const, overloadable))clamp(ushort value, ushort min_value, ushort max_value);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 19))
-/*
- * Clamp a value to a specified high and low bound.
- *
- * @param amount value to be clamped.  Supports 1,2,3,4 components
- * @param min_value Lower bound, must be scalar or matching vector.
- * @param max_value High bound, must match type of low
- *
- * Supported by API versions 19 and newer.
- */
 extern ushort2 __attribute__((const, overloadable))clamp(ushort2 value, ushort min_value, ushort max_value);
 #endif
 
@@ -7703,19 +7548,6 @@ extern ushort4 __attribute__((const, overloadable))clamp(ushort4 value, ushort m
  *
  * Supported by API versions 19 and newer.
  */
-extern int __attribute__((const, overloadable))clamp(int value, int min_value, int max_value);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 19))
-/*
- * Clamp a value to a specified high and low bound.
- *
- * @param amount value to be clamped.  Supports 1,2,3,4 components
- * @param min_value Lower bound, must be scalar or matching vector.
- * @param max_value High bound, must match type of low
- *
- * Supported by API versions 19 and newer.
- */
 extern int2 __attribute__((const, overloadable))clamp(int2 value, int min_value, int max_value);
 #endif
 
@@ -7755,19 +7587,6 @@ extern int4 __attribute__((const, overloadable))clamp(int4 value, int min_value,
  *
  * Supported by API versions 19 and newer.
  */
-extern uint __attribute__((const, overloadable))clamp(uint value, uint min_value, uint max_value);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 19))
-/*
- * Clamp a value to a specified high and low bound.
- *
- * @param amount value to be clamped.  Supports 1,2,3,4 components
- * @param min_value Lower bound, must be scalar or matching vector.
- * @param max_value High bound, must match type of low
- *
- * Supported by API versions 19 and newer.
- */
 extern uint2 __attribute__((const, overloadable))clamp(uint2 value, uint min_value, uint max_value);
 #endif
 
@@ -7807,19 +7626,6 @@ extern uint4 __attribute__((const, overloadable))clamp(uint4 value, uint min_val
  *
  * Supported by API versions 19 and newer.
  */
-extern long __attribute__((const, overloadable))clamp(long value, long min_value, long max_value);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 19))
-/*
- * Clamp a value to a specified high and low bound.
- *
- * @param amount value to be clamped.  Supports 1,2,3,4 components
- * @param min_value Lower bound, must be scalar or matching vector.
- * @param max_value High bound, must match type of low
- *
- * Supported by API versions 19 and newer.
- */
 extern long2 __attribute__((const, overloadable))clamp(long2 value, long min_value, long max_value);
 #endif
 
@@ -7859,19 +7665,6 @@ extern long4 __attribute__((const, overloadable))clamp(long4 value, long min_val
  *
  * Supported by API versions 19 and newer.
  */
-extern ulong __attribute__((const, overloadable))clamp(ulong value, ulong min_value, ulong max_value);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 19))
-/*
- * Clamp a value to a specified high and low bound.
- *
- * @param amount value to be clamped.  Supports 1,2,3,4 components
- * @param min_value Lower bound, must be scalar or matching vector.
- * @param max_value High bound, must match type of low
- *
- * Supported by API versions 19 and newer.
- */
 extern ulong2 __attribute__((const, overloadable))clamp(ulong2 value, ulong min_value, ulong max_value);
 #endif
 
@@ -7979,15 +7772,6 @@ extern float4 __attribute__((const, overloadable))mix(float4 start, float4 stop,
  *
  * Supported by API versions 9 and newer.
  */
-extern float __attribute__((const, overloadable))mix(float start, float stop, float amount);
-#endif
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 9))
-/*
- * return start + ((stop - start) * amount)
- *
- * Supported by API versions 9 and newer.
- */
 extern float2 __attribute__((const, overloadable))mix(float2 start, float2 stop, float amount);
 #endif