History log of /frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
f35ddc9843af8979944a41237e3ad72248894c26 04-Apr-2017 Miao Wang <miaowang@google.com> [RenderScript] Connect ANativeWindow to BufferQueue before calling
AllocationSetSurface.

Bug: 34334222
Test: mm, boot Sailfish, CTS pass and ImageProcessingJB works well.
Change-Id: I77e7fb69987a347862286299622343b4f7879ab0
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
34cca21eac17d70c6558987c717f5d52247bb4a2 09-Mar-2017 Pawin Vongmasa <pawin@google.com> Make IGraphicBufferProducer a hybrid interface.

android::IGraphicBufferProducer will now become a hybrid
interface on
top of the HIDL interface
android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer.

Test: With CtsMediaTestCases.apk installed,
adb shell am instrument -e size small -w
'android.media.cts/android.support.test.runner.AndroidJUnitRunner'

Bug: 33854657
Change-Id: Ia8914ea49d2acf3d43682982a164d7e10f7b8542
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
1e95fc86581514c718fc96367f6d575e87fecffb 05-Mar-2017 Miao Wang <miaowang@google.com> [RenderScript] Update RenderScript JNI with the corresponding
AllocationGetSurface driver implementation change.

- AllocationGetSurface now returns opaque handle to ANativeWindow*,
instead of IGraphicBufferProducer*, as IGraphicBufferProducer is not
part of NDK. So the JNI side need to change accordingly.

Bug: 34396220
Test: mm, CTS tests pass.
Change-Id: If9b6a733202d29bc40c0e0b87c4fb48db092cbe5
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
33287e8a893821be86b395ce9d5d639cc8a535f3 06-Mar-2017 Miao Wang <miaowang@google.com> [RenderScript] Use ANativeWindow_fromSurface to get ANativeWindow
from Java Surface.

- ANativeWindow_fromSurface and ANativeWindow_release has to be used in
pairs to avoid leaks.

Bug: 34396220
Test: mm, CTS tests pass.
Change-Id: Id67fd005a056df4d496a48f705d445a2d8c45232
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
cbb0206cb478c862cb871a65e85115281ef12e02 25-Jan-2017 Miao Wang <miaowang@google.com> Update RenderScript JNI code for Treble

- Include rsApiStubs.h instead of rs.h, and remove unused
dependencies for rs.h in Android.mk.
- Remove libRSDriver.so from LOCAL_REQUIRED_MODULE, since it is not
required nor directly used by librs_jni.so.
- Fix the discrepancy in ElementGetNativeData and
ElementGetSubElements, respective to NDK APIs exposed in libRS.so.

rsApiStubs.h contains all public RenderScript APIs exposed in libRS.so.
It fixes the mismatch of the declarations and definitions of the two
functions mentioned above. And it does not rely on the auto generated
header (rsgApiFuncDecl.h) anymore.

Bug: 34396220
Test: mm
Merged-In: Iedb1b976cfa9033dccefe78cbe80c8022f990e53
Change-Id: Iedb1b976cfa9033dccefe78cbe80c8022f990e53
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
b742fcc808165fbeeb1a48761e7d629f60207de2 06-Oct-2016 Miao Wang <miaowang@google.com> Correctly pass number of input allocations for BLAS

Bug: 31992305

Test: Build and CTS RsBlas test pass on Angler.
Change-Id: If49c0be003d9c2a2175924dc3303703b9ab49357
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
8e988ec8d8f509023e5fda40ac93dc7cf9f9cc4a 14-Jun-2016 David Gross <dgross@google.com> Merge \"Delete simple reduction implementation.\" into nyc-dev
am: d749245b88

Change-Id: I28a4e52a41678ecb10b0869566e1cb79d4287b60
4a4578530a1a5fb751ea5a7bfbff83f3ab669895 02-Jun-2016 David Gross <dgross@google.com> Delete simple reduction implementation.

Bug: 27298560
Change-Id: I8a89c9df753d12ee8af06008d424e77bb916cd8f
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
86c5c2dab70b03bf0823ef4d9167b0a6b69c0742 25-Mar-2016 Yang Ni <yangni@google.com> Silence clang static analyzer warnings

Bug: 27272549

Avoid uninitialized struct fields.
Avoid unused variables.
Avoid alloca(0).

Change-Id: I19a826aabaa4032caf728e16d242f5bb77f2b450
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
2b551f4c421e9eec0cfc00f50d3a0c8027685ad7 16-Mar-2016 Yang Ni <yangni@google.com> Use proper ScriptCall size in nScriptForEach()

