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

284 Commits

Author SHA1 Message Date
Miao Wang
2fd1a8b6ca am 2772ee6d: Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev 
automerge: 1446eb8

* commit '1446eb8f6130e4833ca2b74331b867d30445aca3':
  [RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic
 2015-01-23 19:34:48 +00:00
Miao Wang
8a1265384b [RenderScript] Allow U8_2 & U8_3 input allocation for Histogram 
Intrinsic

Bug: 19035242
Bug: 19124958
Change-Id: I9e806d7a0786e728c5f23607dc67ca5d755e12ed
 2015-01-23 19:15:57 +00:00
Jason Sams
cf109c5905 am de56e38e: Merge "Fix default compute thread priority" automerge: 231df77 
* commit 'de56e38e9e8f7f4a54633b66e2952cea776d6ab5':
  Fix default compute thread priority
 2015-01-22 21:18:16 +00:00
Jason Sams
305b8c4737 am 712b05d0: Merge "Add FP16 types to the list of RenderScript types." automerge: 081cda8 
* commit '712b05d00b00a6148852e153ef76dfb5960623e9':
  Add FP16 types to the list of RenderScript types.
 2015-01-22 21:18:02 +00:00
Jason Sams
231df77eff Merge "Fix default compute thread priority" 2015-01-22 21:08:44 +00:00
Miao Wang
118245d939 Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic." into lmp-mr1-dev automerge: dbfcf3f 
automerge: a710b83

* commit 'a710b839a23633bb049a6f91ccd7e17261e406a4':
  [Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic.
 2015-01-22 01:26:24 +00:00
Jason Sams
c9870c145f Fix default compute thread priority 
bug 16651474

Compute inherited graphics default thread priority of Display.  This
was not intended.

Change-Id: I0dd9a230ce8ceba64e971b024cbe518927cd2550
 2015-01-21 16:12:37 -08:00
Miao Wang
b590b354ef [Renderscript] Add check for Allocation.copyTo(Array) and 
Fix the input allocation type check for Histogram Intrinsic.

Bug: 19035242
Change-Id: I0ef2672bf816854db90fc92dc9ef51d1d231c246
 2015-01-21 21:17:19 +00:00
Jason Sams
a5835a2e5f Add FP16 types to the list of RenderScript types. 
Change-Id: Ibf9a6d391fb4d6a5c4b4e05ab73fb58bd74dc586
 2015-01-20 12:51:14 -08:00
Yang Ni
281c325251 New Script Group API. 
Change-Id: I73d3572276a38dac775025b472ba229ad8770c84
 2015-01-07 15:07:16 -08:00
Tim Murray
c13160a5c1 Fix typo with register native allocation. 
bug 18579193

Change-Id: I42d30709b79a37d6a4126559a511e98e9c8d4808
 2014-12-16 10:13:05 -08:00
Tim Murray
d11a658db1 Fix typo with register native allocation. 
bug 18579193

Change-Id: I42d30709b79a37d6a4126559a511e98e9c8d4808
 2014-12-16 09:59:09 -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
aefbd5f97c 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 11:34:48 -08:00
Jason Sams
bb7e86ff04 Fix bug in passing of context flags and version. 
bug 18592099

Change-Id: Id20906f6f47b573d881025453a3b6356bcf6e9c7
 2014-12-02 17:24:17 -08:00
Jason Sams
81cd2b18bd Fix bug in passing of context flags and version. 
Change-Id: Id20906f6f47b573d881025453a3b6356bcf6e9c7
 2014-12-02 12:37:04 -08:00
Bernhard Rosenkränzer
09993f768b Fix format strings mismatching the parameters passed to them 
Change-Id: Ia0d33aec9edadac60508fb422e0821e6d8f28afa
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-20 15:24:46 -08:00
Miao Wang
8f3cc4582d Add Float32 suppor for IntrinsicResize. base part. 
Change-Id: I37e8826cfab92512cc641b106a42723162bffe58
 2014-11-13 15:32:18 -08:00
Andreas Gampe
67333928bf Frameworks/base: Wall Werror in rs 
Turn on -Wall -Werror in rs/. Fix warnings.

Change-Id: I41923e4578edf26dbf6a31a83b6999e80d6d385a
 2014-11-10 20:35:59 -08:00
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