Tim Murray
4870c813fe
am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."
...
* commit '7d1a6c5cac16795e5953d2b4d34671e34e907632':
Fix destruction issues relating to AllocationAdapter.
2014-02-14 15:53:59 -08:00
Tim Murray
6d63c84f44
Fix destruction issues relating to AllocationAdapter.
...
bug 12971201
Change-Id: I3d9f66f527a35837ac866a695bdcc41d908a2562
2014-02-14 15:48:03 -08:00
Tim Murray
b25a6936a1
am d7043f00: Merge "Add hidden minor version ID for support lib workarounds."
...
* commit 'd7043f0084237200b6aab5d101c8ab6d3ab495c6':
Add hidden minor version ID for support lib workarounds.
2014-02-14 12:51:32 -08:00
Tim Murray
d7043f0084
Merge "Add hidden minor version ID for support lib workarounds."
2014-02-14 20:47:34 +00:00
Tim Murray
eaf8237418
am 38d799fc: Merge "Generic object based data copy."
...
* commit '38d799fc7a272c3c6ff7b9bc7b7f9239b45bf98c':
Generic object based data copy.
2014-02-10 15:29:55 -08:00
Tim Murray
38d799fc7a
Merge "Generic object based data copy."
2014-02-10 23:27:06 +00:00
Jason Sams
1136bb91b4
Generic object based data copy.
...
This change consolidates the copy paths to Object based.
The runtime now uses reflection to identify the type of
array present. This adds support for long/double and reduces
the amount of code present. We could also support arrays of vectors
or objects in the future with this mechanism.
Change-Id: I2297c1c01fbe6a64c375d6368f25d7db781ea788
2014-02-10 15:18:56 -08:00
Narayan Kamath
578d4f5f50
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
2014-02-10 05:37:18 -08:00
Narayan Kamath
56062983f1
Merge "AArch64: Use long for pointers in RS Java/JNI code"
2014-02-10 13:33:26 +00:00
Jean-Luc Brouillet
8067c9ec87
am 11e6cabc: Merge "Fix a typo."
...
* commit '11e6cabc66a5ecfc9dadbd68fc0a5ed7d2a4656d':
Fix a typo.
2014-02-07 11:11:28 -08:00
Jean-Luc Brouillet
d60799ec84
Fix a typo.
...
Change-Id: I770fe97ab0635de84d15393aca6bca57552f2f10
2014-02-07 11:04:26 -08:00
Tim Murray
67cc2d033e
Add hidden minor version ID for support lib workarounds.
...
Change-Id: I7940e32c78caaab351fb28d92e5fadbea6292b27
2014-02-06 17:07:05 -08:00
Ashok Bhat
0e0c0885ae
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>
2014-02-05 11:26:38 +00:00
Tim Murray
b1bec0d916
am 3fb6feac: Merge "Check that bound allocations are 1D"
...
* commit '3fb6feacc62e1021c705b53d46e915ecf50582d2':
Check that bound allocations are 1D
2014-02-03 14:41:39 -08:00
Tim Murray
67d9e0be8e
am 0cc37f4c: Merge "Fix debug context."
...
* commit '0cc37f4cdeaed95e4f61f1a6e7b78f07e7025e97':
Fix debug context.
2014-02-03 14:41:30 -08:00
Tim Murray
42e4aee598
am 0539b7b4: Merge "Enable asynchronous destruction of BaseObjs."
...
* commit '0539b7b4116622d33c91dbaa9a3040c7a3a703d6':
Enable asynchronous destruction of BaseObjs.
2014-02-03 14:41:27 -08:00
Tim Murray
42955bab2a
am d8b4dd95: Merge "Fix most logging macros for context pointers."
...
* commit 'd8b4dd9555e987df92206562061080b327598f41':
Fix most logging macros for context pointers.
2014-02-03 14:41:24 -08:00
Tim Murray
d39e19eb8a
am 351879df: Merge "Fix getBytesSize for YUV allocations."
...
* commit '351879df3aff02987a6f4c4485bf004a96fcb150':
Fix getBytesSize for YUV allocations.
2014-02-03 14:41:21 -08:00
Tim Murray
16e9362e5f
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.
2014-02-03 14:41:17 -08:00
Tim Murray
0e3431d4c7
DO NOT MERGE: Mark new util type functions as @hide in AOSP.
...
Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c
2014-01-31 14:05:20 -08:00
Jason Sams
cf9c894a9b
Check that bound allocations are 1D
...
We do not support higher order bound allocations. The
stride is not available to the script so they cannot
walk the allocation correctly.
Change-Id: I9447a5d43c3ae1b88fc9522628a17bd5a317ffc6
2014-01-31 12:35:19 -08:00
Tim Murray
b75c27e870
Fix debug context.
...
bug 12477551
Change-Id: Icac28abc3dabce31834faa1942b596c2f207f29e
2014-01-31 12:35:19 -08:00
Tim Murray
504abb3626
Enable asynchronous destruction of BaseObjs.
...
Change-Id: Iaddf8041a3c870a986ec8999e6ccc3aede38fc4c
Conflicts:
rs/java/android/renderscript/BaseObj.java
2014-01-31 12:35:18 -08:00
Tim Murray
e926dddb21
Fix most logging macros for context pointers.
...
Change-Id: I7f4a8db4f3a52c368cc32ce0428f8001df8a4166
2014-01-31 12:35:18 -08:00
Tim Murray
e6eaaf6a8e
Fix getBytesSize for YUV allocations.
...
bug 12134914
Change-Id: I128e75b756a5bd129077177e254f1db6c94182f1
2014-01-31 12:35:17 -08:00
Tim Murray
355707e4f6
Move RenderScript from graphics/ to new fw/base subdirectory rs.
...
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d
2014-01-31 12:35:17 -08:00