Bug: 26498479

Although the size of struct ScriptCall is not used underneath in the
runtime or drivers, assign the correct value here to avoid confusion.

Change-Id: I8db19538b9f70f3bf9ee849a8724da3d9ee04785
(cherry picked from commit e8f2e445fdb138416043a16659bbf86fbbd3fff8)
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
e8f2e445fdb138416043a16659bbf86fbbd3fff8 16-Mar-2016 Yang Ni <yangni@google.com> Use proper ScriptCall size in nScriptForEach()

Bug: 26498479

Although the size of struct ScriptCall is not used underneath in the
runtime or drivers, assign the correct value here to avoid confusion.

Change-Id: I8db19538b9f70f3bf9ee849a8724da3d9ee04785
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
5a6d9b6656b3ebd8956c4a129b17c372585d23a9 08-Mar-2016 Yang Ni <yangni@google.com> Merge "Revert "Set flags in RS JNI calls for rsObj creation""
8c8daea2efe0f545f570e475250e37a6eb1cb910 08-Mar-2016 Yang Ni <yangni@google.com> Revert "Set flags in RS JNI calls for rsObj creation"

This reverts commit ad88055821a7aba3318f066c4e5f87bd0315462c.

Change-Id: I53a3f59022e2607216f4dd89bc2e28e0bd987785
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
267fc8b3617d7facaac60425b8675aa6d74da7ba 08-Mar-2016 Yang Ni <yangni@google.com> Merge "Revert "Set flags in RS JNI calls for rsObj creation"" into nyc-dev
3f3965ec13c2dd22d0bc5c37c2d189c7c10c87e5 08-Mar-2016 Yang Ni <yangni@google.com> Revert "Set flags in RS JNI calls for rsObj creation"

This reverts commit 972a409a3df6f105aa99a3d721e37111c70ef44c.

Change-Id: Icdac5cebf9944e7b237c91db05e5a7f47b6b67e8
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
1333215d8e61c1cbcabb551ac9a49a801f90ca76 02-Mar-2016 Pirama Arumuga Nainar <pirama@google.com> [RenderScript] Enable untyped variants of Allocation-copy functions for FLOAT_16

http://b/27251511

Handle FLOAT_16 case to PER_ARRAY_TYPE macro to enable untyped variants
of Allocation-copy functions.

Untyped variants of Allocation-copy functions call
validateObjectIsPrimitiveArray(), with checkType parameter set to true,
to validate and obtain the Element type of the Allocation. When
checkType is true, validateObjectIsPrimitiveArray() returns the actual
Element type of the Allocation (instead of the canonical SIGNED type).
Because of this, FLOAT_16 element type can reach the JNI layer,
necessitating this change to PER_ARRAY_TYPE macro.

Change-Id: I3651e5ae0ab0cd6bb4ad3157841e2910ac8699dc
(cherry picked from commit 85e8c51dbf8dc774ecfd09981ac6a8bf1b75f464)
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
a2dde698a6e08d40aa09692201593e7d3d04aabb 03-Mar-2016 Pirama Arumuga Nainar <pirama@google.com> Merge "[RenderScript] Enable untyped variants of Allocation-copy functions for FLOAT_16" into nyc-dev
972a409a3df6f105aa99a3d721e37111c70ef44c 07-Jan-2016 Yang Ni <yangni@google.com> Set flags in RS JNI calls for rsObj creation

Bug: 25570907

Added a flag to all RS runtime API for rsObj creation to indicate a
call is from Java. This flag will help us avoid incrementing the user
ref count for rsObj's created from Single-Source RS, and therefore
avoid memory leaks for such objects.

Change-Id: Id3604f93b166089e3aca896d1c6c509b3ea19bcf
(cherry picked from commit ad88055821a7aba3318f066c4e5f87bd0315462c)
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
85e8c51dbf8dc774ecfd09981ac6a8bf1b75f464 02-Mar-2016 Pirama Arumuga Nainar <pirama@google.com> [RenderScript] Enable untyped variants of Allocation-copy functions for FLOAT_16

http://b/27251511

Handle FLOAT_16 case to PER_ARRAY_TYPE macro to enable untyped variants
of Allocation-copy functions.

