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

297 Commits

Author SHA1 Message Date
John Reck
8222a7ec81 Merge "Revert "Change how Java Bitmaps are accessed in a few places"" 2015-04-20 22:07:45 +00:00
John Reck
edc22fba59 Revert "Change how Java Bitmaps are accessed in a few places" 
Bug: 20207616

This reverts commit a771b9861d11671c780092d35c0062eeefcf37c0.

Change-Id: Ifd891cc075274a7986e987229e0fed5a04ed9ff0
 2015-04-20 22:06:31 +00:00
John Reck
9d4efdf280 Revert "A bunch more cleanups" 
This reverts commit c294d128d03bc9a9982b273a82516c04583438cc.

Change-Id: Id1ebb236950f7c36c6d86e1dd95566d3a200748d
 2015-04-17 20:47:27 +00:00
Tim Murray
ef0e1c6a0c Unhide BLAS intrinsics. 
Change-Id: I3006d878e68cce833d8f26cb5d8a1a660a6f5565
 2015-04-16 11:15:43 -07:00
Miao Wang
68e03ab998 am 13391109: am 2b300a99: am 782b4339: Merge "[RenderScript] typo fix in Allocation.java" 
* commit '133911095ce0d9ef01766aa7b67a0a31b852e242':
  [RenderScript] typo fix in Allocation.java
 2015-04-16 02:46:43 +00:00
Miao Wang
782b43394e Merge "[RenderScript] typo fix in Allocation.java" 2015-04-16 02:03:32 +00:00
Miao Wang
179e8b5351 [RenderScript] typo fix in Allocation.java 
Change-Id: Id0eae76387d18c5bfed6cdbb52781b0dc3e4ae90
 2015-04-15 17:44:32 -07:00
Jason Sams
a217d69d05 Merge "Hide array allocation" 2015-04-16 00:35:23 +00:00
Jason Sams
d016266de2 Hide array allocation 
Not done for feature complete

Change-Id: I79c8da2c7e64d6feb660c9652688f971535c1f92
 2015-04-15 17:18:10 -07:00
Tim Murray
ef532f8435 am 3d9c9093: am 91d2f27b: am 7f72f747: Merge "Add BNNM intrinsic." 
* commit '3d9c9093d1d76d4aeb5f99b1746b65788c72736e':
  Add BNNM intrinsic.
 2015-04-15 23:15:13 +00:00
Tim Murray
7f72f74766 Merge "Add BNNM intrinsic." 2015-04-15 22:30:14 +00:00
John Reck
f7a61483bc Merge "A bunch more cleanups" 2015-04-15 14:48:19 +00:00
John Reck
c294d128d0 A bunch more cleanups 
Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI

Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
 2015-04-14 15:38:22 -07:00
Tim Murray
9cb16a2f91 Add BNNM intrinsic. 
Change-Id: I05fc9835786455e28d69f2b4ffe70c3292a01404
 2015-04-14 15:10:19 -07:00
Yang Ni
5024f20a85 am 09339053: am 6ca1e45a: am 8704ae46: Merge "Add name to ScriptGroup2.Builder.create() method" 
* commit '0933905375790eb850334b53fd6d0981bd40e007':
  Add name to ScriptGroup2.Builder.create() method
 2015-04-14 17:02:33 +00:00
Yang Ni
35be56cce8 Add name to ScriptGroup2.Builder.create() method 
This name will be used to name the .so file generated for the
script group with fused kernels.

Change-Id: I46e351c8412740512f56b7915b14f36183c6eeaf
 2015-04-13 17:24:44 -07:00
Yang Ni
ad6b44aaa1 Add a name to ScriptGroup2.Builder.create method 
The name is not used in any meaningful way yet, but would be used
to name the file for generated code for fused kernels in other
coming CLs.

A script group name cannot be null or empty, or longer than 100
characters. It can only contain letters, digits, '-', or '_'.

Change-Id: I95fdbf58e6689da91ca98c2057dfa1a803d3b27b
 2015-04-13 14:32:18 -07:00
John Reck
073f36c6c1 Merge "Change how Java Bitmaps are accessed in a few places" 2015-04-13 19:20:59 +00:00
John Reck
a771b9861d Change how Java Bitmaps are accessed in a few places 
Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
 2015-04-13 09:50:42 -07:00
