commit | aa07a49dd7ba8ef7288dfec2bfeb4f85eb940c88 | [log] [tgz] |
---|---|---|
author | The Android Automerger <android-build@android.com> | Mon Apr 29 05:56:18 2013 -0700 |
committer | The Android Automerger <android-build@android.com> | Mon Apr 29 05:56:18 2013 -0700 |
tree | ecc5299d86ca259ec778ac7eab3b197484d7fdbc | |
parent | aff0e8c6fddeb9d61fc2733013da0edfcec0faef [diff] | |
parent | 77b5fbce16e78daa422c980164354bb44a4d2c0b [diff] |
merge in jb-mr2-release history after reset to jb-mr2-dev
diff --git a/renderscript/include/rs_allocation.rsh b/renderscript/include/rs_allocation.rsh index cefd09f..0f5e79d 100644 --- a/renderscript/include/rs_allocation.rsh +++ b/renderscript/include/rs_allocation.rsh
@@ -350,6 +350,28 @@ #undef SET_ELEMENT_AT +/** + * Extract a single element from an allocation. + */ +extern const uchar __attribute__((overloadable)) + rsGetElementAtYuv_uchar_Y(rs_allocation a, uint32_t x, uint32_t y); + +/** + * Extract a single element from an allocation. + * + * Coordinates are in the dimensions of the Y plane + */ +extern const uchar __attribute__((overloadable)) + rsGetElementAtYuv_uchar_U(rs_allocation a, uint32_t x, uint32_t y); + +/** + * Extract a single element from an allocation. + * + * Coordinates are in the dimensions of the Y plane + */ +extern const uchar __attribute__((overloadable)) + rsGetElementAtYuv_uchar_V(rs_allocation a, uint32_t x, uint32_t y); + #endif // (defined(RS_VERSION) && (RS_VERSION >= 18)) #endif
diff --git a/renderscript/lib/arm/libRSSupport.so b/renderscript/lib/arm/libRSSupport.so index e94d103..a215af0 100755 --- a/renderscript/lib/arm/libRSSupport.so +++ b/renderscript/lib/arm/libRSSupport.so Binary files differ
diff --git a/renderscript/lib/arm/libclcore.bc b/renderscript/lib/arm/libclcore.bc index 5b2e319..18f1035 100644 --- a/renderscript/lib/arm/libclcore.bc +++ b/renderscript/lib/arm/libclcore.bc Binary files differ
diff --git a/renderscript/lib/arm/librsjni.so b/renderscript/lib/arm/librsjni.so index d3aa1c0..eaea88e 100755 --- a/renderscript/lib/arm/librsjni.so +++ b/renderscript/lib/arm/librsjni.so Binary files differ
diff --git a/renderscript/lib/javalib.jar b/renderscript/lib/javalib.jar index 47b688e..a834e4a 100644 --- a/renderscript/lib/javalib.jar +++ b/renderscript/lib/javalib.jar Binary files differ
diff --git a/renderscript/lib/mips/libRSSupport.so b/renderscript/lib/mips/libRSSupport.so index 3f383e0..adcd925 100755 --- a/renderscript/lib/mips/libRSSupport.so +++ b/renderscript/lib/mips/libRSSupport.so Binary files differ
diff --git a/renderscript/lib/mips/libclcore.bc b/renderscript/lib/mips/libclcore.bc index 5b2e319..18f1035 100644 --- a/renderscript/lib/mips/libclcore.bc +++ b/renderscript/lib/mips/libclcore.bc Binary files differ
diff --git a/renderscript/lib/mips/librsjni.so b/renderscript/lib/mips/librsjni.so index 2527014..c9563ee 100755 --- a/renderscript/lib/mips/librsjni.so +++ b/renderscript/lib/mips/librsjni.so Binary files differ
diff --git a/renderscript/lib/x86/libRSSupport.so b/renderscript/lib/x86/libRSSupport.so index f084354..55dd4c0 100755 --- a/renderscript/lib/x86/libRSSupport.so +++ b/renderscript/lib/x86/libRSSupport.so Binary files differ
diff --git a/renderscript/lib/x86/libclcore.bc b/renderscript/lib/x86/libclcore.bc index 5b2e319..18f1035 100644 --- a/renderscript/lib/x86/libclcore.bc +++ b/renderscript/lib/x86/libclcore.bc Binary files differ
diff --git a/renderscript/lib/x86/librsjni.so b/renderscript/lib/x86/librsjni.so index bc0e9c2..443d619 100755 --- a/renderscript/lib/x86/librsjni.so +++ b/renderscript/lib/x86/librsjni.so Binary files differ
diff --git a/tools/linux/bcc_compat b/tools/linux/bcc_compat index bdb454d..3a02e98 100755 --- a/tools/linux/bcc_compat +++ b/tools/linux/bcc_compat Binary files differ
diff --git a/tools/linux/libLLVM.so b/tools/linux/libLLVM.so index 127f8c0..e60341e 100755 --- a/tools/linux/libLLVM.so +++ b/tools/linux/libLLVM.so Binary files differ
diff --git a/tools/linux/libbcc.so b/tools/linux/libbcc.so index e46802a..2fa9d71 100755 --- a/tools/linux/libbcc.so +++ b/tools/linux/libbcc.so Binary files differ
diff --git a/tools/linux/libbcinfo.so b/tools/linux/libbcinfo.so index cbf31c9..0975c5e 100755 --- a/tools/linux/libbcinfo.so +++ b/tools/linux/libbcinfo.so Binary files differ
diff --git a/tools/linux/llvm-rs-cc b/tools/linux/llvm-rs-cc index 24c09c5..59558df 100755 --- a/tools/linux/llvm-rs-cc +++ b/tools/linux/llvm-rs-cc Binary files differ