Untyped variants of Allocation-copy functions call
validateObjectIsPrimitiveArray(), with checkType parameter set to true,
to validate and obtain the Element type of the Allocation. When
checkType is true, validateObjectIsPrimitiveArray() returns the actual
Element type of the Allocation (instead of the canonical SIGNED type).
Because of this, FLOAT_16 element type can reach the JNI layer,
necessitating this change to PER_ARRAY_TYPE macro.

Change-Id: I3651e5ae0ab0cd6bb4ad3157841e2910ac8699dc
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
ad88055821a7aba3318f066c4e5f87bd0315462c 07-Jan-2016 Yang Ni <yangni@google.com> Set flags in RS JNI calls for rsObj creation

Bug: 25570907

Added a flag to all RS runtime API for rsObj creation to indicate a
call is from Java. This flag will help us avoid incrementing the user
ref count for rsObj's created from Single-Source RS, and therefore
avoid memory leaks for such objects.

Change-Id: Id3604f93b166089e3aca896d1c6c509b3ea19bcf
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
f94e77da7e6634937d65a9a608c504de91b53f1c 11-Feb-2016 Miao Wang <miaowang@google.com> [RenderScript] Fix potential leak in RS JNI

Bug: 27145639
Change-Id: I80cf2971d803a3366a63caa3612a503a88639040
(cherry picked from commit a4ad5f840173ecbfb679153a4f9460d2b06538e7)
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
a4ad5f840173ecbfb679153a4f9460d2b06538e7 11-Feb-2016 Miao Wang <miaowang@google.com> [RenderScript] Fix potential leak in RS JNI

Bug: 27145639
Change-Id: I80cf2971d803a3366a63caa3612a503a88639040
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
8c1509249c5552270d8accc2c9512f499a8f5e2d 27-Oct-2015 Miao Wang <miaowang@google.com> [RenderScript] Implement APIs for better multi-frame process support.

Bug: 23535524

Two APIs added for multiframe processing:
- createAllocations(...): To create an array of Allocations sharing the
same Type and Usage. For USAGE_IO_INPUT Allocations, they also share
the same BufferQueue.
- getTimeStamp(): API to retrieve the time stamp associated with the
most recent buffer.

Change-Id: I6b7b35d7dca5e87ee2f3db2ee17cb9cf824bcfe1
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
ed50f333fb28905f085473d3150f906f0106295a 26-Jan-2016 Miao Wang <miaowang@google.com> Merge "[RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer"
0facf021ea1a0399d956372b9d3ad9025a9a04d2 25-Nov-2015 Miao Wang <miaowang@google.com> [RenderScript] Add API to map Allocation mallocptr to Java ByteBuffer

Bug: 25926361
Bug: 23535524

- Construct the ByteBuffer using the AllocationGetPointer.
- Add an API to query the stride of the allocation.
- Both ByteBuffer and Stride will be cached for normal Allocations.
if using USAGE_IO, since after each ioReceive, the mallocPtr will
change, getByteBuffer will always create a new one using the most
up-to-date mallocPtr.

Change-Id: I5e84b6690e83bb062c383043275524d0e51e46eb
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
26ef7a739b724452f93f850a1c268c42e439317b 12-Jan-2016 David Gross <dgross@google.com> Add general reduction plumbing starting with Java Script::reduce().

Requires coordinated change in frameworks/rs.

Bug: 23535724
Change-Id: I2fee6750cf542948d8fa87a98441002c4d84f36e
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
263cc90345784c3f60bf57c0de91afc4d6c3d5db 10-Nov-2015 Yang Ni <yangni@google.com> Various fixes in setting globals in a script group

Bug: 25602504

1) Passing floating point values into a script group was broken,
since they were casted to long values. Fixed that in the frameworks
implementation by taking the raw bits instead.

2) Passing 64-bit values into a script group was broken on 32-bit
platforms, since they were casted to pointer-sized integers
(uintptr_t) in the JNI code. Fixed that by casting to int64_t
instead.

3) Setting global variables of Allocation type in a script group was
broken. The special size value -1 was used to indicate the value is an
Allocation. However, size was casted to size_t in the JNI code.
Fixed that by using signed integers.

Change-Id: Ifff099a76be7707df7b67c388395f5a00f9cae66
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
ba8766c5db4b2c35f3461abf221e723e3bbbfa99 13-Oct-2015 Miao Wang <miaowang@google.com> [RenderScript] Add null check for return values of JNI
Get<TYPE>ArrayElements.

