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

81 Commits

Author SHA1 Message Date
Tim Murray
c13160a5c1 Fix typo with register native allocation. 
bug 18579193

Change-Id: I42d30709b79a37d6a4126559a511e98e9c8d4808
 2014-12-16 10:13:05 -08:00
Tim Murray
eae2472985 Enable native tracking for RS contexts to improve GC behavior. 
This should prevent apps from leaking RS contexts as easily.

bug 18579193

Change-Id: I2d943ce4443ce7cb90ebdd3dd37d338eda6df3a2
 2014-12-12 13:30:15 -08:00
Tim Murray
b730d866a0 Fix IO_INPUT with 64-bit. 
bug 16846318
bug 17006933

Change-Id: Ic13ef26875d8a6fab1ffb542d62038b768a536ff
 2014-08-18 18:14:32 -07:00
Tim Murray
cd38b763d5 Allocation.resize() should throw an exception in API 21+. 
bug 16846318

Change-Id: I852331ec226e4cad8be79aa27c4b51183e97cc1d
 2014-08-14 13:41:02 -07:00
Tim Murray
8fdcf4a08a Fix broken blend intrinsic. 
Change-Id: I3a1749aed701e17b48c267ca749c9cf29ca12e43
 2014-07-10 13:00:10 -07:00
Tim Murray
3de3dc79e5 Update copyFrom(BaseObj[]) for large objects. 
Change-Id: I99cadbd1ad925cad0dd357c9abbd1a49c07785c9
 2014-07-09 15:30:42 -07:00
Stephen Hines
48ba506dfa resolved conflicts for merge of 31012e2c to master 
Change-Id: I2e24e0457570d7d856293637a553f0242a97a83b
 2014-07-09 07:39:38 -07:00
Chris Wailes
949610653f 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
 2014-07-07 12:27:21 -07:00
Jason Sams
7165bd6d74 Merge "Add check and throw for failed Intrinsic init." 2014-06-25 17:35:00 +00:00
Jason Sams
346d97112e am 6b52ca59: am 89e4c715: am 7165bd6d: Merge "Add check and throw for failed Intrinsic init." 
* commit '6b52ca5949545dcb654672663e2187a70b04f442':
  Add check and throw for failed Intrinsic init.
 2014-06-26 00:32:03 +00:00
Tim Murray
6e45f30718 Remove @hide for new RS constructors. 
Change-Id: I015f36e8c54663472f236e311fe279ce06261ff0
 2014-06-25 09:20:57 -07:00
Stephen Hines
fcb3161e57 We need to update mPos when we copy a FieldPacker via its data[] member. 
Bug: 15756600

This change also adds a TODO/FIXME related to subAlign() and our tracking
mechanism for it. We need to further investigate how to make subAlign() work
properly if a user copies their FieldPacker.

Change-Id: I861e529abd11e378f7c73b510d7f418b940fe480
 2014-06-23 17:35:04 -07:00
Jason Sams
1c8da1ccce Add check and throw for failed Intrinsic init. 
Change-Id: Icd53b3edd8e887d3692e5815dc0c38cd68b7aeb1
 2014-06-23 15:15:08 -07:00
Stephen Hines
71b676bc95 am ed24d3f2: am db3bcfb8: am 44023a4f: Merge "We need to update mPos when we copy a FieldPacker via its data[] member." 
* commit 'ed24d3f2e991906973afce8aa6a3fa54f4a3e4df':
  We need to update mPos when we copy a FieldPacker via its data[] member.
 2014-06-24 10:38:45 +00:00
Stephen Hines
b02dadd47c Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP." 2014-06-18 22:48:04 +00:00
Stephen Hines
fa1275a6e7 Create FieldPacker.getPos() to get the actual amount of data used for FP. 
We need larger buffers to handle 64-bit RS object types, but 32-bit code
will never fill all of the getData().length bytes. This allows us to retain
our verification code.

We have to modify an existing use of FieldPacker that was doing partial
updates of the underlying buffer. This was really relying on the old data
to be implicitly selected and written back, but that is not guaranteed by
the original API. This also required a fix to the FieldPacker.reset() API,
which was not allowing the FieldPacker to ever point to the final entry in
its buffer.

Change-Id: Idcd52790ac2b0ab1eff3f043e7eec2832953f04b
 2014-06-18 00:24:44 -07:00
Jason Sams
b49dfeaea9 Fix element size on 64b 
RenderScript Element types know their own size.  This
change properly tracks the new object sizes.

Change-Id: I3cbf76a7ec5f68056ed5599e9406cea05ba86969
 2014-06-18 13:17:57 -07:00
Stephen Hines
7f22d01545 am c5b11fcc: am ff83ed2d: am b02dadd4: Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP." 
* commit 'c5b11fcc1f4fc4fba988218d0a99a19690398a56':
  Create FieldPacker.getPos() to get the actual amount of data used for FP.
 2014-06-19 03:26:15 +00:00
Jason Sams
864b75be51 am 3aa4de11: am 802aaf3b: am 47de3060: Merge "Fix element size on 64b" 
* commit '3aa4de11b05599d75af92a15820731144941c38f':
  Fix element size on 64b
 2014-06-18 23:14:14 +00:00
Stephen Hines
6b605045b1 Merge "Switch from Droid -> Noto for RS fonts." 2014-06-17 20:55:27 +00:00
Stephen Hines
6f09d08a26 Switch from Droid -> Noto for RS fonts. 
Bug: 15436348
Change-Id: Ie62092538c7d865dcaba668392a4397baef725ec
 2014-06-11 17:57:16 -07:00
Tim Murray
eb2b52ffaf am 604ea0e4: am b1c9430c: am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit." 
* commit '604ea0e415faa2466ab6c89372001d6c93ad0d98':
  Move FieldPacker over to use large objects on 64-bit.
 2014-06-12 23:13:28 +00:00
Tim Murray
b1c9430c87 am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit." 
* commit '77d28ca25378530f92d409fbd72a38a1e256b59f':
  Move FieldPacker over to use large objects on 64-bit.
 2014-06-12 23:05:16 +00:00
Tim Murray
4154bbd69b Move FieldPacker over to use large objects on 64-bit. 
Change-Id: I1d4d502a3f9d86c6cf0f516cc087b1457f86ac28
 2014-06-12 14:23:19 -07:00
Tim Murray
08d3775cbe am b43bc047: Merge "Change flags to use int instead of long." into lmp-preview-dev 
* commit 'b43bc0475490fe2a20c2ddeed1c34b55b8f8a152':
  Change flags to use int instead of long.
 2014-06-06 22:41:22 +00:00
Tim Murray
fd710e705a Change flags to use int instead of long. 
bug 15429629

Change-Id: Ideb983b17aa3c146d23f2be6bb0e9808cb6725b7
 2014-06-06 11:10:45 -07:00
Tim Murray
fdb15a76a3 DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c
 2014-06-04 10:25:54 -07:00
Tim Murray
56f9e6f8d5 Add support for mixed 32/64 APKs using RenderScript. 
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
 2014-06-03 15:11:37 -07:00
Tim Murray
1afc29ae38 Merge "Add support for mixed 32/64 APKs using RenderScript." 2014-06-03 21:36:19 +00:00
Tim Murray
f0c62b2676 Add support for mixed 32/64 APKs using RenderScript. 
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
 2014-06-03 12:30:53 -07:00
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
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
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
Jason Sams
a4af5726c4 am 112d1b94: Merge "Add BiCubic resize instrinsic" 
* commit '112d1b94ee8456dba16842e6b964eb35aef95818':
  Add BiCubic resize instrinsic
 2014-04-17 17:02:10 +00: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