summaryrefslogtreecommitdiffstats
path: root/rs
Commit message (Collapse)AuthorAgeFilesLines
* am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-1/+0
|\ | | | | | | | | * commit 'db55bb0622e9fbe4b858d59409f516de01c1f1fd': Remove unused LOCAL_LDLIBS.
| * am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-1/+0
| |\ | | | | | | | | | | | | * commit '3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3': Remove unused LOCAL_LDLIBS.
| | * Remove unused LOCAL_LDLIBS.Ying Wang2014-05-071-1/+0
| | | | | | | | | | | | Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
* | | Add flags to context creation for RSJason Sams2014-05-071-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | We have a number of context options exposed though native that were not available though the Java API. This brings them to parity. Will finish plumbing in a follow on CL. Change-Id: I8c65ee743d0e750e418304127b84088f25176c38
* | | am fc45b664: am f0aa4cc0: am a4898534: Merge "Fix improper use of JNI_ABORT ↵Stephen Hines2014-04-171-14/+30
|\ \ \ | |/ / | | | | | | | | | | | | | | | for operations where Java objects are written." * commit 'fc45b664d421553042629d24086a144761c7b5e1': Fix improper use of JNI_ABORT for operations where Java objects are written.
| * | am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java ↵Stephen Hines2014-04-171-14/+30
| |\ \ | | |/ | | | | | | | | | | | | | | | objects are written." * commit 'a48985349cb26757b6c4be18acc496ab6d1110e5': Fix improper use of JNI_ABORT for operations where Java objects are written.
| | * Merge "Fix improper use of JNI_ABORT for operations where Java objects are ↵Stephen Hines2014-04-171-14/+30
| | |\ | | | | | | | | | | | | written."
| | | * Fix improper use of JNI_ABORT for operations where Java objects are written.Stephen Hines2014-04-171-14/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In these RS API calls, it is possible (and very likely) that some Java objects are written to via JNI calls into the RS driver. These writes can end up being discarded if we specify JNI_ABORT, particularly if the Java object has been moved due to GC. The change introduces a readonly mode for some macro calls and updates other JNI callers to appropriately skip JNI_ABORT. Change-Id: I8c5f2ae959b3fbc9008c9d2ac4542f2ebab29b06
* | | | Unhide RenderScript resize intrinsicJason Sams2014-04-171-1/+0
| | | | | | | | | | | | | | | | Change-Id: I450c83ad00bcb7d999aaf7d4bd7ea88d63ab8fea
* | | | am 5170476c: am a4af5726: am 112d1b94: Merge "Add BiCubic resize instrinsic"Jason Sams2014-04-171-0/+113
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '5170476c5bf470b57616380aa7b15b44e5a24bea': Add BiCubic resize instrinsic
| * | | am 112d1b94: Merge "Add BiCubic resize instrinsic"Jason Sams2014-04-171-0/+113
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '112d1b94ee8456dba16842e6b964eb35aef95818': Add BiCubic resize instrinsic
| | * | Add BiCubic resize instrinsicJason Sams2014-04-161-0/+113
| | |/ | | | | | | | | | Change-Id: Iafec3f4260bb5d3a3133b034e42dfb0a94ae9f81
* | | am c796ccaa: am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL ↵Jason Sams2014-04-011-1/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | setSurfaceTexture problem" * commit 'c796ccaafb935592b98d5aaad2594791935f6530': Fix RenderScriptGL setSurfaceTexture problem
| * | am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"Jason Sams2014-04-011-1/+5
| |\ \ | | |/ | | | | | | | | | * commit 'b3cafa56205942343930e4fbb0a3d50d6e33a046': Fix RenderScriptGL setSurfaceTexture problem
| | * Fix RenderScriptGL setSurfaceTexture problemXiaofei Wan2014-03-311-1/+5
| | | | | | | | | | | | | | | | | | | | | rsnContextSetSurfaceTexture() has no implementation in rs-jni, use nContextSetSurface() in setSurfaceTexture(). Change-Id: I066432575c9e74f21ea3a3776628b572b6e31377 Signed-off-by: Xiaofei Wan <xiaofei.wan@intel.com>
* | | am 4f346bf0: am ff1e1d99: am 240d5638: am c1f3d4c1: Merge "Fix 64 bit ↵Glenn Kasten2014-03-192-22/+22
|\ \ \ | |/ / | | | | | | | | | | | | | | | compile failures in renderscript" * commit '4f346bf0ffe1c596ca261dfec23c50977de77d82': Fix 64 bit compile failures in renderscript
| * | am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript"Glenn Kasten2014-03-192-22/+22
| |\ \ | | |/ | | | | | | | | | * commit 'c1f3d4c1ba7903d1b72c2341b5284da12b79ee46': Fix 64 bit compile failures in renderscript
| | * Fix 64 bit compile failures in renderscriptNarayan Kamath2014-03-192-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use uintptr_t for pointers (and not uint32_t) and also don't assume that size_t is 32 bits wide. Also uses java longs for passing pointers across JNI boundaries. Change-Id: Ie52bd8ae967fbddc911eda3a43cc799d53bbce66
* | | am edf0b79d: am 24ea88a9: am 9a9916b5: am 2383f220: Merge "Validate objects ↵Jason Sams2014-03-062-0/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | are from the correct context." * commit 'edf0b79d55df17fddb6b96de32f34ffccc8ec2d4': Validate objects are from the correct context.
| * | am 2383f220: Merge "Validate objects are from the correct context."Jason Sams2014-03-052-0/+17
| |\ \ | | |/ | | | | | | | | | * commit '2383f2200ab0c2dbd71708b5c1fb6af98db408fa': Validate objects are from the correct context.
| | * Validate objects are from the correct context.Jason Sams2014-03-052-0/+17
| | | | | | | | | | | | Change-Id: I7d87b0e253b8d2e36d1aed790cfe3a7dd23e158f
* | | am 4db08b04: am 9f141fbb: am fb51a430: am 8377a4fd: Merge "Fix null check ↵Tim Murray2014-03-031-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | for BaseObj.equals." * commit '4db08b044dfbd01912353f0c85a43973407d98b0': Fix null check for BaseObj.equals.
| * | am 8377a4fd: Merge "Fix null check for BaseObj.equals."Tim Murray2014-03-031-0/+4
| |\ \ | | |/ | | | | | | | | | * commit '8377a4fd03d4fc367e0cb07af748ae941d9960a9': Fix null check for BaseObj.equals.
| | * Merge "Fix null check for BaseObj.equals."Tim Murray2014-03-031-0/+4
| | |\
| | | * Fix null check for BaseObj.equals.Tim Murray2014-02-281-0/+4
| | | | | | | | | | | | | | | | Change-Id: I4f060697db175cbf0b5617c1220db853bbe53f1f
* | | | am 62d675c2: am 0d3548be: am d138029d: am 14420e29: Merge "AArch64: Use ↵Narayan Kamath2014-02-2810-151/+215
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | long[] for RS id array" * commit '62d675c240fd87cb987c86ae4f6ac17dc13374c8': AArch64: Use long[] for RS id array
| * | | am 14420e29: Merge "AArch64: Use long[] for RS id array"Narayan Kamath2014-02-2810-151/+215
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '14420e29abc0f16f818ddaf606515861ba69ae68': AArch64: Use long[] for RS id array
| | * | Merge "AArch64: Use long[] for RS id array"Narayan Kamath2014-02-2810-151/+215
| | |\ \ | | | |/ | | |/|
| | | * AArch64: Use long[] for RS id arrayAshok Bhat2014-02-1210-151/+215
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia5145a547c0d13c7d6f1bb4d8f5472be62481bd9 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | Fix includes so that they no longer rely on the global Skia includes ↵Derek Sollenberger2014-02-272-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | directories. bug:13225538 Change-Id: Ia5d816dc665f81c7985f21036af4fd0a63c560cf
* | | | am afb4f8f1: am 8e30d53b: am 4870c813: am 7d1a6c5c: Merge "Fix destruction ↵Tim Murray2014-02-152-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | issues relating to AllocationAdapter." * commit 'afb4f8f144ef70360b70770e17e7d81571e7b296': Fix destruction issues relating to AllocationAdapter.
| * | | am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."Tim Murray2014-02-142-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '7d1a6c5cac16795e5953d2b4d34671e34e907632': Fix destruction issues relating to AllocationAdapter.
| | * | Fix destruction issues relating to AllocationAdapter.Tim Murray2014-02-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | bug 12971201 Change-Id: I3d9f66f527a35837ac866a695bdcc41d908a2562
* | | | am bdb04f02: am 17b7ff4a: am b25a6936: am d7043f00: Merge "Add hidden minor ↵Tim Murray2014-02-141-0/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | version ID for support lib workarounds." * commit 'bdb04f025ce34b0240f01961c43d8156a78e27a2': Add hidden minor version ID for support lib workarounds.
| * | | am d7043f00: Merge "Add hidden minor version ID for support lib workarounds."Tim Murray2014-02-141-0/+14
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'd7043f0084237200b6aab5d101c8ab6d3ab495c6': Add hidden minor version ID for support lib workarounds.
| | * | Merge "Add hidden minor version ID for support lib workarounds."Tim Murray2014-02-141-0/+14
| | |\ \ | | | |/ | | |/|
| | | * Add hidden minor version ID for support lib workarounds.Tim Murray2014-02-061-0/+14
| | | | | | | | | | | | | | | | Change-Id: I7940e32c78caaab351fb28d92e5fadbea6292b27
| * | | am 38d799fc: Merge "Generic object based data copy."Tim Murray2014-02-101-234/+247
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '38d799fc7a272c3c6ff7b9bc7b7f9239b45bf98c': Generic object based data copy.
| | * | Merge "Generic object based data copy."Tim Murray2014-02-101-234/+247
| | |\ \
| | | * | Generic object based data copy.Jason Sams2014-02-101-234/+247
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change consolidates the copy paths to Object based. The runtime now uses reflection to identify the type of array present. This adds support for long/double and reduces the amount of code present. We could also support arrays of vectors or objects in the future with this mechanism. Change-Id: I2297c1c01fbe6a64c375d6368f25d7db781ea788
* | | | Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."Andreas Huber2014-02-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7825334929b098b36e1144872200e75ba6d24b13. Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
* | | | Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.Andreas Huber2014-02-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv() thus minimizing build dependencies. Change-Id: Ia7f0c94c8c02b974c068e0db34774827f96aa95b
* | | | am 33a608a0: am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers ↵Narayan Kamath2014-02-108-87/+96
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | in RS Java/JNI code" * commit '33a608a0a326d9671bffd6750cb5521d6687cc57': AArch64: Use long for pointers in RS Java/JNI code
| * | | am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"Narayan Kamath2014-02-108-87/+96
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '56062983f1e07295c812fba0e22ce579a35b6f76': AArch64: Use long for pointers in RS Java/JNI code
| | * | Merge "AArch64: Use long for pointers in RS Java/JNI code"Narayan Kamath2014-02-108-87/+96
| | |\ \
| | | * | AArch64: Use long for pointers in RS Java/JNI codeAshok Bhat2014-02-058-87/+96
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes include [x] Some JNI functions, with return type jlong, casts pointer to jint before returning it. This has been fixed. [x] Minor JNI function prototype changes where formal paramter type has been changed to a JNI type (int to jint for example). [x] long is used for ScriptC, Sampler, Font, ProgramStore handles as they can be 64-bit. [x] A new hidden constructor ScriptC(long, RenderScript) has been added. This should eventually replace public API method ScriptC(int, RenderScript). [x] Font and FileA3D use getNativeAsset instead of getAssetInt to get Asset Handles. The getAssetInt method will be deprecated in favor of getNativeAsset, as the former does not support 64-bit. [x] rsnPathCreate method accepts loop as an int. This should be long as the underlying RS function assumes this to be a pointer. Change-Id: I919d857e5933febe63966049da83de9f9adee6f5 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | am ecc8ee64: am 8067c9ec: am 11e6cabc: Merge "Fix a typo."Jean-Luc Brouillet2014-02-101-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'ecc8ee649578c2bb859c639c361d5a24005b9200': Fix a typo.
| * | | am 11e6cabc: Merge "Fix a typo."Jean-Luc Brouillet2014-02-071-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '11e6cabc66a5ecfc9dadbd68fc0a5ed7d2a4656d': Fix a typo.
| | * | Fix a typo.Jean-Luc Brouillet2014-02-071-1/+1
| | |/ | | | | | | | | | Change-Id: I770fe97ab0635de84d15393aca6bca57552f2f10
| | * DO NOT MERGE: Mark new util type functions as @hide in AOSP.Tim Murray2014-01-311-0/+3
| | | | | | | | | | | | Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c