drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
136,488 Commits 1 Branch 0 Tags
Commit Graph

75 Commits

Author SHA1 Message Date
Jason Sams
b69c791b79 Validate RenderScript context creation flags 
Sync the IDs to that of the native interface.

Change-Id: I7516c1ea4f4a93844ddb8397b2fc1e79ff8d6b68
 2014-05-20 18:48:35 -07:00
Ying Wang
29894c6176 am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS." 
* commit 'db55bb0622e9fbe4b858d59409f516de01c1f1fd':
  Remove unused LOCAL_LDLIBS.
 2014-05-08 18:31:18 +00:00
Ying Wang
4463cbc61d am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS." 
* commit '3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3':
  Remove unused LOCAL_LDLIBS.
 2014-05-08 00:21:38 +00:00
Ying Wang
b38e3fdf5a Remove unused LOCAL_LDLIBS. 
Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
 2014-05-07 15:23:37 -07:00
Jason Sams
26e9051957 Add flags to context creation for RS 
We have a number of context options exposed though native
that were not available though the Java API.  This brings them
to parity.  Will finish plumbing in a follow on CL.

Change-Id: I8c65ee743d0e750e418304127b84088f25176c38
 2014-05-07 14:23:46 -07:00
Stephen Hines
9deecdc88f 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.
 2014-04-17 23:33:54 +00:00
Jason Sams
18033abaaf Unhide RenderScript resize intrinsic 
Change-Id: I450c83ad00bcb7d999aaf7d4bd7ea88d63ab8fea
 2014-04-17 13:52:26 -07:00
Jason Sams
c99a9b28ef am 5170476c: am a4af5726: am 112d1b94: Merge "Add BiCubic resize instrinsic" 
* commit '5170476c5bf470b57616380aa7b15b44e5a24bea':
  Add BiCubic resize instrinsic
 2014-04-17 19:36:40 +00:00
Stephen Hines
f0aa4cc0f2 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.
 2014-04-17 18:20:47 +00:00
Stephen Hines
a48985349c Merge "Fix improper use of JNI_ABORT for operations where Java objects are written." 2014-04-17 18:15:38 +00:00
Jason Sams
a4af5726c4 am 112d1b94: Merge "Add BiCubic resize instrinsic" 
* commit '112d1b94ee8456dba16842e6b964eb35aef95818':
  Add BiCubic resize instrinsic
 2014-04-17 17:02:10 +00:00
Stephen Hines
414fa2c93a 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
 2014-04-17 01:02:42 -07:00
Jason Sams
464af41b28 Add BiCubic resize instrinsic 
Change-Id: Iafec3f4260bb5d3a3133b034e42dfb0a94ae9f81
 2014-04-16 17:13:09 -07:00
Jason Sams
afec430ada am c796ccaa: am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem" 
* commit 'c796ccaafb935592b98d5aaad2594791935f6530':
  Fix RenderScriptGL setSurfaceTexture problem
 2014-04-01 00:24:57 +00:00
Jason Sams
095ece1009 am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem" 
* commit 'b3cafa56205942343930e4fbb0a3d50d6e33a046':
  Fix RenderScriptGL setSurfaceTexture problem
 2014-04-01 00:10:55 +00:00
Xiaofei Wan
21e0af987d Fix RenderScriptGL setSurfaceTexture problem 
rsnContextSetSurfaceTexture() has no implementation in rs-jni, use nContextSetSurface() in setSurfaceTexture().

Change-Id: I066432575c9e74f21ea3a3776628b572b6e31377
Signed-off-by: Xiaofei Wan <xiaofei.wan@intel.com>
 2014-03-31 14:40:08 +08:00
Glenn Kasten
5341f881e0 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
 2014-03-19 21:22:06 +00:00
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
Jason Sams
659a05a25c am edf0b79d: am 24ea88a9: am 9a9916b5: am 2383f220: Merge "Validate objects are from the correct context." 
* commit 'edf0b79d55df17fddb6b96de32f34ffccc8ec2d4':
  Validate objects are from the correct context.
 2014-03-06 02:29:06 +00:00
Jason Sams
9a9916b58f am 2383f220: Merge "Validate objects are from the correct context." 
* commit '2383f2200ab0c2dbd71708b5c1fb6af98db408fa':
  Validate objects are from the correct context.
 2014-03-05 16:56:02 -08:00
Jason Sams
678cc7fe9f Validate objects are from the correct context. 
Change-Id: I7d87b0e253b8d2e36d1aed790cfe3a7dd23e158f
 2014-03-05 16:09:02 -08:00
Tim Murray
8d2e9a0859 am 4db08b04: am 9f141fbb: am fb51a430: am 8377a4fd: Merge "Fix null check for BaseObj.equals." 
* commit '4db08b044dfbd01912353f0c85a43973407d98b0':
  Fix null check for BaseObj.equals.
 2014-03-03 20:55:31 +00:00
Tim Murray
fb51a4301c am 8377a4fd: Merge "Fix null check for BaseObj.equals." 
* commit '8377a4fd03d4fc367e0cb07af748ae941d9960a9':
  Fix null check for BaseObj.equals.
 2014-03-03 11:12:01 -08:00
Tim Murray
8377a4fd03 Merge "Fix null check for BaseObj.equals." 2014-03-03 19:09:08 +00:00
Tim Murray
78214c9531 Fix null check for BaseObj.equals. 
Change-Id: I4f060697db175cbf0b5617c1220db853bbe53f1f
 2014-02-28 16:57:47 -08:00
Narayan Kamath
11e4317555 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
 2014-02-28 13:35:07 +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
Narayan Kamath
14420e29ab Merge "AArch64: Use long[] for RS id array" 2014-02-28 13:22:26 +00:00
Derek Sollenberger
eece0dda56 Fix includes so that they no longer rely on the global Skia includes directories. 
bug:13225538
Change-Id: Ia5d816dc665f81c7985f21036af4fd0a63c560cf
 2014-02-27 14:31:29 -05:00
Tim Murray
12623f6527 am afb4f8f1: am 8e30d53b: am 4870c813: am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter." 
* commit 'afb4f8f144ef70360b70770e17e7d81571e7b296':
  Fix destruction issues relating to AllocationAdapter.
 2014-02-15 00:03:23 +00:00
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
b542e8e128 am bdb04f02: am 17b7ff4a: am b25a6936: am d7043f00: Merge "Add hidden minor version ID for support lib workarounds." 
* commit 'bdb04f025ce34b0240f01961c43d8156a78e27a2':
  Add hidden minor version ID for support lib workarounds.
 2014-02-14 23:41:24 +00: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
Andreas Huber
9ae000ca8c Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest." 
This reverts commit 7825334929b098b36e1144872200e75ba6d24b13.

Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
 2014-02-13 17:22:33 +00: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
Andreas Huber
7825334929 Split AndroidRuntime into AndroidRuntimeBase base-class and the rest. 
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
 2014-02-12 15:00:05 -08: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
f152d95085 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
 2014-02-10 13:45:15 +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
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
774220fa0b am ecc8ee64: am 8067c9ec: am 11e6cabc: Merge "Fix a typo." 
* commit 'ecc8ee649578c2bb859c639c361d5a24005b9200':
  Fix a typo.
 2014-02-10 12:51:01 +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