summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.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-13am b75dc06b: am 4179e889: Merge "Revert "Collapse code paths for single- and ↵Stephen Hines
multi-input kernels."" * commit 'b75dc06bbe2fdff1a4c9baa69eb92a849c22715d': Revert "Collapse code paths for single- and multi-input kernels."
2014-08-13am 5aaeb8e8: am 24a2ee66: Merge "Collapse code paths for single- and ↵Stephen Hines
multi-input kernels." * commit '5aaeb8e89eb0afd710ba9586f5e314b76e806116': Collapse code paths for single- and multi-input kernels.
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-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-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-03Add support for mixed 32/64 APKs using RenderScript.Tim Murray
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
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-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-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-05Validate objects are from the correct context.Jason Sams
Change-Id: I7d87b0e253b8d2e36d1aed790cfe3a7dd23e158f
2014-02-28am 62d675c2: am 0d3548be: am d138029d: am 14420e29: Merge "AArch64: Use ↵Narayan Kamath
long[] for RS id array" * commit '62d675c240fd87cb987c86ae4f6ac17dc13374c8': AArch64: Use long[] for RS id array
2014-02-28Merge "AArch64: Use long[] for RS id array"Narayan Kamath
2014-02-14am bdb04f02: am 17b7ff4a: am b25a6936: am d7043f00: Merge "Add hidden minor ↵Tim Murray
version ID for support lib workarounds." * commit 'bdb04f025ce34b0240f01961c43d8156a78e27a2': Add hidden minor version ID for support lib workarounds.
2014-02-14Merge "Add hidden minor version ID for support lib workarounds."Tim Murray
2014-02-12AArch64: Use long[] for RS id arrayAshok Bhat
Change-Id: Ia5145a547c0d13c7d6f1bb4d8f5472be62481bd9 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-10am 33a608a0: am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers ↵Narayan Kamath
in RS Java/JNI code" * commit '33a608a0a326d9671bffd6750cb5521d6687cc57': AArch64: Use long for pointers in RS Java/JNI code
2014-02-06Add hidden minor version ID for support lib workarounds.Tim Murray
Change-Id: I7940e32c78caaab351fb28d92e5fadbea6292b27
2014-02-05AArch64: Use long for pointers in RS Java/JNI codeAshok Bhat
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>
2014-01-31Enable asynchronous destruction of BaseObjs.Tim Murray
Change-Id: Iaddf8041a3c870a986ec8999e6ccc3aede38fc4c Conflicts: rs/java/android/renderscript/BaseObj.java
2014-01-31Move RenderScript from graphics/ to new fw/base subdirectory rs.Tim Murray
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d
2014-01-10Enable asynchronous destruction of BaseObjs.Tim Murray
Change-Id: Iaddf8041a3c870a986ec8999e6ccc3aede38fc4c
2013-12-17Move RenderScript from graphics/ to new fw/base subdirectory rs.Tim Murray
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d