summaryrefslogtreecommitdiffstats
path: root/rs/java
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | am 33a608a0: am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers ↵Narayan Kamath2014-02-107-33/+43
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 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-107-33/+43
| |\ \ \ | | |/ / | | | | | | | | | | | | * 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-107-33/+43
| | |\ \
| | | * | AArch64: Use long for pointers in RS Java/JNI codeAshok Bhat2014-02-057-33/+43
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Check that bound allocations are 1DJason Sams2014-01-311-0/+7
| | | | | | | | | | | | | | | | We do not support higher order bound allocations. The stride is not available to the script so they cannot walk the allocation correctly. Change-Id: I9447a5d43c3ae1b88fc9522628a17bd5a317ffc6
| * Enable asynchronous destruction of BaseObjs.Tim Murray2014-01-312-13/+42
| | | | | | | | | | | | | | Change-Id: Iaddf8041a3c870a986ec8999e6ccc3aede38fc4c Conflicts: rs/java/android/renderscript/BaseObj.java
| * Fix getBytesSize for YUV allocations.Tim Murray2014-01-311-0/+3
| | | | | | | | | | | | bug 12134914 Change-Id: I128e75b756a5bd129077177e254f1db6c94182f1
| * Move RenderScript from graphics/ to new fw/base subdirectory rs.Tim Murray2014-01-3161-0/+21999
| | | | Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d
* Merge "Check that bound allocations are 1D"Jason Sams2014-01-151-0/+7
|\
| * Check that bound allocations are 1DJason Sams2014-01-141-0/+7
| | | | | | | | | | | | | | | | We do not support higher order bound allocations. The stride is not available to the script so they cannot walk the allocation correctly. Change-Id: I9447a5d43c3ae1b88fc9522628a17bd5a317ffc6
* | Add clipping for intrinsics.Tim Murray2014-01-138-26/+312
|/ | | | Change-Id: Ic7e1da3c69aa3d5f990816178739120b6059e7a5
* Enable asynchronous destruction of BaseObjs.Tim Murray2014-01-102-12/+43
| | | | Change-Id: Iaddf8041a3c870a986ec8999e6ccc3aede38fc4c
* Fix getBytesSize for YUV allocations.Tim Murray2014-01-071-0/+3
| | | | | | bug 12134914 Change-Id: I128e75b756a5bd129077177e254f1db6c94182f1
* Move RenderScript from graphics/ to new fw/base subdirectory rs.Tim Murray2013-12-1761-0/+21875
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d