12 Commits

Author SHA1 Message Date
Glenn Kasten
240d563863 am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript"
* commit 'c1f3d4c1ba7903d1b72c2341b5284da12b79ee46':
  Fix 64 bit compile failures in renderscript
2014-03-19 14:05:20 -07:00
Narayan Kamath
78c0ce5612 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
2014-03-19 17:14:54 +00:00
Narayan Kamath
d138029d92 am 14420e29: Merge "AArch64: Use long[] for RS id array"
* commit '14420e29abc0f16f818ddaf606515861ba69ae68':
  AArch64: Use long[] for RS id array
2014-02-28 05:26:30 -08:00
Ashok Bhat
9807155b11 AArch64: Use long[] for RS id array
Change-Id: Ia5145a547c0d13c7d6f1bb4d8f5472be62481bd9
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-12 23:09:03 +00: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
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
67d9e0be8e am 0cc37f4c: Merge "Fix debug context."
* commit '0cc37f4cdeaed95e4f61f1a6e7b78f07e7025e97':
  Fix debug context.
2014-02-03 14:41:30 -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
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
b75c27e870 Fix debug context.
bug 12477551

Change-Id: Icac28abc3dabce31834faa1942b596c2f207f29e
2014-01-31 12:35:19 -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
355707e4f6 Move RenderScript from graphics/ to new fw/base subdirectory rs.
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d
2014-01-31 12:35:17 -08:00