summaryrefslogtreecommitdiffstats
path: root/rs
Commit message (Collapse)AuthorAgeFilesLines
* 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 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 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>
* | | 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 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 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 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
* | am 3fb6feac: Merge "Check that bound allocations are 1D"Tim Murray2014-02-031-0/+7
|\ \ | |/ | | | | | | * commit '3fb6feacc62e1021c705b53d46e915ecf50582d2': Check that bound allocations are 1D
| * 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
* | am 0cc37f4c: Merge "Fix debug context."Tim Murray2014-02-031-4/+4
|\ \ | |/ | | | | | | * commit '0cc37f4cdeaed95e4f61f1a6e7b78f07e7025e97': Fix debug context.
| * Fix debug context.Tim Murray2014-01-311-4/+4
| | | | | | | | | | | | bug 12477551 Change-Id: Icac28abc3dabce31834faa1942b596c2f207f29e
* | am 0539b7b4: Merge "Enable asynchronous destruction of BaseObjs."Tim Murray2014-02-032-13/+42
|\ \ | |/ | | | | | | * commit '0539b7b4116622d33c91dbaa9a3040c7a3a703d6': Enable asynchronous destruction of BaseObjs.
| * Enable asynchronous destruction of BaseObjs.Tim Murray2014-01-312-13/+42
| | | | | | | | | | | | | | Change-Id: Iaddf8041a3c870a986ec8999e6ccc3aede38fc4c Conflicts: rs/java/android/renderscript/BaseObj.java
* | am d8b4dd95: Merge "Fix most logging macros for context pointers."Tim Murray2014-02-031-89/+89
|\ \ | |/ | | | | | | * commit 'd8b4dd9555e987df92206562061080b327598f41': Fix most logging macros for context pointers.
| * Fix most logging macros for context pointers.Tim Murray2014-01-311-89/+89
| | | | | | | | Change-Id: I7f4a8db4f3a52c368cc32ce0428f8001df8a4166
* | am 351879df: Merge "Fix getBytesSize for YUV allocations."Tim Murray2014-02-031-0/+3
|\ \ | |/ | | | | | | * commit '351879df3aff02987a6f4c4485bf004a96fcb150': Fix getBytesSize for YUV allocations.
| * Fix getBytesSize for YUV allocations.Tim Murray2014-01-311-0/+3
| | | | | | | | | | | | bug 12134914 Change-Id: I128e75b756a5bd129077177e254f1db6c94182f1
* | am 8fced317: Merge "Move RenderScript from graphics/ to new fw/base ↵Tim Murray2014-02-031-1/+1
|/ | | | | | | subdirectory rs." * commit '8fced3174ad45e5d618f28c82d69bd21261f6108': Move RenderScript from graphics/ to new fw/base subdirectory rs.
* Move RenderScript from graphics/ to new fw/base subdirectory rs.Tim Murray2014-01-3163-0/+23697
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d
generated by cgit v1.1 at 2025-02-03 06:19:46 +0000