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

115 Commits

Author SHA1 Message Date
Stephen Hines
4a043c1853 resolved conflicts for merge of 5a2d0432 to lmp-dev-plus-aosp 
Change-Id: I59be35e67ab2b4709f27c39916b6aebc1abba56f
 2014-08-21 23:20:32 -07:00
Tim Murray
053e36dfa3 am c9c78206: am 9ba9298e: Merge "Stop sign-extending RS IDs." into lmp-dev 
* commit 'c9c7820604158bc6c6ba0e413cc48c8e1c0a6366':
  Stop sign-extending RS IDs.
 2014-08-19 21:07:47 +00:00
Tim Murray
d0080ee004 am 7fa25bc1: am 3c02b020: Merge "Fix IO_INPUT with 64-bit." into lmp-dev 
* commit '7fa25bc1269d3ba2db79f32acb17d80194cbadce':
  Fix IO_INPUT with 64-bit.
 2014-08-19 21:07:42 +00:00
Tim Murray
3aa89c1e24 Stop sign-extending RS IDs. 
bug 16846318
bug 17006933

Change-Id: I6b1e73ed983ec583e80dc532e38c2ae2e504e608
 2014-08-18 18:14:54 -07: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
Chris Wailes
488230c3fe Replace NULL macros with nullptr literals. 
Change-Id: I6c2af76f1f134d3f233d5462fed3969910ae2f24
 2014-08-18 15:21:16 -07:00
Stephen Hines
93697c5f8e 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.
 2014-08-18 20:00:34 +00:00
Chris Wailes
be7b1defb6 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
 2014-08-18 08:03:52 -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
Stephen Hines
c9c7daf69b Revert "Collapse code paths for single- and multi-input kernels." 
This reverts commit eb3470219dea322efa93eb4b5457813ce71d0c5d.

Change-Id: Id943abf953e832ef831318e6699d4b46e9b46201
 2014-08-13 17:32:19 +00:00
Chris Wailes
eb3470219d 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
 2014-08-07 14:57:22 -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
Tim Murray
31e12acca5 Update copyFrom(BaseObj[]) for large objects. 
Change-Id: I99cadbd1ad925cad0dd357c9abbd1a49c07785c9
 2014-07-09 17:09:33 -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
Stephen Hines
48ba506dfa resolved conflicts for merge of 31012e2c to master 
Change-Id: I2e24e0457570d7d856293637a553f0242a97a83b
 2014-07-09 07:39:38 -07:00
Jason Sams
7165bd6d74 Merge "Add check and throw for failed Intrinsic init." 2014-06-25 17:35:00 +00:00
Stephen Hines
bc5d3eeedc Switch from size_t -> uint32_t for dimensions array. 
Change-Id: I159586e98dd47be9b9f5db0f3e27d1072533134c
 2014-06-25 00:03:39 -07: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
Stephen Hines
ed38a32d37 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.
 2014-06-25 20:58:34 +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
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