summaryrefslogtreecommitdiffstats
path: root/rs/jni
Commit message (Collapse)AuthorAgeFilesLines
...
| * Replace NULL macros with nullptr literals.Chris Wailes2014-08-182-58/+58
| | | | | | | | Change-Id: I6c2af76f1f134d3f233d5462fed3969910ae2f24
* | am c9c78206: am 9ba9298e: Merge "Stop sign-extending RS IDs." into lmp-devTim Murray2014-08-191-36/+36
|\ \ | | | | | | | | | | | | * commit 'c9c7820604158bc6c6ba0e413cc48c8e1c0a6366': Stop sign-extending RS IDs.
| * | Stop sign-extending RS IDs.Tim Murray2014-08-181-36/+36
| | | | | | | | | | | | | | | | | | | | | bug 16846318 bug 17006933 Change-Id: I6b1e73ed983ec583e80dc532e38c2ae2e504e608
* | | am 4ae9a6d5: am 42895561: Merge "Collapse code paths for single- and ↵Stephen Hines2014-08-181-136/+56
|\ \ \ | | |/ | |/| | | | | | | | | | | | | multi-input kernels." * commit '4ae9a6d5c517f67d9929cc43568c6b7e3b4dfe23': Collapse code paths for single- and multi-input kernels.
| * | Collapse code paths for single- and multi-input kernels.Chris Wailes2014-08-181-136/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am b75dc06b: am 4179e889: Merge "Revert "Collapse code paths for single- and ↵Stephen Hines2014-08-131-56/+136
|\ \ \ | |/ / | | | | | | | | | | | | | | | multi-input kernels."" * commit 'b75dc06bbe2fdff1a4c9baa69eb92a849c22715d': Revert "Collapse code paths for single- and multi-input kernels."
| * | Revert "Collapse code paths for single- and multi-input kernels."Stephen Hines2014-08-131-56/+136
| | | | | | | | | | | | | | | | | | This reverts commit eb3470219dea322efa93eb4b5457813ce71d0c5d. Change-Id: Id943abf953e832ef831318e6699d4b46e9b46201
* | | am 5aaeb8e8: am 24a2ee66: Merge "Collapse code paths for single- and ↵Stephen Hines2014-08-131-136/+56
|\ \ \ | |/ / | | / | |/ |/| | | | | multi-input kernels." * commit '5aaeb8e89eb0afd710ba9586f5e314b76e806116': Collapse code paths for single- and multi-input kernels.
| * Collapse code paths for single- and multi-input kernels.Chris Wailes2014-08-071-136/+56
| | | | | | | | | | | | | | | | | | 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
* | resolved conflicts for merge of 31012e2c to masterStephen Hines2014-07-091-0/+97
|\ \ | |/ | | | | Change-Id: I2e24e0457570d7d856293637a553f0242a97a83b
| * Adds support for multi-input kernels to Frameworks/Base/RS.Chris Wailes2014-07-071-0/+97
| | | | | | | | | | | | | | | | * 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 af97f87a: am 6d38cec1: am 924ed1fa: Merge "Switch from size_t -> uint32_t ↵Stephen Hines2014-06-251-1/+1
|\ \ | |/ | | | | | | | | | | for dimensions array." * commit 'af97f87a477efa05905134baa01bc6b5222b2448': Switch from size_t -> uint32_t for dimensions array.
| * Switch from size_t -> uint32_t for dimensions array.Stephen Hines2014-06-251-1/+1
| | | | | | | | Change-Id: I159586e98dd47be9b9f5db0f3e27d1072533134c
| * Merge "Add support for mixed 32/64 APKs using RenderScript."Tim Murray2014-06-031-0/+7
| |\
| | * Add support for mixed 32/64 APKs using RenderScript.Tim Murray2014-06-031-0/+7
| | | | | | | | | | | | Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
* | | Add support for mixed 32/64 APKs using RenderScript.Tim Murray2014-06-031-0/+7
| | | | | | | | | | | | Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
* | | am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-1/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'db55bb0622e9fbe4b858d59409f516de01c1f1fd': Remove unused LOCAL_LDLIBS.
| * | am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-1/+0
| |\ \ | | |/ | | | | | | | | | * commit '3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3': Remove unused LOCAL_LDLIBS.
| | * Remove unused LOCAL_LDLIBS.Ying Wang2014-05-071-1/+0
| | | | | | | | | | | | Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
* | | am fc45b664: am f0aa4cc0: am a4898534: Merge "Fix improper use of JNI_ABORT ↵Stephen Hines2014-04-171-14/+30
|\ \ \ | |/ / | | | | | | | | | | | | | | | for operations where Java objects are written." * commit 'fc45b664d421553042629d24086a144761c7b5e1': Fix improper use of JNI_ABORT for operations where Java objects are written.
| * | am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java ↵Stephen Hines2014-04-171-14/+30
| |\ \ | | |/ | | | | | | | | | | | | | | | objects are written." * commit 'a48985349cb26757b6c4be18acc496ab6d1110e5': Fix improper use of JNI_ABORT for operations where Java objects are written.
| | * Fix improper use of JNI_ABORT for operations where Java objects are written.Stephen Hines2014-04-171-14/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 4f346bf0: am ff1e1d99: am 240d5638: am c1f3d4c1: Merge "Fix 64 bit ↵Glenn Kasten2014-03-191-12/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | 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-12/+12
| |\ \ | | |/ | | | | | | | | | * commit 'c1f3d4c1ba7903d1b72c2341b5284da12b79ee46': Fix 64 bit compile failures in renderscript
| | * Fix 64 bit compile failures in renderscriptNarayan Kamath2014-03-191-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 62d675c2: am 0d3548be: am d138029d: am 14420e29: Merge "AArch64: Use ↵Narayan Kamath2014-02-281-75/+145
|\ \ \ | |/ / | | | | | | | | | | | | | | | 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-281-75/+145
| |\ \ | | |/ | | | | | | | | | * commit '14420e29abc0f16f818ddaf606515861ba69ae68': AArch64: Use long[] for RS id array
| | * AArch64: Use long[] for RS id arrayAshok Bhat2014-02-121-75/+145
| | | | | | | | | | | | | | | Change-Id: Ia5145a547c0d13c7d6f1bb4d8f5472be62481bd9 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | Fix includes so that they no longer rely on the global Skia includes ↵Derek Sollenberger2014-02-272-6/+2
| | | | | | | | | | | | | | | | | | | | | directories. bug:13225538 Change-Id: Ia5d816dc665f81c7985f21036af4fd0a63c560cf
* | | Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."Andreas Huber2014-02-131-1/+0
| | | | | | | | | | | | | | | | | | This reverts commit 7825334929b098b36e1144872200e75ba6d24b13. Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
* | | Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.Andreas Huber2014-02-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv() thus minimizing build dependencies. Change-Id: Ia7f0c94c8c02b974c068e0db34774827f96aa95b
* | | am 33a608a0: am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers ↵Narayan Kamath2014-02-101-54/+53
|\ \ \ | |/ / | | | | | | | | | | | | | | | in RS Java/JNI code" * commit '33a608a0a326d9671bffd6750cb5521d6687cc57': AArch64: Use long for pointers in RS Java/JNI code
| * | am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"Narayan Kamath2014-02-101-54/+53
| |\ \ | | |/ | | | | | | | | | * commit '56062983f1e07295c812fba0e22ce579a35b6f76': AArch64: Use long for pointers in RS Java/JNI code
| | * AArch64: Use long for pointers in RS Java/JNI codeAshok Bhat2014-02-051-54/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | 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 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 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-312-0/+1698
| | | | 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
* Fix debug context.Tim Murray2014-01-101-4/+4
| | | | | | bug 12477551 Change-Id: Icac28abc3dabce31834faa1942b596c2f207f29e
* Fix most logging macros for context pointers.Tim Murray2014-01-081-89/+89
| | | | Change-Id: I7f4a8db4f3a52c368cc32ce0428f8001df8a4166
* 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-172-0/+1698
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d
generated by cgit v1.1 at 2025-01-07 07:02:20 +0000