summaryrefslogtreecommitdiffstats
path: root/rs
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | 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
|\ \ \
| * | | unhide AllocationAdapter APIsJason Sams2015-03-201-3/+3
| | | | | | | | | | | | | | | | Change-Id: Id7ff10c7b09a5bedd9952602dd394e76b4fae8b1
* | | | am 53699ec6: am d3e6428a: Merge "New API methods for Script Group"Yang Ni2015-03-191-1/+52
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '53699ec613acf76277b69db57bf2f378d0dc374a': New API methods for Script Group
| * | New API methods for Script GroupYang Ni2015-03-191-1/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use a single vararg Object array for both kernel/invoke arguments and global bindings. The assumption is that global bindings are in the end after the kernel/invoke arguments. This simplifies the api to add a kernel or invoke to a script group. Change-Id: I7efb1035c5967e2cadd15e6fe27f20c80ba197a2
* | | am f2ea0171: am c077ee31: Merge "Added copyright notice and formatted to ↵Yang Ni2015-03-191-294/+313
|\ \ \ | |/ / | | | | | | | | | | | | | | | convention" * commit 'f2ea01717b918471b050bea46529e1843d36fc84': Added copyright notice and formatted to convention
| * | Merge "Added copyright notice and formatted to convention"Yang Ni2015-03-191-294/+313
| |\ \
| | * | Added copyright notice and formatted to conventionYang Ni2015-03-161-294/+313
| | | | | | | | | | | | | | | | | | | | | | | | Pure format change. No other changes at all. Change-Id: I74a53aa67ef0960f70becaf288b85be40066a0ae
* | | | am f8a69f56: am 2ef9955c: Merge "[RenderScript] Remove duplicate include in jni"Miao Wang2015-03-191-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f8a69f562b7f1c987b5eddd2ee13c04c1a787625': [RenderScript] Remove duplicate include in jni
| * | | Merge "[RenderScript] Remove duplicate include in jni"Miao Wang2015-03-191-1/+0
| |\ \ \
| | * | | [RenderScript] Remove duplicate include in jniMiao Wang2015-03-181-1/+0
| | | |/ | | |/| | | | | | | | | Change-Id: Ib6019ab22a83d952dce3fd6f5351120d94b49d58
* | | | am d8e891f4: am f75e4ca3: Merge "Make it harder to leak contexts"Jason Sams2015-03-191-14/+103
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd8e891f474096c310f60ca6d2f737cdc0251003e': Make it harder to leak contexts
| * | | Merge "Make it harder to leak contexts"Jason Sams2015-03-191-14/+103
| |\ \ \ | | |/ / | |/| |
| | * | Make it harder to leak contextsJason Sams2015-03-181-14/+103
| | | | | | | | | | | | | | | | Change-Id: Ied60b6428bedb200d7b5b627e8196fbf2b4151e1
* | | | am 4f0a96d2: am 9cc36ac2: Merge "Frameworks/base: Remove duplicate check in ↵Andreas Gampe2015-03-181-3/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Mesh" * commit '4f0a96d2d923bd1f4c7f46ec25c83711565b77db': Frameworks/base: Remove duplicate check in Mesh
| * | | Merge "Frameworks/base: Remove duplicate check in Mesh"Andreas Gampe2015-03-181-3/+1
| |\ \ \
| | * | | Frameworks/base: Remove duplicate check in MeshAndreas Gampe2015-03-171-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19797138 Change-Id: I0b11c4ff63a8031d5e58a06ac13f91ae0bbac5dc
* | | | | am 1dae2f93: am 8df1bedc: Merge "Frameworks/base: Fix potential NPE in Script"Andreas Gampe2015-03-181-3/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '1dae2f9341c05eee5d77489c579ffd621fbe108b': Frameworks/base: Fix potential NPE in Script
| * | | | Merge "Frameworks/base: Fix potential NPE in Script"Andreas Gampe2015-03-181-3/+8
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Frameworks/base: Fix potential NPE in ScriptAndreas Gampe2015-03-181-3/+8
| | |/ / | | | | | | | | | | | | | | | | Bug: 19797138 Change-Id: I5cd9394bd2c0f7c044c1f2f24665384fa797cd97
* | | | am b533f3e1: am 1aadd347: Merge "Avoid duplicate surface creation."Jason Sams2015-03-181-1/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b533f3e1ad098b38070369609e6b1892828bc111': Avoid duplicate surface creation.
| * | | Avoid duplicate surface creation.Jason Sams2015-03-171-1/+8
| |/ / | | | | | | | | | Change-Id: I43104c8b48dd26681735940e6b2e1ba902af2020
* | | am e6857531: am f3e581c9: Merge "Frameworks/base: Check before foreach in ↵Andreas Gampe2015-03-161-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Script" * commit 'e685753136ee8e88212ad95b24284a153c86a0c1': Frameworks/base: Check before foreach in Script
| * | Frameworks/base: Check before foreach in ScriptAndreas Gampe2015-03-151-2/+4
| |/ | | | | | | | | | | | | According to the if below, ains == null is potentially valid. But the foreach loop would throw a NullPointerException. Change-Id: I4460fb1357eaa3abfe0ab9a21effb608f474ab51
* | am bb8c910f: am d2e4a166: Merge "Remove dead path code"Jason Sams2015-03-133-107/+1
|\ \ | |/ | | | | | | * commit 'bb8c910fc12f304c97c94ee86a3a3da56afe8374': Remove dead path code
| * Remove dead path codeJason Sams2015-03-113-107/+1
| | | | | | | | | | | | | | This API was never shipped and the implementation never finished. Change-Id: I2491db216d6a7a8ea30628d791773f89da5fb4d2
* | am 989e03f1: am c1e2bf95: am 4b5af9bc: Merge "[RenderScript] Update the java ↵Miao Wang2015-03-083-66/+25
|\ \ | |/ | | | | | | | | | | API about Allocation copyTo & From FieldPacker" * commit '989e03f144e8031f33af08945e845283dddcc8ad': [RenderScript] Update the java API about Allocation copyTo & From FieldPacker
| * am 4b5af9bc: Merge "[RenderScript] Update the java API about Allocation ↵Miao Wang2015-03-063-66/+25
| |\ | | | | | | | | | | | | | | | | | | copyTo & From FieldPacker" * commit '4b5af9bce10dbb8b6d5ff27a5f0c49f3498a6245': [RenderScript] Update the java API about Allocation copyTo & From FieldPacker
| | * [RenderScript] Update the java API about Allocation copyTo & From FieldPackerMiao Wang2015-03-053-66/+25
| | | | | | | | | | | | Change-Id: I4e1b911d4cdfec8a841bc5a8bc615c64c50e8fc8