Tim Murray
9509bfe46a am 72fcf9eb: am af61d43d: am 6d718c2f: Merge "Add support for setting the cache directory." 
* commit '72fcf9eb1079312afd7bdbee167c759109af4244':
  Add support for setting the cache directory.
 2015-04-10 04:35:04 +00:00
Tim Murray
47f31582b6 Add support for setting the cache directory. 
Change-Id: I2bf1874705b877a8a8262ab49b47fe8241e603d5
 2015-04-09 17:50:39 -07:00
Stephen Hines
b6b17a575f resolved conflicts for merge of 764f08ad to master 
Change-Id: I0a22225b2d26b6d806de2dcc70ffba29c96865b3
 2015-04-07 14:47:32 -07:00
Tim Murray
e1e6c66198 Move cache dir to its own class. 
This prevents us from loading the RS static initializer all the time.

Change-Id: I8cea7540e50251aba8c2f199f06f344f991e7d7f
 2015-04-07 13:24:14 -07:00
Yang Ni
922346c0b2 Merge "Add a name to ScriptGroup2.Builder.create method" 2015-04-07 19:54:31 +00:00
Yang Ni
1709856238 Add a name to ScriptGroup2.Builder.create method 
The name is not used in any meaningful way yet, but would be used
to name the file for generated code for fused kernels in other
coming CLs.

A script group name cannot be null or empty, or longer than 100
characters. It can only contain letters, digits, '-', or '_'.

Change-Id: I95fdbf58e6689da91ca98c2057dfa1a803d3b27b
 2015-04-07 09:37:50 -07:00
Jason Sams
217a36b193 am ef2279a1: am 283e5ce3: am 7200f661: Merge "Fix minor blur doc bug" 
* commit 'ef2279a1f1a12b9ba16cd18c7ec2be97111307a8':
  Fix minor blur doc bug
 2015-04-07 00:17:24 +00:00
Yang Ni
a9d76d153d am 249968b4: am 6bef5eb4: am 6422ee71: Merge "Rewrote FieldPack::createFieldPack for alignment" 
* commit '249968b421a8dcfe5a26ec7f524e76295ec5eef5':
  Rewrote FieldPack::createFieldPack for alignment
 2015-04-07 00:06:34 +00:00
Jason Sams
7200f661c1 Merge "Fix minor blur doc bug" 2015-04-06 23:38:05 +00:00
Yang Ni
8bcbf47245 Rewrote FieldPack::createFieldPack for alignment 
b/20032217

Some data types requires data alignment. This has an impact on the
total data size for the FieldPack. Fixed createFiledPack()
implementation to handle this correctly.

Change-Id: I241da19df69bf51cfdaf3b3a1381b446eaacb7fb
 2015-04-06 14:49:53 -07:00
Miao Wang
edea751f64 am 1327fa9e: am 511eb660: am 6aed9ec1: Merge "[RenderScript] update exception reporting for copyTo() after autoPadding added." 
* commit '1327fa9eb155eb57fe24a8aa90a18f57d706e86b':
  [RenderScript] update exception reporting for copyTo() after autoPadding added.
 2015-04-03 18:18:01 +00:00
Miao Wang
d9b6328509 [RenderScript] update exception reporting for copyTo() after 
autoPadding added.

 - This CL fixes recent CTS failures about copyPadded after
   lmp-mr1-dev changes pushed to aosp.

Change-Id: Ica1f4fd934cd83ca4357ea7e7c82dcc7f844b689
 2015-04-03 09:15:39 -07:00
Jason Sams
37192dcde3 Fix minor blur doc bug 
Change-Id: I4c129d9d3c93d8a36c887e5c594b4402aca5745e
 2015-04-02 14:10:53 -07:00
Yang Ni
249e6c8cd8 am 02dff422: am 5db6f1fa: am 63dde9c8: Merge "Fix value size data type in closure creation." 
* commit '02dff422a7734764e3ce00179f62ba115f2081a5':
  Fix value size data type in closure creation.
 2015-04-01 02:19:41 +00:00
