| bb7e86ff0478ef9ea2e35065bfcb2d6e9ffa9292 |
|
03-Dec-2014 |
Jason Sams <jsams@google.com> |
Fix bug in passing of context flags and version.
bug 18592099
Change-Id: Id20906f6f47b573d881025453a3b6356bcf6e9c7
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| 3aa89c1e243a2fae2b9d98fdbad574227c5b5bfa |
|
19-Aug-2014 |
Tim Murray <timmurray@google.com> |
Stop sign-extending RS IDs.
bug 16846318
bug 17006933
Change-Id: I6b1e73ed983ec583e80dc532e38c2ae2e504e608
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| 48ba506dfa591d0bcd79a088457eb95a9bd4c575 |
|
09-Jul-2014 |
Stephen Hines <srhines@google.com> |
resolved conflicts for merge of 31012e2c to master
Change-Id: I2e24e0457570d7d856293637a553f0242a97a83b
|
| 949610653fdf55dd2cb3c846047e6aa2c6d73f0d |
|
11-Jun-2014 |
Chris Wailes <chriswailes@google.com> |
Adds support for multi-input kernels to Frameworks/Base/RS.
* 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
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| bc5d3eeedcbdff2e8331a6792902c6992db9bd31 |
|
25-Jun-2014 |
Stephen Hines <srhines@google.com> |
Switch from size_t -> uint32_t for dimensions array.
Change-Id: I159586e98dd47be9b9f5db0f3e27d1072533134c
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| ed38a32d3700bb36fa4c02f4d4ce1afa0f506471 |
|
25-Jun-2014 |
Stephen Hines <srhines@google.com> |
am af97f87a: am 6d38cec1: am 924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array."
* commit 'af97f87a477efa05905134baa01bc6b5222b2448':
Switch from size_t -> uint32_t for dimensions array.
|
| 56f9e6f8d5436d50530807950661e66ca5efe2bb |
|
16-May-2014 |
Tim Murray <timmurray@google.com> |
Add support for mixed 32/64 APKs using RenderScript.
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| 1afc29ae3895f7362e50f1d7b9f35bb689c96140 |
|
03-Jun-2014 |
Tim Murray <timmurray@google.com> |
Merge "Add support for mixed 32/64 APKs using RenderScript."
|
| f0c62b26765f1e0ec0df8fceeecb77fca690c29a |
|
16-May-2014 |
Tim Murray <timmurray@google.com> |
Add support for mixed 32/64 APKs using RenderScript.
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| 9deecdc88f77d8a4a8ff25c1ef2405b42a05ce81 |
|
18-Apr-2014 |
Stephen Hines <srhines@google.com> |
am fc45b664: am f0aa4cc0: am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."
* commit 'fc45b664d421553042629d24086a144761c7b5e1':
Fix improper use of JNI_ABORT for operations where Java objects are written.
|
| f0aa4cc0f257448f76e9d90b97abf9682e930fbf |
|
17-Apr-2014 |
Stephen Hines <srhines@google.com> |
am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."
* commit 'a48985349cb26757b6c4be18acc496ab6d1110e5':
Fix improper use of JNI_ABORT for operations where Java objects are written.
|
| 414fa2c93a763dce6b3adf898fbc68cf13667c07 |
|
17-Apr-2014 |
Stephen Hines <srhines@google.com> |
Fix improper use of JNI_ABORT for operations where Java objects are written.
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
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| 5341f881e0372c1c2af570d42fbe61a6500f315c |
|
19-Mar-2014 |
Glenn Kasten <gkasten@android.com> |
am 4f346bf0: am ff1e1d99: am 240d5638: am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript"
* commit '4f346bf0ffe1c596ca261dfec23c50977de77d82':
Fix 64 bit compile failures in renderscript
|
| 240d56386377f3bcd554a2cc07e0c3e336103c86 |
|
19-Mar-2014 |
Glenn Kasten <gkasten@android.com> |
am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript"
* commit 'c1f3d4c1ba7903d1b72c2341b5284da12b79ee46':
Fix 64 bit compile failures in renderscript
|
| 78c0ce56129d8109fa2427de769f4d25a971d162 |
|
19-Mar-2014 |
Narayan Kamath <narayan@google.com> |
Fix 64 bit compile failures in renderscript
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
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| 11e4317555fdabeecf28fe8a70bfecb216224ad1 |
|
28-Feb-2014 |
Narayan Kamath <narayan@google.com> |
am 62d675c2: am 0d3548be: am d138029d: am 14420e29: Merge "AArch64: Use long[] for RS id array"
* commit '62d675c240fd87cb987c86ae4f6ac17dc13374c8':
AArch64: Use long[] for RS id array
|
| d138029d92e1d4657815747f30004323061d34de |
|
28-Feb-2014 |
Narayan Kamath <narayan@google.com> |
am 14420e29: Merge "AArch64: Use long[] for RS id array"
* commit '14420e29abc0f16f818ddaf606515861ba69ae68':
AArch64: Use long[] for RS id array
|
| eece0dda56ae29fff6e9003df97594f6ac50b6e2 |
|
27-Feb-2014 |
Derek Sollenberger <djsollen@google.com> |
Fix includes so that they no longer rely on the global Skia includes directories.
bug:13225538
Change-Id: Ia5d816dc665f81c7985f21036af4fd0a63c560cf
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| 9807155b11a25fb6068edc9b1cd82928ac2f05de |
|
12-Feb-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Use long[] for RS id array
Change-Id: Ia5145a547c0d13c7d6f1bb4d8f5472be62481bd9
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| f152d950854e3052c5d73aefa43d377c10d7d814 |
|
10-Feb-2014 |
Narayan Kamath <narayan@google.com> |
am 33a608a0: am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
* commit '33a608a0a326d9671bffd6750cb5521d6687cc57':
AArch64: Use long for pointers in RS Java/JNI code
|
| 578d4f5f50b3b8969125376d696e893dc355faa6 |
|
10-Feb-2014 |
Narayan Kamath <narayan@google.com> |
am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
* commit '56062983f1e07295c812fba0e22ce579a35b6f76':
AArch64: Use long for pointers in RS Java/JNI code
|
| 0e0c0885aed99a119052a792becb5a0c5a93632d |
|
04-Feb-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Use long for pointers in RS Java/JNI code
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>
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| 67d9e0be8e4ff709c03865c3b4ac9f40d5dcfdbb |
|
03-Feb-2014 |
Tim Murray <timmurray@google.com> |
am 0cc37f4c: Merge "Fix debug context."
* commit '0cc37f4cdeaed95e4f61f1a6e7b78f07e7025e97':
Fix debug context.
|
| 42955bab2a275f3ea22d5a50b556cec88697a573 |
|
03-Feb-2014 |
Tim Murray <timmurray@google.com> |
am d8b4dd95: Merge "Fix most logging macros for context pointers."
* commit 'd8b4dd9555e987df92206562061080b327598f41':
Fix most logging macros for context pointers.
|
| 16e9362e5f5b4f09a46198218380bb386fee28e5 |
|
03-Feb-2014 |
Tim Murray <timmurray@google.com> |
am 8fced317: Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs."
* commit '8fced3174ad45e5d618f28c82d69bd21261f6108':
Move RenderScript from graphics/ to new fw/base subdirectory rs.
|
| b75c27e8704f3933601afba5a9f719de2b927355 |
|
10-Jan-2014 |
Tim Murray <timmurray@google.com> |
Fix debug context.
bug 12477551
Change-Id: Icac28abc3dabce31834faa1942b596c2f207f29e
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| e926dddb21392f6391dee56fa509d60cb6ee18c4 |
|
08-Jan-2014 |
Tim Murray <timmurray@google.com> |
Fix most logging macros for context pointers.
Change-Id: I7f4a8db4f3a52c368cc32ce0428f8001df8a4166
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| 355707e4f665904e31d9f5fcff1e3921f7db8cdd |
|
17-Dec-2013 |
Tim Murray <timmurray@google.com> |
Move RenderScript from graphics/ to new fw/base subdirectory rs.
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| 36bef0bf30d6bae48cf3837df351075ca4fce654 |
|
20-Jan-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Make graphics classes 64-bit compatible
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
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| 7023df08f14ec5dee76ac54c03e870f84e297636 |
|
27-Jan-2014 |
Narayan Kamath <narayan@google.com> |
Revert "AArch64: Make graphics classes 64-bit compatible"
This reverts commit 18b4cbeedef21c1fa666a110a157bab66edff976.
Change-Id: I0c52983a3ab1ace3ff743de546a43eca28e5cb0e
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| 18b4cbeedef21c1fa666a110a157bab66edff976 |
|
20-Jan-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Make graphics classes 64-bit compatible
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
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| 5eaf468434e96bc7c8d4cfeb138699a1c7b256ca |
|
10-Jan-2014 |
Tim Murray <timmurray@google.com> |
Fix debug context.
bug 12477551
Change-Id: Icac28abc3dabce31834faa1942b596c2f207f29e
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| 71a01b8648a440d4773acf0d2376d015c129ebb5 |
|
08-Jan-2014 |
Tim Murray <timmurray@google.com> |
Fix most logging macros for context pointers.
Change-Id: I7f4a8db4f3a52c368cc32ce0428f8001df8a4166
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| a0eabfbc413cf6ee0659ac19243efc5ba2d0f733 |
|
19-Dec-2013 |
Stephen Hines <srhines@google.com> |
Fix improper declaration/use of pointer.
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
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|
| d1576fb039f018ea4d55abbb2c03d542011be399 |
|
17-Dec-2013 |
Tim Murray <timmurray@google.com> |
Move RenderScript from graphics/ to new fw/base subdirectory rs.
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
|