summaryrefslogtreecommitdiff
path: root/rs/jni/android_renderscript_RenderScript.cpp
AgeCommit message (Collapse)Author
2015-02-09Merge "Implement array types"Jason Sams
2015-02-06Implement array typesJason Sams
Change-Id: I1b83f21ea2aeaa4b9f5934aadcb69d4a1c1fea20
2015-02-05Fix clang build.Elliott Hughes
Change-Id: If795820ef6431fee9c9c3862cc91ad4a9cc04507
2015-02-04Adds invocable functions to ScriptGroupYang Ni
This also includes InvokeID support Change-Id: I5b59df166ea30b309b8dd9623825ac0e72d03856
2015-01-29Pass in code cache directory when creating a script group.Yang Ni
Change-Id: Ia73ea917a126a5055ec97f13d90a5feaafd6a2f5
2015-01-26Initialize clipping structureJason Sams
placeholder until array clipping is added to the API. Change-Id: Ib20dbd71989c559c0669385a5088ec261596913c
2015-01-07New Script Group API.Yang Ni
Change-Id: I73d3572276a38dac775025b472ba229ad8770c84
2014-12-02Fix bug in passing of context flags and version.Jason Sams
Change-Id: Id20906f6f47b573d881025453a3b6356bcf6e9c7
2014-11-20Fix format strings mismatching the parameters passed to themBernhard Rosenkränzer
Change-Id: Ia0d33aec9edadac60508fb422e0821e6d8f28afa Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-10Frameworks/base: Wall Werror in rsAndreas Gampe
Turn on -Wall -Werror in rs/. Fix warnings. Change-Id: I41923e4578edf26dbf6a31a83b6999e80d6d385a
2014-08-21resolved conflicts for merge of 5a2d0432 to lmp-dev-plus-aospStephen Hines
Change-Id: I59be35e67ab2b4709f27c39916b6aebc1abba56f
2014-08-19am c9c78206: am 9ba9298e: Merge "Stop sign-extending RS IDs." into lmp-devTim Murray
* commit 'c9c7820604158bc6c6ba0e413cc48c8e1c0a6366': Stop sign-extending RS IDs.
2014-08-18Stop sign-extending RS IDs.Tim Murray
bug 16846318 bug 17006933 Change-Id: I6b1e73ed983ec583e80dc532e38c2ae2e504e608
2014-08-18Replace NULL macros with nullptr literals.Chris Wailes
Change-Id: I6c2af76f1f134d3f233d5462fed3969910ae2f24
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-25Switch from size_t -> uint32_t for dimensions array.Stephen Hines
Change-Id: I159586e98dd47be9b9f5db0f3e27d1072533134c
2014-06-25am af97f87a: am 6d38cec1: am 924ed1fa: Merge "Switch from size_t -> uint32_t ↵Stephen Hines
for dimensions array." * commit 'af97f87a477efa05905134baa01bc6b5222b2448': Switch from size_t -> uint32_t for dimensions array.
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-04-17am fc45b664: am f0aa4cc0: am a4898534: Merge "Fix improper use of JNI_ABORT ↵Stephen Hines
for operations where Java objects are written." * commit 'fc45b664d421553042629d24086a144761c7b5e1': Fix improper use of JNI_ABORT for operations where Java objects are written.
2014-04-17am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java ↵Stephen Hines
objects are written." * commit 'a48985349cb26757b6c4be18acc496ab6d1110e5': Fix improper use of JNI_ABORT for operations where Java objects are written.
2014-04-17Fix improper use of JNI_ABORT for operations where Java objects are written.Stephen Hines
In these RS API calls, it is possible (and very likely) that some Java objects are written to via JNI calls into the RS driver. These writes can end up being discarded if we specify JNI_ABORT, particularly if the Java object has been moved due to GC. The change introduces a readonly mode for some macro calls and updates other JNI callers to appropriately skip JNI_ABORT. Change-Id: I8c5f2ae959b3fbc9008c9d2ac4542f2ebab29b06
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-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-28am 14420e29: Merge "AArch64: Use long[] for RS id array"Narayan Kamath
* commit '14420e29abc0f16f818ddaf606515861ba69ae68': AArch64: Use long[] for RS id array
2014-02-27Fix includes so that they no longer rely on the global Skia includes ↵Derek Sollenberger
directories. bug:13225538 Change-Id: Ia5d816dc665f81c7985f21036af4fd0a63c560cf
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-10am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"Narayan Kamath
* commit '56062983f1e07295c812fba0e22ce579a35b6f76': AArch64: Use long for pointers in RS Java/JNI code
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-02-03am 0cc37f4c: Merge "Fix debug context."Tim Murray
* commit '0cc37f4cdeaed95e4f61f1a6e7b78f07e7025e97': Fix debug context.
2014-02-03am d8b4dd95: Merge "Fix most logging macros for context pointers."Tim Murray
* commit 'd8b4dd9555e987df92206562061080b327598f41': Fix most logging macros for context pointers.
2014-02-03am 8fced317: Merge "Move RenderScript from graphics/ to new fw/base ↵Tim Murray
subdirectory rs." * commit '8fced3174ad45e5d618f28c82d69bd21261f6108': Move RenderScript from graphics/ to new fw/base subdirectory rs.
2014-01-31Fix debug context.Tim Murray
bug 12477551 Change-Id: Icac28abc3dabce31834faa1942b596c2f207f29e
2014-01-31Fix most logging macros for context pointers.Tim Murray
Change-Id: I7f4a8db4f3a52c368cc32ce0428f8001df8a4166
2014-01-31Move RenderScript from graphics/ to new fw/base subdirectory rs.Tim Murray
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d
2014-01-28AArch64: Make graphics classes 64-bit compatibleAshok Bhat
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
2014-01-27Revert "AArch64: Make graphics classes 64-bit compatible"Narayan Kamath
This reverts commit 18b4cbeedef21c1fa666a110a157bab66edff976. Change-Id: I0c52983a3ab1ace3ff743de546a43eca28e5cb0e
2014-01-27AArch64: Make graphics classes 64-bit compatibleAshok Bhat
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
2014-01-10Fix debug context.Tim Murray
bug 12477551 Change-Id: Icac28abc3dabce31834faa1942b596c2f207f29e
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 11:56:44 +0000