Bug: 20760800
Change-Id: I6ba56933a71721da88d31dbf74c48d42a924305a
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
05420e77f5358fc7a8996b39daf3aa976b826b53 01-Oct-2015 Miao Wang <miaowang@google.com> am 134c504a: Merge "[RenderScript] pass correct length of ains to BLAS functions"

* commit '134c504a3ea687a0ea875057792e66705ddbfce7':
[RenderScript] pass correct length of ains to BLAS functions
134c504a3ea687a0ea875057792e66705ddbfce7 01-Oct-2015 Miao Wang <miaowang@google.com> Merge "[RenderScript] pass correct length of ains to BLAS functions"
0b34f2a3c545cb112a23072c92214e359a8df8c6 01-Oct-2015 Miao Wang <miaowang@google.com> [RenderScript] pass correct length of ains to BLAS functions

bug: 24540091
Change-Id: Ia541bcbee07125c4caf3e0f4863702a3c0b929d5
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
b57dd722f1dc0663417da37d3a82f8283ad3c982 24-Sep-2015 Elliott Hughes <enh@google.com> resolved conflicts for a884d81e to stage-aosp-master

Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
76f6a86de25e1bf74717e047e55fd44b089673f3 19-Sep-2015 Daniel Micay <danielmicay@gmail.com> constify JNINativeMethod function pointer tables

Change-Id: I4036c924958221cbc644724f8eb01c5de3cd7954
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
b3a1674a47f8671f0e35e63c8d2ba7b3b73abc59 24-Jul-2015 Stephen Hines <srhines@google.com> am ed3ffe0f: am 6430812a: Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel."

* commit 'ed3ffe0fc86de016ff2b4231e2fcc74a6119f6c7':
RenderScript: implement a Script entry point for calling a reduce-style kernel.
36eb1f74b3d19d9dbae0803f3bc271683be811ce 21-Jul-2015 Matt Wala <wala@google.com> RenderScript: implement a Script entry point for calling a
reduce-style kernel.

Bug: 22631253

This adds a new (currently hidden) API to the Script class and the
corresponding code for the RenderScript JNI layer.

Change-Id: I40f19aaeb90411b859bd6b0bffc3f071fa327c21
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
c02720316d348434ef2ba78030dd8484be0b35f7 01-Jul-2015 Miao Wang <miaowang@google.com> resolved conflicts for merge of a1867fb0 to mnc-dev-plus-aosp

Change-Id: Id0266c63c98b4cb37f49eb2e0fb9a98cbc7ee1de
2514806817ec394d334595d76e20f3129117da6e 30-Jun-2015 Miao Wang <miaowang@google.com> [RenderScript] update the type of offsets for BLAS.BNNM

bug: 22184114

Change-Id: I7e7132aa3563f32de32640567b381f8f5bddf491
(cherry picked from commit 6099ee6e081904e73e0fad331e326b0607b6b1dc)
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
8374e25a9ee53ba6faa8d5a20e92506ef74c15a1 19-May-2015 Miao Wang <miaowang@google.com> am 77877609: Merge "[RenderScript] fix Allocation.copyToFieldPacker"

* commit '7787760961703239763afad9639517ce02259090':
[RenderScript] fix Allocation.copyToFieldPacker
7787760961703239763afad9639517ce02259090 19-May-2015 Miao Wang <miaowang@google.com> Merge "[RenderScript] fix Allocation.copyToFieldPacker"
bfa5e659e7b4cb49178d0e99712478b29f8301a7 05-May-2015 Miao Wang <miaowang@google.com> [RenderScript] fix Allocation.copyToFieldPacker

Change-Id: Iaba3333f9741238745fdb5c94f1b27b1015d50b2
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
af622b1a98f7d6a36cf858a6018fdf2daaf09034 09-May-2015 Chih-Hung Hsieh <chh@google.com> Merge "Fix print format error."
aa97de7501489dfe209c23c29867df45bfaced45 08-May-2015 Yang Ni <yangni@google.com> am 496c07d7: Merge "Moved limit constants for kernel and script group"

* commit '496c07d75425eebb3402abd76c3186fceb67d6b3':
Moved limit constants for kernel and script group
bce4220c365156abb77c969207fd5e9f555d2929 08-May-2015 Chih-Hung Hsieh <chh@google.com> Fix print format error.