Yang Ni
4470d68a89 Unhide new ScriptGroup API 
This includes the new class ScriptGroup2 and a related change in
class Script to add InvokeID.

Change-Id: I012dc0a32c65803453022fa534ef05f855ea5ace
 2015-03-31 15:00:13 -07:00
Miao Wang
eb9a10c829 Merge "[RenderScript] Remove @hide for setAutoPadding(boolean)." 2015-03-31 19:41:02 +00:00
Jason Sams
8610f837bc Update LaunchOptions description 
Change-Id: I7425c9ea9d82ed54950557e93aa46b69ebc02c23
 2015-03-30 17:01:10 -07:00
Jason Sams
6a420b5e0b unhide RS apis 
Change-Id: I30c3349c9222765ad7850890e0431bc6a6d3757a
 2015-03-30 15:31:26 -07:00
Yang Ni
4c93c8c93a Fix value size data type in closure creation. 
b/19944127

Also added references to arguments and global values in a closure to
keep them live in Java while native code may access them.

Change-Id: I1179d34aa67f845578740e71cc2da4f82419f251
 2015-03-30 10:45:34 -07:00
Jason Sams
756ecf7bbb am 5f786f0d: am 226fc774: am ee80414d: Merge "Fix doc bug for object size." 
* commit '5f786f0dabe93eb1bf391ffc3f57f03b9b9ce575':
  Fix doc bug for object size.
 2015-03-27 01:50:56 +00:00
Miao Wang
d7ecab1e87 [RenderScript] Remove @hide for setAutoPadding(boolean). 
Change-Id: I9e018436866989090be3896f894078ca0422189b
 2015-03-26 18:00:15 -07:00
Jason Sams
fb4f5cf614 Fix doc bug for object size. 
Change-Id: I3c810abcb9734196bd8804a22efc010dd3a73291
 2015-03-26 17:39:34 -07:00
Miao Wang
aac10a21e3 Merge "[RenderScript] Remove @hide for the new APIs for Allocation.CopyTo" 2015-03-27 00:35:31 +00:00
Miao Wang
258db504bc [RenderScript] Remove @hide for the new APIs for Allocation.CopyTo 
Change-Id: I9ef476ae3e659d98d21c9246aa8e4969e00c14f1
 2015-03-26 17:25:01 -07:00
Jason Sams
d640b7a6c7 am 9b25b77f: am d641bb00: am 73ffe0cc: Merge "Catch errors for unknown object types." 
* commit '9b25b77feb09119710713a81978dbbcdcb2f0c40':
  Catch errors for unknown object types.
 2015-03-26 22:59:40 +00:00
Jason Sams
8c0c880bba am b04f9944: am 22580b83: Merge "Fix potential npe" 
* commit 'b04f9944fb0062541512447a952405ba4b084d30':
  Fix potential npe
 2015-03-26 22:53:57 +00:00
Jason Sams
bca8e6d35f Catch errors for unknown object types. 
bug 19805334

Change-Id: I71e172b8123076896737d352403f8ddefca544b6
 2015-03-26 15:29:56 -07:00
Jason Sams
ae5be38ebb Fix potential npe 
bug 19805515

Change-Id: Id36b145d3ce1c81311e88f5cdd2441880e98f737
 2015-03-26 14:47:17 -07:00
Miao Wang
ab452f70fc am 2b30b73b: am 6f6f44b0: am b2b0c4c2: Merge "[RenderScript] Add create(Context, int) to be compatible with the thunker layer & minor tweaks." 
* commit '2b30b73b017f10bc2ce514981b577c2efaeab739':
  [RenderScript] Add create(Context, int) to be compatible with the thunker layer & minor tweaks.
 2015-03-24 02:59:12 +00:00
Miao Wang
a4e5adf955 [RenderScript] Add create(Context, int) to be compatible with 
the thunker layer & minor tweaks.

bug:19888167
bug:19888339
Change-Id: Ib264c4ca48c990b3476456838047f73d95f6752f
 2015-03-23 11:50:18 -07:00
Jason Sams
0590423d71 Merge "unhide AllocationAdapter APIs" 2015-03-20 22:14:26 +00:00