summaryrefslogtreecommitdiff
path: root/rs/java
AgeCommit message (Collapse)Author
2014-08-19am 7fa25bc1: am 3c02b020: Merge "Fix IO_INPUT with 64-bit." into lmp-devTim Murray
* commit '7fa25bc1269d3ba2db79f32acb17d80194cbadce': Fix IO_INPUT with 64-bit.
2014-08-18Fix IO_INPUT with 64-bit.Tim Murray
bug 16846318 bug 17006933 Change-Id: Ic13ef26875d8a6fab1ffb542d62038b768a536ff
2014-08-18am 4ae9a6d5: am 42895561: Merge "Collapse code paths for single- and ↵Stephen Hines
multi-input kernels." * commit '4ae9a6d5c517f67d9929cc43568c6b7e3b4dfe23': Collapse code paths for single- and multi-input kernels.
2014-08-18Collapse code paths for single- and multi-input kernels.Chris Wailes
This patch simplifies the RenderScript JNI layer by replacing six functions with a single funciton. This new function now handles all previous cases. Functions in android.renderscript.script have been updated to use this new JNI function. Change-Id: I6cd5448534c38123d51a589339bbeb7e98453e73
2014-08-14Allocation.resize() should throw an exception in API 21+.Tim Murray
bug 16846318 Change-Id: I852331ec226e4cad8be79aa27c4b51183e97cc1d
2014-08-13Revert "Collapse code paths for single- and multi-input kernels."Stephen Hines
This reverts commit eb3470219dea322efa93eb4b5457813ce71d0c5d. Change-Id: Id943abf953e832ef831318e6699d4b46e9b46201
2014-08-07Collapse code paths for single- and multi-input kernels.Chris Wailes
This patch simplifies the RenderScript JNI layer by replacing six functions with a single funciton. This new function now handles all previous cases. Functions in android.renderscript.script have been updated to use this new JNI function. Change-Id: I77e4b155cc7ca1581b05bf901c70ae53a9ff0b12
2014-07-10Fix broken blend intrinsic.Tim Murray
Change-Id: I3a1749aed701e17b48c267ca749c9cf29ca12e43
2014-07-09Update copyFrom(BaseObj[]) for large objects.Tim Murray
Change-Id: I99cadbd1ad925cad0dd357c9abbd1a49c07785c9
2014-07-09Update copyFrom(BaseObj[]) for large objects.Tim Murray
Change-Id: I99cadbd1ad925cad0dd357c9abbd1a49c07785c9
2014-07-07Adds support for multi-input kernels to Frameworks/Base/RS.Chris Wailes
* 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
2014-07-09resolved conflicts for merge of 31012e2c to masterStephen Hines
Change-Id: I2e24e0457570d7d856293637a553f0242a97a83b
2014-06-25Merge "Add check and throw for failed Intrinsic init."Jason Sams
2014-06-26am 6b52ca59: am 89e4c715: am 7165bd6d: Merge "Add check and throw for failed ↵Jason Sams
Intrinsic init." * commit '6b52ca5949545dcb654672663e2187a70b04f442': Add check and throw for failed Intrinsic init.
2014-06-25Remove @hide for new RS constructors.Tim Murray
Change-Id: I015f36e8c54663472f236e311fe279ce06261ff0
2014-06-23We need to update mPos when we copy a FieldPacker via its data[] member.Stephen Hines
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
2014-06-23Add check and throw for failed Intrinsic init.Jason Sams
Change-Id: Icd53b3edd8e887d3692e5815dc0c38cd68b7aeb1
2014-06-24am ed24d3f2: am db3bcfb8: am 44023a4f: Merge "We need to update mPos when we ↵Stephen Hines
copy a FieldPacker via its data[] member." * commit 'ed24d3f2e991906973afce8aa6a3fa54f4a3e4df': We need to update mPos when we copy a FieldPacker via its data[] member.
2014-06-18Merge "Create FieldPacker.getPos() to get the actual amount of data used for ↵Stephen Hines
FP."
2014-06-18Create FieldPacker.getPos() to get the actual amount of data used for FP.Stephen Hines
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
2014-06-18Fix element size on 64bJason Sams
RenderScript Element types know their own size. This change properly tracks the new object sizes. Change-Id: I3cbf76a7ec5f68056ed5599e9406cea05ba86969
2014-06-19am c5b11fcc: am ff83ed2d: am b02dadd4: Merge "Create FieldPacker.getPos() to ↵Stephen Hines
get the actual amount of data used for FP." * commit 'c5b11fcc1f4fc4fba988218d0a99a19690398a56': Create FieldPacker.getPos() to get the actual amount of data used for FP.
2014-06-18am 3aa4de11: am 802aaf3b: am 47de3060: Merge "Fix element size on 64b"Jason Sams
* commit '3aa4de11b05599d75af92a15820731144941c38f': Fix element size on 64b
2014-06-17Merge "Switch from Droid -> Noto for RS fonts."Stephen Hines
2014-06-11Switch from Droid -> Noto for RS fonts.Stephen Hines
Bug: 15436348 Change-Id: Ie62092538c7d865dcaba668392a4397baef725ec
2014-06-12am 604ea0e4: am b1c9430c: am 77d28ca2: Merge "Move FieldPacker over to use ↵Tim Murray
large objects on 64-bit." * commit '604ea0e415faa2466ab6c89372001d6c93ad0d98': Move FieldPacker over to use large objects on 64-bit.
2014-06-12am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit."Tim Murray
* commit '77d28ca25378530f92d409fbd72a38a1e256b59f': Move FieldPacker over to use large objects on 64-bit.
2014-06-12Move FieldPacker over to use large objects on 64-bit.Tim Murray
Change-Id: I1d4d502a3f9d86c6cf0f516cc087b1457f86ac28
2014-06-06am b43bc047: Merge "Change flags to use int instead of long." into ↵Tim Murray
lmp-preview-dev * commit 'b43bc0475490fe2a20c2ddeed1c34b55b8f8a152': Change flags to use int instead of long.
2014-06-06Change flags to use int instead of long.Tim Murray
bug 15429629 Change-Id: Ideb983b17aa3c146d23f2be6bb0e9808cb6725b7
2014-06-04DO NOT MERGE: Mark new util type functions as @hide in AOSP.Tim Murray
Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c
2014-06-03Add support for mixed 32/64 APKs using RenderScript.Tim Murray
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
2014-06-03Merge "Add support for mixed 32/64 APKs using RenderScript."Tim Murray
2014-06-03Add support for mixed 32/64 APKs using RenderScript.Tim Murray
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
2014-05-20Validate RenderScript context creation flagsJason Sams
Sync the IDs to that of the native interface. Change-Id: I7516c1ea4f4a93844ddb8397b2fc1e79ff8d6b68
2014-05-07Add flags to context creation for RSJason Sams
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
2014-04-17Unhide RenderScript resize intrinsicJason Sams
Change-Id: I450c83ad00bcb7d999aaf7d4bd7ea88d63ab8fea
2014-04-17am 5170476c: am a4af5726: am 112d1b94: Merge "Add BiCubic resize instrinsic"Jason Sams
* commit '5170476c5bf470b57616380aa7b15b44e5a24bea': Add BiCubic resize instrinsic
2014-04-17am 112d1b94: Merge "Add BiCubic resize instrinsic"Jason Sams
* commit '112d1b94ee8456dba16842e6b964eb35aef95818': Add BiCubic resize instrinsic
2014-04-16Add BiCubic resize instrinsicJason Sams
Change-Id: Iafec3f4260bb5d3a3133b034e42dfb0a94ae9f81
2014-04-01am c796ccaa: am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL ↵Jason Sams
setSurfaceTexture problem" * commit 'c796ccaafb935592b98d5aaad2594791935f6530': Fix RenderScriptGL setSurfaceTexture problem
2014-04-01am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"Jason Sams
* commit 'b3cafa56205942343930e4fbb0a3d50d6e33a046': Fix RenderScriptGL setSurfaceTexture problem
2014-03-31Fix RenderScriptGL setSurfaceTexture problemXiaofei Wan
rsnContextSetSurfaceTexture() has no implementation in rs-jni, use nContextSetSurface() in setSurfaceTexture(). Change-Id: I066432575c9e74f21ea3a3776628b572b6e31377 Signed-off-by: Xiaofei Wan <xiaofei.wan@intel.com>
2014-03-19am 4f346bf0: am ff1e1d99: am 240d5638: am c1f3d4c1: Merge "Fix 64 bit ↵Glenn Kasten
compile failures in renderscript" * commit '4f346bf0ffe1c596ca261dfec23c50977de77d82': Fix 64 bit compile failures in renderscript
2014-03-19am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript"Glenn Kasten
* commit 'c1f3d4c1ba7903d1b72c2341b5284da12b79ee46': Fix 64 bit compile failures in renderscript
2014-03-19Fix 64 bit compile failures in renderscriptNarayan Kamath
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
2014-03-06am edf0b79d: am 24ea88a9: am 9a9916b5: am 2383f220: Merge "Validate objects ↵Jason Sams
are from the correct context." * commit 'edf0b79d55df17fddb6b96de32f34ffccc8ec2d4': Validate objects are from the correct context.
2014-03-05am 2383f220: Merge "Validate objects are from the correct context."Jason Sams
* commit '2383f2200ab0c2dbd71708b5c1fb6af98db408fa': Validate objects are from the correct context.
2014-03-05Validate objects are from the correct context.Jason Sams
Change-Id: I7d87b0e253b8d2e36d1aed790cfe3a7dd23e158f
2014-03-03am 4db08b04: am 9f141fbb: am fb51a430: am 8377a4fd: Merge "Fix null check ↵Tim Murray
for BaseObj.equals." * commit '4db08b044dfbd01912353f0c85a43973407d98b0': Fix null check for BaseObj.equals.