summaryrefslogtreecommitdiffstats
path: root/rs/java
Commit message (Collapse)AuthorAgeFilesLines
...
| * | [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 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-132-93/+0
|\ \ | |/ | | | | | | * commit 'bb8c910fc12f304c97c94ee86a3a3da56afe8374': Remove dead path code
| * Remove dead path codeJason Sams2015-03-112-93/+0
| | | | | | | | | | | | | | 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-082-56/+13
|\ \ | |/ | | | | | | | | | | 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-062-56/+13
| |\ | | | | | | | | | | | | | | | | | | 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-052-56/+13
| | | | | | | | | | | | Change-Id: I4e1b911d4cdfec8a841bc5a8bc615c64c50e8fc8
* | | am ec89c1ea: am a61832c8: am 288e6f67: Merge "[RenderScript] AutoPadding & ↵Miao Wang2015-03-082-38/+145
|\ \ \ | |/ / | | | | | | | | | | | | | | | Unpadding for Vec3 Elements during copyTo & copyFrom." * commit 'ec89c1ea731256cd0d71ee58733b2855e1e6e4fa': [RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom.
| * | am 288e6f67: Merge "[RenderScript] AutoPadding & Unpadding for Vec3 Elements ↵Miao Wang2015-03-062-38/+145
| |\ \ | | |/ | | | | | | | | | | | | | | | during copyTo & copyFrom." * commit '288e6f67181ce74ec4b97b61def1b9510b1221d0': [RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom.
| | * [RenderScript] AutoPadding & Unpadding for Vec3 Elements duringMiao Wang2015-03-042-38/+145
| | | | | | | | | | | | | | | | | | copyTo & copyFrom. Change-Id: I10b6fb235717e181ebb30b92e4dbe23e6183a29c
* | | am 5830e7a9: am 411473de: am caa8a8fb: Merge "[Renderscript] JAVA API update ↵Miao Wang2015-03-032-6/+402
|\ \ \ | |/ / | | | | | | | | | | | | | | | for Allocation.CopyTo add the following functions to make it more symmetric to copyFrom()." * commit '5830e7a9fb56db24a101d7b45c6db970e38ed6f6': [Renderscript] JAVA API update for Allocation.CopyTo add the following functions to make it more symmetric to copyFrom().
| * | am caa8a8fb: Merge "[Renderscript] JAVA API update for Allocation.CopyTo add ↵Miao Wang2015-03-032-6/+402
| |\ \ | | |/ | | | | | | | | | | | | | | | the following functions to make it more symmetric to copyFrom()." * commit 'caa8a8fb9849f1d44ffab3117950ac1e7b02cd4d': [Renderscript] JAVA API update for Allocation.CopyTo add the following functions to make it more symmetric to copyFrom().
| | * Merge "[Renderscript] JAVA API update for Allocation.CopyTo add the ↵Miao Wang2015-03-032-6/+402
| | |\ | | | | | | | | | | | | following functions to make it more symmetric to copyFrom()."
| | | * [Renderscript] JAVA API update for Allocation.CopyToMiao Wang2015-02-252-6/+402
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add the following functions to make it more symmetric to copyFrom(). - copy1DRangeToUnchecked, copy1DRangeTo - copy2DRangeToUnchecked, copy2DRangeTo - copy3DRangeToUnchecked, copy3DRangeTo - setFromFieldPacker, 2D and 3D variants - copyElementTo, (1D, 2D & 3D) Change-Id: I6b896123e1c00cead552aa5b31a701b15dd70f85
* | | | am e1bd7f76: am 9fc6948b: am 514e0801: Merge "Fix crash when updating ↵Jason Sams2015-03-031-11/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | adapter offsets." * commit 'e1bd7f766ea5477ff3ca7103655755f3234602b2': Fix crash when updating adapter offsets.
| * | | am 514e0801: Merge "Fix crash when updating adapter offsets."Jason Sams2015-03-031-11/+13
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '514e0801cc95c9827d220104317e1fe45f396b94': Fix crash when updating adapter offsets.
| | * | Merge "Fix crash when updating adapter offsets."Jason Sams2015-03-021-11/+13
| | |\ \ | | | |/ | | |/|
| | | * Fix crash when updating adapter offsets.Jason Sams2015-02-251-11/+13
| | | | | | | | | | | | | | | | Change-Id: I0a6923e387f9743a06cc2c4c67995a79789d4cdd
* | | | Remove unused imports in frameworks/base.John Spurlock2015-02-281-1/+0
|/ / / | | | | | | | | | Change-Id: I031443de83f93eb57a98863001826671b18f3b17
* | | am adb52ef7: Merge "Implement finalizer for RS contexts."Jason Sams2015-02-201-13/+35
|\ \ \ | |/ / | | | | | | | | | * commit 'adb52ef7034d4d3e0eee58cedae2a343d29771b9': Implement finalizer for RS contexts.
| * | Implement finalizer for RS contexts.Jason Sams2015-02-191-13/+35
| | | | | | | | | | | | | | | | | | Fixes memory leak when apps forget to call .destroy() on the context. Change-Id: Ida4685768e92cfe3875da38846d17b86cc386cd0
* | | Merge commit '32acf753e8989766f67fd5300d3eb467f707cc79' into HEADBill Yi2015-02-192-6/+14
|\ \ \ | |/ / |/| |
| * | am 2a3cdf57: Merge "Implement array types"Jason Sams2015-02-104-85/+230
| |\ \ | | |/ | | | | | | | | | | | | | | | automerge: 6e0ad25 * commit '6e0ad25ca8def88a48c9cc6436b12da7ff4600c2': Implement array types
| * | am da91dfbd: am 1269ff96: Merge "Adds invocable functions to ScriptGroup"Yang Ni2015-02-054-3/+396
| |\ \ | | | | | | | | | | | | | | | | * commit 'da91dfbdf20271dffce5357195800cf36183ad97': Adds invocable functions to ScriptGroup
| * \ \ Merge "make Allocation.destroy() include setSurface(null) for ↵Miao Wang2015-02-051-0/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | USAGE_IO_OUTPUT (Native RS)" automerge: 9a55cbc automerge: 58fd96c * commit '58fd96c607de7f7f821a0b15fd37bc28323fcfde': make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)
| * \ \ \ Merge "Pass in code cache directory when creating a script group." ↵Yang Ni2015-02-032-11/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 9559ce7 automerge: 29fe5ef * commit '29fe5ef179a4a7de15360650353c6196f9350b07': Pass in code cache directory when creating a script group.
| * \ \ \ \ am 2772ee6d: Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for ↵Miao Wang2015-01-231-2/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Histogram Intrinsic" into lmp-mr1-dev automerge: 1446eb8 * commit '1446eb8f6130e4833ca2b74331b867d30445aca3': [RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic
| | * | | | | [RenderScript] Allow U8_2 & U8_3 input allocation for HistogramMiao Wang2015-01-231-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intrinsic Bug: 19035242 Bug: 19124958 Change-Id: I9e806d7a0786e728c5f23607dc67ca5d755e12ed
| * | | | | | am de56e38e: Merge "Fix default compute thread priority" automerge: 231df77Jason Sams2015-01-221-2/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'de56e38e9e8f7f4a54633b66e2952cea776d6ab5': Fix default compute thread priority
| * \ \ \ \ \ \ am 712b05d0: Merge "Add FP16 types to the list of RenderScript types." ↵Jason Sams2015-01-222-1/+49
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 081cda8 * commit '712b05d00b00a6148852e153ef76dfb5960623e9': Add FP16 types to the list of RenderScript types.
| * \ \ \ \ \ \ \ Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the ↵Miao Wang2015-01-222-6/+10
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.