Change-Id: I284c5e9c44f6dd56a7bb6ff93a1a86cc8f2deefa
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
496c07d75425eebb3402abd76c3186fceb67d6b3 08-May-2015 Yang Ni <yangni@google.com> Merge "Moved limit constants for kernel and script group"
e8cb7b32ac9e4dfd1d0a6fa2fa8ac41b5877a89a 30-Apr-2015 Miao Wang <miaowang@google.com> [RenderScript] typo fix in rs BLAS jni, to correctly handle complex
params.

Change-Id: Ie44f430dc7ed4155f40aa9f9c2864fb0429c97fe
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
9eb9dd326ae93cd84eb9bbc740f753fe8d8c7a13 06-May-2015 Chih-Hung Hsieh <chh@google.com> Fix clang warnings on unused variable, mismatched tag, print format.

BUG: 20890093
Change-Id: I91588f481d80b69823bc9d104b8bd09167ee5373
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
7b2a46fee0f95b9ae2485db36e0d279730623c4a 05-May-2015 Yang Ni <yangni@google.com> Moved limit constants for kernel and script group

b/20728113

so that we can share them with support lib.

Change-Id: I231c0d20c41ee53342d8a975c2db5a31854b9d40
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
d1516dffa8d676fcad092d9736163829e6d0fdce 06-May-2015 Jason Sams <jsams@google.com> Fix Allocation-less launches

Cherry-pick fix from AOSP. Error check for kernel launch was
generating a false positive.

bug 20690242


Change-Id: Ic4c6644072a11aab9a273070be5734519136f685
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
d5c780a7877d898452f47355abee64a82dc57038 05-May-2015 Jason Sams <jsams@google.com> Merge "Fix Allocation-less launches"
17c2d7a3e1fac8d8876262255eb24f2f81c8fbac 01-May-2015 Yang Ni <yangni@google.com> Sanity checks in JNI code for closure creation

b/20728113

In case the requested size for memory allocation overflows, or memory
allocation fails.

Change-Id: I8dac132dd4d0210938660ffbb82cbe44000d2a90
(cherry picked from commit 4e90b9b57cc96964a9d5c1845172a72cb51feafb)
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
4e90b9b57cc96964a9d5c1845172a72cb51feafb 01-May-2015 Yang Ni <yangni@google.com> Sanity checks in JNI code for closure creation

b/20728113

In case the requested size for memory allocation overflows, or memory
allocation fails.

Change-Id: I8dac132dd4d0210938660ffbb82cbe44000d2a90
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
8724d359bfe1f95fd4c558b55069e1624b461f28 30-Apr-2015 Miao Wang <miaowang@google.com> Merge "[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params." into mnc-dev
82585b3906955e57e199d962b8fe11b2bab87fba 30-Apr-2015 Miao Wang <miaowang@google.com> [RenderScript] typo fix in rs BLAS jni, to correctly handle complex
params.

Change-Id: Ie44f430dc7ed4155f40aa9f9c2864fb0429c97fe
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
ed207b92747234eac88dd3664ecfb535e45d8ed1 10-Apr-2015 John Reck <jreck@google.com> Change how Java Bitmaps are accessed in a few places

Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead

Attempt #2 to land this, original issue was in getSkBitmap
and should be fixed

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
8222a7ec81552276de1814541201c424b392d90b 21-Apr-2015 John Reck <jreck@google.com> Merge "Revert "Change how Java Bitmaps are accessed in a few places""
edc22fba5921f5c2d3502727e707f959b8c3a460 21-Apr-2015 John Reck <jreck@google.com> Revert "Change how Java Bitmaps are accessed in a few places"

Bug: 20207616

This reverts commit a771b9861d11671c780092d35c0062eeefcf37c0.

Change-Id: Ifd891cc075274a7986e987229e0fed5a04ed9ff0
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
bc5c64b72536ac78e6229e8a0423d774da77abe6 17-Apr-2015 Jason Sams <jsams@google.com> Fix Allocation-less launches

Change-Id: Ic4c6644072a11aab9a273070be5734519136f685
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
ef532f8435d47e68a3b718c861463e429b261682 16-Apr-2015 Tim Murray <timmurray@google.com> am 3d9c9093: am 91d2f27b: am 7f72f747: Merge "Add BNNM intrinsic."

* commit '3d9c9093d1d76d4aeb5f99b1746b65788c72736e':
Add BNNM intrinsic.
7f72f74766fed73ae9816fec6031a199f70d1428 16-Apr-2015 Tim Murray <timmurray@google.com> Merge "Add BNNM intrinsic."
9cb16a2f91c79845e5425fbf55f3b679fb18a4dd 01-Apr-2015 Tim Murray <timmurray@google.com> Add BNNM intrinsic.

