summaryrefslogtreecommitdiffstats
path: root/rs
Commit message (Collapse)AuthorAgeFilesLines
...
| | * 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
* AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-281-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This a merger of two commits submitted to AOSP by the following authors: ashok.bhat@arm.com, david.butcher@arm.coma craig.barber@arm.com, kevin.petit@arm.com and marcus.oakland@arm.com Due to the very large number of internal conflicts, I have chosen to cherry-pick this change instead of letting it merge through AOSP because the merge conflict resolution would be very hard to review. Commit messages below: ================================================ AArch64: Make graphics classes 64-bit compatible Changes in this patch include [x] Long is used to store native pointers as they can be 64-bit. [x] Some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) [x] AssetAtlasManager is not completely 64-bit compatible yet. Specifically mAtlasMap member has to be converted to hold native pointer using long. Added a TODO to AssetAtlasManager.java to indicate the change required. Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> ================================================================== AArch64: Use long for pointers in graphics/Camera For storing pointers, long is used in android/graphics/Camera class, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> =================================================================== Change-Id: Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71
* Revert "AArch64: Make graphics classes 64-bit compatible"Narayan Kamath2014-01-271-6/+6
| | | | | | This reverts commit 18b4cbeedef21c1fa666a110a157bab66edff976. Change-Id: I0c52983a3ab1ace3ff743de546a43eca28e5cb0e
* AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This a merger of two commits submitted to AOSP by the following authors: ashok.bhat@arm.com, david.butcher@arm.coma craig.barber@arm.com, kevin.petit@arm.com and marcus.oakland@arm.com Due to the very large number of internal conflicts, I have chosen to cherry-pick this change instead of letting it merge through AOSP because the merge conflict resolution would be very hard to review. Commit messages below: ================================================ AArch64: Make graphics classes 64-bit compatible Changes in this patch include [x] Long is used to store native pointers as they can be 64-bit. [x] Some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) [x] AssetAtlasManager is not completely 64-bit compatible yet. Specifically mAtlasMap member has to be converted to hold native pointer using long. Added a TODO to AssetAtlasManager.java to indicate the change required. Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> ================================================================== AArch64: Use long for pointers in graphics/Camera For storing pointers, long is used in android/graphics/Camera class, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> =================================================================== Change-Id: Ib3eab85ed97ea3e3c227617c20f8d213f17d4ba0
* 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
* Fix debug context.Tim Murray2014-01-101-4/+4
| | | | | | bug 12477551 Change-Id: Icac28abc3dabce31834faa1942b596c2f207f29e
* Enable asynchronous destruction of BaseObjs.Tim Murray2014-01-102-12/+43
| | | | Change-Id: Iaddf8041a3c870a986ec8999e6ccc3aede38fc4c
* Fix most logging macros for context pointers.Tim Murray2014-01-081-89/+89
| | | | Change-Id: I7f4a8db4f3a52c368cc32ce0428f8001df8a4166
* Fix getBytesSize for YUV allocations.Tim Murray2014-01-071-0/+3
| | | | | | bug 12134914 Change-Id: I128e75b756a5bd129077177e254f1db6c94182f1
* Fix improper declaration/use of pointer.Stephen Hines2013-12-181-1/+1
| | | | | | | | | https://code.google.com/p/android/issues/detail?id=61547 This variable is shadowing the outer "ptr" declaration, resulting in a potential NULL pointer being passed to the message API. Change-Id: If96bfae8d5e874e12597182678a180ba137b78da
* Move RenderScript from graphics/ to new fw/base subdirectory rs.Tim Murray2013-12-1763-0/+23573
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d