Update RS prebuilts.

Change-Id: I52e1ee57ab066395470d535d9429b2838cef14f2

24 files changed, 95 insertions, 216 deletions

diff --git a/renderscript/include/rs_core_math.rsh b/renderscript/include/rs_core_math.rsh
index 848740d..2b7c362 100644
--- a/renderscript/include/rs_core_math.rsh
+++ b/renderscript/include/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
 
diff --git a/renderscript/include/rs_dct.rsh b/renderscript/include/rs_dct.rsh
new file mode 100644
index 0000000..d7289dd
--- /dev/null
+++ b/renderscript/include/rs_dct.rsh
@@ -0,0 +1,14 @@
+#ifndef __RS_DCT_RSH__
+#define __RS_DCT_RSH__
+
+#if RS_VERSION > 19
+
+extern void rsDct4x4(rs_allocation input, rs_allocation output, int xoff, int yoff);
+extern void rsDct8x8(rs_allocation input, rs_allocation output, int xoff, int yoff);
+extern void rsDct16x16(rs_allocation input, rs_allocation output, int xoff, int yoff);
+extern void rsDct32x32(rs_allocation input, rs_allocation out, int xoff, int yoff);
+extern void rsDct32x32_rd(rs_allocation input, rs_allocation out,  int xoff, int yoff);
+
+#endif
+
+#endif
diff --git a/renderscript/include/rs_fadst.rsh b/renderscript/include/rs_fadst.rsh
new file mode 100644
index 0000000..1dfe58f
--- /dev/null
+++ b/renderscript/include/rs_fadst.rsh
@@ -0,0 +1,14 @@
+#ifndef __RS_FADST_RSH__
+#define __RS_FADST_RSH__
+
+#if RS_VERSION > 19
+
+extern void rsFadst4(const rs_allocation input, rs_allocation output, int32_t xoff);
+
+extern void rsFadst8(const rs_allocation input, rs_allocation output, int32_t xoff);
+
+extern void rsFadst16(const rs_allocation input, rs_allocation output, int32_t xoff);
+
+#endif
+
+#endif
\ No newline at end of file
diff --git a/renderscript/include/rs_iadst.rsh b/renderscript/include/rs_iadst.rsh
new file mode 100644
index 0000000..3208814
--- /dev/null
+++ b/renderscript/include/rs_iadst.rsh
@@ -0,0 +1,14 @@
+#ifndef __RS_IADST_RSH__
+#define __RS_IADST_RSH__
+
+#if RS_VERSION > 19
+
+extern void rsIadst4(const rs_allocation input, rs_allocation output, int32_t xoff);
+
+extern void rsIadst8(const rs_allocation input, rs_allocation output, int32_t xoff);
+
+extern void rsIadst16(const rs_allocation input, rs_allocation output, int32_t xoff);
+
+#endif
+
+#endif
\ No newline at end of file
diff --git a/renderscript/include/rs_idct.rsh b/renderscript/include/rs_idct.rsh
new file mode 100644
index 0000000..d602e34
--- /dev/null
+++ b/renderscript/include/rs_idct.rsh
@@ -0,0 +1,13 @@
+#ifndef __RS_IDCT_RSH__
+#define __RS_IDCT_RSH__
+
+#if RS_VERSION > 19
+
+extern void rsIdct4x4(const rs_allocation input, rs_allocation dest, int eob, int xoff, int yoff);
+extern void rsIdct8x8(const rs_allocation input, rs_allocation dest, int eob, int xoff, int yoff);
+extern void rsIdct16x16(const rs_allocation input, rs_allocation dest, int eob, int xoff, int yoff);
+extern void rsIdct32x32(const rs_allocation input, rs_allocation dest, int eob, int xoff, int yoff);
+
+#endif
+
+#endif
diff --git a/renderscript/include/rs_vp9.rsh b/renderscript/include/rs_vp9.rsh
new file mode 100644
index 0000000..52fbe81
--- /dev/null
+++ b/renderscript/include/rs_vp9.rsh
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#ifndef __RS_VP9_RSH__
+#define __RS_VP9_RSH__
+
+
+#include "rs_idct.rsh"
+#include "rs_dct.rsh"
+#include "rs_iadst.rsh"
+#include "rs_fadst.rsh"
+#include "rs_walsh.rsh"
+
+#endif
+
diff --git a/renderscript/include/rs_walsh.rsh b/renderscript/include/rs_walsh.rsh
new file mode 100644
index 0000000..6f7445d
--- /dev/null
+++ b/renderscript/include/rs_walsh.rsh
@@ -0,0 +1,11 @@
+#ifndef __RS_WALSH_RSH__
+#define __RS_WALSH_RSH__
+
+#if RS_VERSION > 19
+
+extern void rsWalsh4x4(rs_allocation input, rs_allocation dest, int xoff, int yoff);
+extern void rsWalsh4x4_1(rs_allocation input, rs_allocation dest, int xoff, int yoff);
+
+#endif
+
+#endif
diff --git a/renderscript/lib/arm/libc.so b/renderscript/lib/arm/libc.so
index 1fc0c15..f9cf757 100755
--- a/renderscript/lib/arm/libc.so
+++ b/renderscript/lib/arm/libc.so
diff --git a/renderscript/lib/arm/libclcore.bc b/renderscript/lib/arm/libclcore.bc
index c1783f1..78b374f 100644
--- a/renderscript/lib/arm/libclcore.bc
+++ b/renderscript/lib/arm/libclcore.bc
diff --git a/renderscript/lib/arm/libm.so b/renderscript/lib/arm/libm.so
index 8e67b9e..8dff5b7 100755
--- a/renderscript/lib/arm/libm.so
+++ b/renderscript/lib/arm/libm.so
diff --git a/renderscript/lib/arm/librsjni.so b/renderscript/lib/arm/librsjni.so
index 15b4c3e..550867e 100755
--- a/renderscript/lib/arm/librsjni.so
+++ b/renderscript/lib/arm/librsjni.so
diff --git a/renderscript/lib/arm/librsrt_arm.bc b/renderscript/lib/arm/librsrt_arm.bc
index c1783f1..78b374f 100644
--- a/renderscript/lib/arm/librsrt_arm.bc
+++ b/renderscript/lib/arm/librsrt_arm.bc
diff --git a/renderscript/lib/javalib.jar b/renderscript/lib/javalib.jar
index b701440..9e2e3ee 100644
--- a/renderscript/lib/javalib.jar
+++ b/renderscript/lib/javalib.jar
diff --git a/renderscript/lib/mips/libc.so b/renderscript/lib/mips/libc.so
index 694f172..4f5a5c7 100755
--- a/renderscript/lib/mips/libc.so
+++ b/renderscript/lib/mips/libc.so
diff --git a/renderscript/lib/mips/libclcore.bc b/renderscript/lib/mips/libclcore.bc
index 17d24fe..2de535d 100644
--- a/renderscript/lib/mips/libclcore.bc
+++ b/renderscript/lib/mips/libclcore.bc
diff --git a/renderscript/lib/mips/libm.so b/renderscript/lib/mips/libm.so
index 7fb338f..6d7817b 100755
--- a/renderscript/lib/mips/libm.so
+++ b/renderscript/lib/mips/libm.so
diff --git a/renderscript/lib/mips/librsjni.so b/renderscript/lib/mips/librsjni.so
index 5d4145f..34c3c74 100755
--- a/renderscript/lib/mips/librsjni.so
+++ b/renderscript/lib/mips/librsjni.so
diff --git a/renderscript/lib/mips/librsrt_mips.bc b/renderscript/lib/mips/librsrt_mips.bc
index 17d24fe..2de535d 100644
--- a/renderscript/lib/mips/librsrt_mips.bc
+++ b/renderscript/lib/mips/librsrt_mips.bc
diff --git a/renderscript/lib/x86/libRSSupport.so b/renderscript/lib/x86/libRSSupport.so
index 6fd217e..c7f7208 100755
--- a/renderscript/lib/x86/libRSSupport.so
+++ b/renderscript/lib/x86/libRSSupport.so
diff --git a/renderscript/lib/x86/libc.so b/renderscript/lib/x86/libc.so
index e5d0eea..0446b62 100755
--- a/renderscript/lib/x86/libc.so
+++ b/renderscript/lib/x86/libc.so
diff --git a/renderscript/lib/x86/libclcore.bc b/renderscript/lib/x86/libclcore.bc
index d854c6e..5ec7550 100644
--- a/renderscript/lib/x86/libclcore.bc
+++ b/renderscript/lib/x86/libclcore.bc
diff --git a/renderscript/lib/x86/libm.so b/renderscript/lib/x86/libm.so
index ae004eb..01c1f2f 100755
--- a/renderscript/lib/x86/libm.so
+++ b/renderscript/lib/x86/libm.so
diff --git a/renderscript/lib/x86/librsjni.so b/renderscript/lib/x86/librsjni.so
index 4811968..17911e8 100755
--- a/renderscript/lib/x86/librsjni.so
+++ b/renderscript/lib/x86/librsjni.so
diff --git a/renderscript/lib/x86/librsrt_x86.bc b/renderscript/lib/x86/librsrt_x86.bc
index e0d505f..0315c4b 100644
--- a/renderscript/lib/x86/librsrt_x86.bc
+++ b/renderscript/lib/x86/librsrt_x86.bc