Change-Id: I05fc9835786455e28d69f2b4ffe70c3292a01404
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
5024f20a85ed28e637fd61d0a2cb7c87a2e9322a 14-Apr-2015 Yang Ni <yangni@google.com> am 09339053: am 6ca1e45a: am 8704ae46: Merge "Add name to ScriptGroup2.Builder.create() method"

* commit '0933905375790eb850334b53fd6d0981bd40e007':
Add name to ScriptGroup2.Builder.create() method
35be56cce821d86f69026398ff9433e2d173b02f 03-Apr-2015 Yang Ni <yangni@google.com> Add name to ScriptGroup2.Builder.create() method

This name will be used to name the .so file generated for the
script group with fused kernels.

Change-Id: I46e351c8412740512f56b7915b14f36183c6eeaf
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
073f36c6c1bc937a55393f7fe9a21b95e822bfda 13-Apr-2015 John Reck <jreck@google.com> Merge "Change how Java Bitmaps are accessed in a few places"
a771b9861d11671c780092d35c0062eeefcf37c0 10-Apr-2015 John Reck <jreck@google.com> Change how Java Bitmaps are accessed in a few places

Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
9509bfe46a96a724a9166b115b287f16862b9fc5 10-Apr-2015 Tim Murray <timmurray@google.com> am 72fcf9eb: am af61d43d: am 6d718c2f: Merge "Add support for setting the cache directory."

* commit '72fcf9eb1079312afd7bdbee167c759109af4244':
Add support for setting the cache directory.
47f31582b67f492d9e1523abd0d8b86c38ec007d 08-Apr-2015 Tim Murray <timmurray@google.com> Add support for setting the cache directory.

Change-Id: I2bf1874705b877a8a8262ab49b47fe8241e603d5
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
249e6c8cd829f4de16cbdebd56b123d0bc0b88a6 01-Apr-2015 Yang Ni <yangni@google.com> am 02dff422: am 5db6f1fa: am 63dde9c8: Merge "Fix value size data type in closure creation."

* commit '02dff422a7734764e3ce00179f62ba115f2081a5':
Fix value size data type in closure creation.
4c93c8c93a66a8932d84a52bd922c3b7ad1565bb 26-Mar-2015 Yang Ni <yangni@google.com> Fix value size data type in closure creation.

b/19944127

Also added references to arguments and global values in a closure to
keep them live in Java while native code may access them.

Change-Id: I1179d34aa67f845578740e71cc2da4f82419f251
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
815bcb24b08b134dce3d7c89aacd086d3f586755 19-Mar-2015 Miao Wang <miaowang@google.com> am f8a69f56: am 2ef9955c: Merge "[RenderScript] Remove duplicate include in jni"

* commit 'f8a69f562b7f1c987b5eddd2ee13c04c1a787625':
[RenderScript] Remove duplicate include in jni
919b6475d3103e8beba2a2c34e51b657169838eb 19-Mar-2015 Miao Wang <miaowang@google.com> [RenderScript] Remove duplicate include in jni

Change-Id: Ib6019ab22a83d952dce3fd6f5351120d94b49d58
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
8ab7eb4c02dcebd31194de06cd11c8b056982ad0 13-Mar-2015 Jason Sams <jsams@google.com> am bb8c910f: am d2e4a166: Merge "Remove dead path code"

* commit 'bb8c910fc12f304c97c94ee86a3a3da56afe8374':
Remove dead path code
a7e2509d8da69ab1c9e14b4ce6608786c572209a 11-Mar-2015 Jason Sams <jsams@google.com> Remove dead path code

This API was never shipped and the implementation
never finished.

Change-Id: I2491db216d6a7a8ea30628d791773f89da5fb4d2
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
de770528ec18445175ea2a1d025988c73e62d7c7 08-Mar-2015 Miao Wang <miaowang@google.com> am 989e03f1: am c1e2bf95: am 4b5af9bc: Merge "[RenderScript] Update the java API about Allocation copyTo & From FieldPacker"

* commit '989e03f144e8031f33af08945e845283dddcc8ad':
[RenderScript] Update the java API about Allocation copyTo & From FieldPacker
b5c8004d6fe5bca9d40e97484bf0ba88c152d067 08-Mar-2015 Miao Wang <miaowang@google.com> am 449571c4: am 26f1a538: am 8b86ee9f: Merge "[RenderScript] Add missing variable"

