summaryrefslogtreecommitdiffstats
path: root/rs
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Revert "Change how Java Bitmaps are accessed in a few places""John Reck2015-04-201-10/+15
|\ \ | |/ |/|
| * Revert "Change how Java Bitmaps are accessed in a few places"John Reck2015-04-201-10/+15
| | | | | | | | | | | | | | | | Bug: 20207616 This reverts commit a771b9861d11671c780092d35c0062eeefcf37c0. Change-Id: Ifd891cc075274a7986e987229e0fed5a04ed9ff0
* | Revert "A bunch more cleanups"John Reck2015-04-171-1/+0
| | | | | | | | | | | | This reverts commit c294d128d03bc9a9982b273a82516c04583438cc. Change-Id: Id1ebb236950f7c36c6d86e1dd95566d3a200748d
* | Unhide BLAS intrinsics.Tim Murray2015-04-161-2/+0
| | | | | | | | Change-Id: I3006d878e68cce833d8f26cb5d8a1a660a6f5565
* | am 13391109: am 2b300a99: am 782b4339: Merge "[RenderScript] typo fix in ↵Miao Wang2015-04-161-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Allocation.java" * commit '133911095ce0d9ef01766aa7b67a0a31b852e242': [RenderScript] typo fix in Allocation.java
| * \ Merge "[RenderScript] typo fix in Allocation.java"Miao Wang2015-04-161-1/+1
| |\ \
| | * | [RenderScript] typo fix in Allocation.javaMiao Wang2015-04-151-1/+1
| | | | | | | | | | | | | | | | Change-Id: Id0eae76387d18c5bfed6cdbb52781b0dc3e4ae90
* | | | Merge "Hide array allocation"Jason Sams2015-04-162-1/+4
|\ \ \ \
| * | | | Hide array allocationJason Sams2015-04-152-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not done for feature complete Change-Id: I79c8da2c7e64d6feb660c9652688f971535c1f92
* | | | | am 3d9c9093: am 91d2f27b: am 7f72f747: Merge "Add BNNM intrinsic."Tim Murray2015-04-153-0/+60
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '3d9c9093d1d76d4aeb5f99b1746b65788c72736e': Add BNNM intrinsic.
| * | | | Merge "Add BNNM intrinsic."Tim Murray2015-04-153-0/+60
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add BNNM intrinsic.Tim Murray2015-04-143-0/+60
| | | | | | | | | | | | | | | | | | | | Change-Id: I05fc9835786455e28d69f2b4ffe70c3292a01404
* | | | | Merge "A bunch more cleanups"John Reck2015-04-151-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | A bunch more cleanupsJohn Reck2015-04-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch a few places to using android::canvas instead of SkCanvas as well which eliminated some JNI Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
* | | | | am 09339053: am 6ca1e45a: am 8704ae46: Merge "Add name to ↵Yang Ni2015-04-143-9/+15
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | ScriptGroup2.Builder.create() method" * commit '0933905375790eb850334b53fd6d0981bd40e007': Add name to ScriptGroup2.Builder.create() method
| * | | Add name to ScriptGroup2.Builder.create() methodYang Ni2015-04-133-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This name will be used to name the .so file generated for the script group with fused kernels. Change-Id: I46e351c8412740512f56b7915b14f36183c6eeaf
| * | | Add a name to ScriptGroup2.Builder.create methodYang Ni2015-04-131-1/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Change how Java Bitmaps are accessed in a few places"John Reck2015-04-131-15/+10
|\ \ \ | | |/ | |/|
| * | Change how Java Bitmaps are accessed in a few placesJohn Reck2015-04-131-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 72fcf9eb: am af61d43d: am 6d718c2f: Merge "Add support for setting the ↵Tim Murray2015-04-102-0/+26
|\ \ \ | | |/ | |/| | | | | | | | | | | | | cache directory." * commit '72fcf9eb1079312afd7bdbee167c759109af4244': Add support for setting the cache directory.
| * | Add support for setting the cache directory.Tim Murray2015-04-092-0/+26
| | | | | | | | | | | | Change-Id: I2bf1874705b877a8a8262ab49b47fe8241e603d5
* | | resolved conflicts for merge of 764f08ad to masterStephen Hines2015-04-073-22/+42
|\ \ \ | |/ / | | | | | | Change-Id: I0a22225b2d26b6d806de2dcc70ffba29c96865b3
| * | Move cache dir to its own class.Tim Murray2015-04-073-22/+42
| | | | | | | | | | | | | | | | | | This prevents us from loading the RS static initializer all the time. Change-Id: I8cea7540e50251aba8c2f199f06f344f991e7d7f
* | | Merge "Add a name to ScriptGroup2.Builder.create method"Yang Ni2015-04-071-1/+7
|\ \ \ | |_|/ |/| |
| * | Add a name to ScriptGroup2.Builder.create methodYang Ni2015-04-071-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am ef2279a1: am 283e5ce3: am 7200f661: Merge "Fix minor blur doc bug"Jason Sams2015-04-071-1/+1
|\ \ \ | | |/ | |/| | | | | | | * commit 'ef2279a1f1a12b9ba16cd18c7ec2be97111307a8': Fix minor blur doc bug
| * | Merge "Fix minor blur doc bug"Jason Sams2015-04-061-1/+1
| |\ \
| | * | Fix minor blur doc bugJason Sams2015-04-021-1/+1
| | | | | | | | | | | | | | | | Change-Id: I4c129d9d3c93d8a36c887e5c594b4402aca5745e
* | | | am 249968b4: am 6bef5eb4: am 6422ee71: Merge "Rewrote ↵Yang Ni2015-04-072-165/+62
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | FieldPack::createFieldPack for alignment" * commit '249968b421a8dcfe5a26ec7f524e76295ec5eef5': Rewrote FieldPack::createFieldPack for alignment
| * | Rewrote FieldPack::createFieldPack for alignmentYang Ni2015-04-062-165/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 1327fa9e: am 511eb660: am 6aed9ec1: Merge "[RenderScript] update ↵Miao Wang2015-04-031-4/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | exception reporting for copyTo() after autoPadding added." * commit '1327fa9eb155eb57fe24a8aa90a18f57d706e86b': [RenderScript] update exception reporting for copyTo() after autoPadding added.
| * | [RenderScript] update exception reporting for copyTo() afterMiao Wang2015-04-031-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | autoPadding added. - This CL fixes recent CTS failures about copyPadded after lmp-mr1-dev changes pushed to aosp. Change-Id: Ica1f4fd934cd83ca4357ea7e7c82dcc7f844b689
* | | am 02dff422: am 5db6f1fa: am 63dde9c8: Merge "Fix value size data type in ↵Yang Ni2015-04-012-4/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | closure creation." * commit '02dff422a7734764e3ce00179f62ba115f2081a5': Fix value size data type in closure creation.
| * | Fix value size data type in closure creation.Yang Ni2015-03-302-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Unhide new ScriptGroup APIYang Ni2015-03-311-24/+165
| | | | | | | | | | | | | | | | | | | | | This includes the new class ScriptGroup2 and a related change in class Script to add InvokeID. Change-Id: I012dc0a32c65803453022fa534ef05f855ea5ace
* | | Merge "[RenderScript] Remove @hide for setAutoPadding(boolean)."Miao Wang2015-03-311-1/+1
|\ \ \
| * | | [RenderScript] Remove @hide for setAutoPadding(boolean).Miao Wang2015-03-261-1/+1
| | | | | | | | | | | | | | | | Change-Id: I9e018436866989090be3896f894078ca0422189b
* | | | Update LaunchOptions descriptionJason Sams2015-03-301-1/+17
| | | | | | | | | | | | | | | | Change-Id: I7425c9ea9d82ed54950557e93aa46b69ebc02c23
* | | | unhide RS apisJason Sams2015-03-304-37/+20
| | | | | | | | | | | | | | | | Change-Id: I30c3349c9222765ad7850890e0431bc6a6d3757a
* | | | am 5f786f0d: am 226fc774: am ee80414d: Merge "Fix doc bug for object size."Jason Sams2015-03-271-1/+2
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '5f786f0dabe93eb1bf391ffc3f57f03b9b9ce575': Fix doc bug for object size.
| * | Fix doc bug for object size.Jason Sams2015-03-261-1/+2
| | | | | | | | | | | | Change-Id: I3c810abcb9734196bd8804a22efc010dd3a73291
* | | Merge "[RenderScript] Remove @hide for the new APIs for Allocation.CopyTo"Miao Wang2015-03-271-26/+12
|\ \ \
| * | | [RenderScript] Remove @hide for the new APIs for Allocation.CopyToMiao Wang2015-03-261-26/+12
| | | | | | | | | | | | | | | | Change-Id: I9ef476ae3e659d98d21c9246aa8e4969e00c14f1
* | | | am 9b25b77f: am d641bb00: am 73ffe0cc: Merge "Catch errors for unknown ↵Jason Sams2015-03-261-0/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | object types." * commit '9b25b77feb09119710713a81978dbbcdcb2f0c40': Catch errors for unknown object types.
| * | | Catch errors for unknown object types.Jason Sams2015-03-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | bug 19805334 Change-Id: I71e172b8123076896737d352403f8ddefca544b6
* | | | am b04f9944: am 22580b83: Merge "Fix potential npe"Jason Sams2015-03-261-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b04f9944fb0062541512447a952405ba4b084d30': Fix potential npe
| * | | Fix potential npeJason Sams2015-03-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | bug 19805515 Change-Id: Id36b145d3ce1c81311e88f5cdd2441880e98f737
* | | | am 2b30b73b: am 6f6f44b0: am b2b0c4c2: Merge "[RenderScript] Add ↵Miao Wang2015-03-241-7/+36
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | | | 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.
| * | [RenderScript] Add create(Context, int) to be compatible withMiao Wang2015-03-231-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | the thunker layer & minor tweaks. bug:19888167 bug:19888339 Change-Id: Ib264c4ca48c990b3476456838047f73d95f6752f
* | | Merge "unhide AllocationAdapter APIs"Jason Sams2015-03-201-3/+3
|\ \ \