summaryrefslogtreecommitdiffstats
path: root/rs/java
Commit message (Collapse)AuthorAgeFilesLines
* Allocation.resize() should throw an exception in API 21+.Tim Murray2014-08-141-1/+5
| | | | | | bug 16846318 Change-Id: I852331ec226e4cad8be79aa27c4b51183e97cc1d
* Fix broken blend intrinsic.Tim Murray2014-07-101-1/+1
| | | | Change-Id: I3a1749aed701e17b48c267ca749c9cf29ca12e43
* Update copyFrom(BaseObj[]) for large objects.Tim Murray2014-07-091-5/+12
| | | | Change-Id: I99cadbd1ad925cad0dd357c9abbd1a49c07785c9
* resolved conflicts for merge of 31012e2c to masterStephen Hines2014-07-097-13/+79
|\ | | | | | | Change-Id: I2e24e0457570d7d856293637a553f0242a97a83b
| * Adds support for multi-input kernels to Frameworks/Base/RS.Chris Wailes2014-07-077-10/+76
| | | | | | | | | | | | | | | | * Added a new JNI call to pass arrays of Allocations to the RS runtime. * Added a new version of ForEach that takes an array of Allocations. * Added some casts to disambiguate existing calls to forEach. Change-Id: I46d2834c37075b2a2407fd8b010546818a4540d1
* | am 6b52ca59: am 89e4c715: am 7165bd6d: Merge "Add check and throw for failed ↵Jason Sams2014-06-261-0/+3
|\ \ | |/ | | | | | | | | | | Intrinsic init." * commit '6b52ca5949545dcb654672663e2187a70b04f442': Add check and throw for failed Intrinsic init.
| * Merge "Add check and throw for failed Intrinsic init."Jason Sams2014-06-251-0/+3
| |\
| | * Add check and throw for failed Intrinsic init.Jason Sams2014-06-231-0/+3
| | | | | | | | | | | | Change-Id: Icd53b3edd8e887d3692e5815dc0c38cd68b7aeb1
* | | Remove @hide for new RS constructors.Tim Murray2014-06-251-2/+0
| | | | | | | | | | | | Change-Id: I015f36e8c54663472f236e311fe279ce06261ff0
* | | am ed24d3f2: am db3bcfb8: am 44023a4f: Merge "We need to update mPos when we ↵Stephen Hines2014-06-241-1/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | copy a FieldPacker via its data[] member." * commit 'ed24d3f2e991906973afce8aa6a3fa54f4a3e4df': We need to update mPos when we copy a FieldPacker via its data[] member.
| * | We need to update mPos when we copy a FieldPacker via its data[] member.Stephen Hines2014-06-231-1/+6
| |/ | | | | | | | | | | | | | | | | | | Bug: 15756600 This change also adds a TODO/FIXME related to subAlign() and our tracking mechanism for it. We need to further investigate how to make subAlign() work properly if a user copies their FieldPacker. Change-Id: I861e529abd11e378f7c73b510d7f418b940fe480
* | am c5b11fcc: am ff83ed2d: am b02dadd4: Merge "Create FieldPacker.getPos() to ↵Stephen Hines2014-06-193-7/+21
|\ \ | |/ | | | | | | | | | | get the actual amount of data used for FP." * commit 'c5b11fcc1f4fc4fba988218d0a99a19690398a56': Create FieldPacker.getPos() to get the actual amount of data used for FP.
| * Merge "Create FieldPacker.getPos() to get the actual amount of data used for ↵Stephen Hines2014-06-183-7/+21
| |\ | | | | | | | | | FP."
| | * Create FieldPacker.getPos() to get the actual amount of data used for FP.Stephen Hines2014-06-183-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need larger buffers to handle 64-bit RS object types, but 32-bit code will never fill all of the getData().length bytes. This allows us to retain our verification code. We have to modify an existing use of FieldPacker that was doing partial updates of the underlying buffer. This was really relying on the old data to be implicitly selected and written back, but that is not guaranteed by the original API. This also required a fix to the FieldPacker.reset() API, which was not allowing the FieldPacker to ever point to the final entry in its buffer. Change-Id: Idcd52790ac2b0ab1eff3f043e7eec2832953f04b
* | | am 3aa4de11: am 802aaf3b: am 47de3060: Merge "Fix element size on 64b"Jason Sams2014-06-181-11/+19
|\ \ \ | |/ / | | | | | | | | | * commit '3aa4de11b05599d75af92a15820731144941c38f': Fix element size on 64b
| * | Fix element size on 64bJason Sams2014-06-181-11/+19
| |/ | | | | | | | | | | | | RenderScript Element types know their own size. This change properly tracks the new object sizes. Change-Id: I3cbf76a7ec5f68056ed5599e9406cea05ba86969
* | Merge "Switch from Droid -> Noto for RS fonts."Stephen Hines2014-06-171-4/+4
|\ \
| * | Switch from Droid -> Noto for RS fonts.Stephen Hines2014-06-111-4/+4
| | | | | | | | | | | | | | | Bug: 15436348 Change-Id: Ie62092538c7d865dcaba668392a4397baef725ec
* | | am 604ea0e4: am b1c9430c: am 77d28ca2: Merge "Move FieldPacker over to use ↵Tim Murray2014-06-121-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | large objects on 64-bit." * commit '604ea0e415faa2466ab6c89372001d6c93ad0d98': Move FieldPacker over to use large objects on 64-bit.
| * \ \ am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit."Tim Murray2014-06-121-0/+6
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '77d28ca25378530f92d409fbd72a38a1e256b59f': Move FieldPacker over to use large objects on 64-bit.
| | * | Move FieldPacker over to use large objects on 64-bit.Tim Murray2014-06-121-0/+6
| | | | | | | | | | | | | | | | Change-Id: I1d4d502a3f9d86c6cf0f516cc087b1457f86ac28
| | * | DO NOT MERGE: Mark new util type functions as @hide in AOSP.Tim Murray2014-06-041-0/+3
| |/ / | | | | | | | | | Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c
| * | Merge "Add support for mixed 32/64 APKs using RenderScript."Tim Murray2014-06-033-3/+51
| |\ \
| | * | Add support for mixed 32/64 APKs using RenderScript.Tim Murray2014-06-033-3/+51
| | | | | | | | | | | | | | | | Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
* | | | am b43bc047: Merge "Change flags to use int instead of long." into ↵Tim Murray2014-06-061-7/+7
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | lmp-preview-dev * commit 'b43bc0475490fe2a20c2ddeed1c34b55b8f8a152': Change flags to use int instead of long.
| * | | Change flags to use int instead of long.Tim Murray2014-06-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | bug 15429629 Change-Id: Ideb983b17aa3c146d23f2be6bb0e9808cb6725b7
* | | | Add support for mixed 32/64 APKs using RenderScript.Tim Murray2014-06-033-3/+51
|/ / / | | | | | | | | | Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
* | | Validate RenderScript context creation flagsJason Sams2014-05-201-3/+7
| | | | | | | | | | | | | | | | | | Sync the IDs to that of the native interface. Change-Id: I7516c1ea4f4a93844ddb8397b2fc1e79ff8d6b68
* | | 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
* | | 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-191-10/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | 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-191-10/+10
| |\ \ | | |/ | | | | | | | | | * commit 'c1f3d4c1ba7903d1b72c2341b5284da12b79ee46': Fix 64 bit compile failures in renderscript
| | * Fix 64 bit compile failures in renderscriptNarayan Kamath2014-03-191-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-289-76/+70
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 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-289-76/+70
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '14420e29abc0f16f818ddaf606515861ba69ae68': AArch64: Use long[] for RS id array
| | * | Merge "AArch64: Use long[] for RS id array"Narayan Kamath2014-02-289-76/+70
| | |\ \ | | | |/ | | |/|
| | | * AArch64: Use long[] for RS id arrayAshok Bhat2014-02-129-76/+70
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia5145a547c0d13c7d6f1bb4d8f5472be62481bd9 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>