* commit '449571c45e47e9b8d118c59dbd909b0d512f7e6d':
[RenderScript] Add missing variable
12d8a860b847170b3a751682efa151512e016542 08-Mar-2015 Miao Wang <miaowang@google.com> am ec89c1ea: am a61832c8: am 288e6f67: Merge "[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom."

* commit 'ec89c1ea731256cd0d71ee58733b2855e1e6e4fa':
[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom.
45cec0a9711f736df26fd097c6d74834e350f9bc 05-Mar-2015 Miao Wang <miaowang@google.com> [RenderScript] Update the java API about Allocation copyTo & From FieldPacker

Change-Id: I4e1b911d4cdfec8a841bc5a8bc615c64c50e8fc8
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
2cd0c340fc242e615a502f37512f08da78a12bf6 06-Mar-2015 Miao Wang <miaowang@google.com> [RenderScript] Add missing variable

Change-Id: I148bab3a8c3fb360d345549401d0ed579a37e971
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
f4faeac3525fe1ce3707ab785a1651aec367589d 05-Mar-2015 John Reck <jreck@google.com> Cleanup Bitmap JNI attempt #2

Original version missed a spot

This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b.

Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
c02977e3bbfaaedcb1b1d67e1692becc7dddd59b 05-Mar-2015 Chad Jones <chadj@google.com> Revert "Cleanup Bitmap JNI"

This reverts commit b2915245b74b3b5541b123e38403f8e26426b4b7.

Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
b2915245b74b3b5541b123e38403f8e26426b4b7 04-Mar-2015 John Reck <jreck@google.com> Cleanup Bitmap JNI

Fix a bunch of places where mNativeBitmap was being
poked at directly, switch them either to the NDK API
or to GraphicsJNI where it made sense

Change-Id: I6b3df3712d6497cba828c2d3012e725cb4ebb64d
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
87e908dfdece91b5f504386d4901fa3342dc8083 03-Mar-2015 Miao Wang <miaowang@google.com> [RenderScript] AutoPadding & Unpadding for Vec3 Elements during
copyTo & copyFrom.

Change-Id: I10b6fb235717e181ebb30b92e4dbe23e6183a29c
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
c8e237e27165c7f7855ed0b077cfe5f1e54908ef 21-Feb-2015 Miao Wang <miaowang@google.com> [Renderscript] JAVA API update for Allocation.CopyTo
add the following functions to make it more symmetric to copyFrom().

- copy1DRangeToUnchecked, copy1DRangeTo
- copy2DRangeToUnchecked, copy2DRangeTo
- copy3DRangeToUnchecked, copy3DRangeTo
- setFromFieldPacker, 2D and 3D variants
- copyElementTo, (1D, 2D & 3D)

Change-Id: I6b896123e1c00cead552aa5b31a701b15dd70f85
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
25207df658d6a8a3e885c7017fcc25702363583c 13-Jan-2015 Tim Murray <timmurray@google.com> Add BLAS intrinsic.

Change-Id: I95ddc46cb3f6217d2ead1091fd47450389544324
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
2a3cdf57a47140dfa17114338f83e0bb90054ed1 09-Feb-2015 Jason Sams <jsams@google.com> Merge "Implement array types"
46ba27e3fdcf1ce3b940e8b2ec90fcd2c9b7fe43 07-Feb-2015 Jason Sams <jsams@google.com> Implement array types

Change-Id: I1b83f21ea2aeaa4b9f5934aadcb69d4a1c1fea20
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
7ff53fa0d42795da55b65468e07df82029deda79 06-Feb-2015 Elliott Hughes <enh@google.com> Fix clang build.

Change-Id: If795820ef6431fee9c9c3862cc91ad4a9cc04507
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
be392ad35e29b17ed54fdbbbb8dd3e80fc1022b9 24-Jan-2015 Yang Ni <yangni@google.com> Adds invocable functions to ScriptGroup

This also includes InvokeID support

Change-Id: I5b59df166ea30b309b8dd9623825ac0e72d03856
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
ebf63408d2b5181aeb7d83adf0f7ab95946a16d4 16-Jan-2015 Yang Ni <yangni@google.com> Pass in code cache directory when creating a script group.

Change-Id: Ia73ea917a126a5055ec97f13d90a5feaafd6a2f5
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
14331ab1c3fd78c1204b41f27d62deb5c1b4acf2 27-Jan-2015 Jason Sams <jsams@google.com> Initialize clipping structure

placeholder until array clipping is added to the API.

Change-Id: Ib20dbd71989c559c0669385a5088ec261596913c
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
281c3252510bcf4120d17fa0125f369c2c78f162 24-Oct-2014 Yang Ni <yangni@google.com> New Script Group API.

Change-Id: I73d3572276a38dac775025b472ba229ad8770c84
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
81cd2b18bd36285d1843f78418282e1dad156fbd 02-Dec-2014 Jason Sams <jsams@google.com> Fix bug in passing of context flags and version.

Change-Id: Id20906f6f47b573d881025453a3b6356bcf6e9c7
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
09993f768bcb6dd9ed76b5c655da2ad9d0ad8396 17-Nov-2014 Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Fix format strings mismatching the parameters passed to them

Change-Id: Ia0d33aec9edadac60508fb422e0821e6d8f28afa
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
67333928bfea7d53d8bc1b83599532f6fe5e2b2c 11-Nov-2014 Andreas Gampe <agampe@google.com> Frameworks/base: Wall Werror in rs

Turn on -Wall -Werror in rs/. Fix warnings.

Change-Id: I41923e4578edf26dbf6a31a83b6999e80d6d385a
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
4a043c1853c117c1b4c4342e76cd16a5abdc1045 22-Aug-2014 Stephen Hines <srhines@google.com> resolved conflicts for merge of 5a2d0432 to lmp-dev-plus-aosp

Change-Id: I59be35e67ab2b4709f27c39916b6aebc1abba56f
053e36dfa381fe9b339c36dfed1ddbdd0e22ab3d 19-Aug-2014 Tim Murray <timmurray@google.com> am c9c78206: am 9ba9298e: Merge "Stop sign-extending RS IDs." into lmp-dev

* commit 'c9c7820604158bc6c6ba0e413cc48c8e1c0a6366':
Stop sign-extending RS IDs.
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
488230c3fec4fc55abc2ee1de7b8b51a4e89f9a5 14-Aug-2014 Chris Wailes <chriswailes@google.com> Replace NULL macros with nullptr literals.

Change-Id: I6c2af76f1f134d3f233d5462fed3969910ae2f24
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
93697c5f8eba2e0e9e67222f5505a6cd44416022 18-Aug-2014 Stephen Hines <srhines@google.com> am 4ae9a6d5: am 42895561: Merge "Collapse code paths for single- and multi-input kernels."

* commit '4ae9a6d5c517f67d9929cc43568c6b7e3b4dfe23':
Collapse code paths for single- and multi-input kernels.
be7b1defb6b11920703b241ba5815fb09487bb02 15-Jul-2014 Chris Wailes <chriswailes@google.com> Collapse code paths for single- and multi-input kernels.

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
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
42a33d5bbf228298bb1b0506ea711b890f326e9e 13-Aug-2014 Stephen Hines <srhines@google.com> am b75dc06b: am 4179e889: Merge "Revert "Collapse code paths for single- and multi-input kernels.""

* commit 'b75dc06bbe2fdff1a4c9baa69eb92a849c22715d':
Revert "Collapse code paths for single- and multi-input kernels."
c27ebda05e89e927a97f275791ab807743134a42 13-Aug-2014 Stephen Hines <srhines@google.com> am 5aaeb8e8: am 24a2ee66: Merge "Collapse code paths for single- and multi-input kernels."

* commit '5aaeb8e89eb0afd710ba9586f5e314b76e806116':
Collapse code paths for single- and multi-input kernels.
c9c7daf69b32c0e72a3b99379cc5116c1647f24e 13-Aug-2014 Stephen Hines <srhines@google.com> Revert "Collapse code paths for single- and multi-input kernels."

This reverts commit eb3470219dea322efa93eb4b5457813ce71d0c5d.

Change-Id: Id943abf953e832ef831318e6699d4b46e9b46201
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
eb3470219dea322efa93eb4b5457813ce71d0c5d 15-Jul-2014 Chris Wailes <chriswailes@google.com> Collapse code paths for single- and multi-input kernels.

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
/frameworks/base/rs/jni/android_renderscript_RenderScript.cpp
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
48ba506dfa591d0bcd79a088457eb95a9bd4c575 09-Jul-2014 Stephen Hines <srhines@google.com> resolved conflicts for merge of 31012e2c to master

Change-Id: I2e24e0457570d7d856293637a553f0242a97a83b
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