Jason Sams
0590423d71
Merge "unhide AllocationAdapter APIs"
2015-03-20 22:14:26 +00:00
Jason Sams
206666790a
unhide AllocationAdapter APIs
...
Change-Id: Id7ff10c7b09a5bedd9952602dd394e76b4fae8b1
2015-03-20 15:09:35 -07:00
Yang Ni
4778caae50
am 53699ec6: am d3e6428a: Merge "New API methods for Script Group"
...
* commit '53699ec613acf76277b69db57bf2f378d0dc374a':
New API methods for Script Group
2015-03-19 23:42:34 +00:00
Yang Ni
c6dbfececd
am f2ea0171: am c077ee31: Merge "Added copyright notice and formatted to convention"
...
* commit 'f2ea01717b918471b050bea46529e1843d36fc84':
Added copyright notice and formatted to convention
2015-03-19 21:47:31 +00:00
Yang Ni
8ff2980f31
New API methods for Script Group
...
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
2015-03-19 14:38:20 -07:00
Yang Ni
c077ee316e
Merge "Added copyright notice and formatted to convention"
2015-03-19 21:28:13 +00:00
Miao Wang
815bcb24b0
am f8a69f56: am 2ef9955c: Merge "[RenderScript] Remove duplicate include in jni"
...
* commit 'f8a69f562b7f1c987b5eddd2ee13c04c1a787625':
[RenderScript] Remove duplicate include in jni
2015-03-19 20:54:40 +00:00
Miao Wang
2ef9955c82
Merge "[RenderScript] Remove duplicate include in jni"
2015-03-19 20:35:56 +00:00
Jason Sams
db8cfd062e
am d8e891f4: am f75e4ca3: Merge "Make it harder to leak contexts"
...
* commit 'd8e891f474096c310f60ca6d2f737cdc0251003e':
Make it harder to leak contexts
2015-03-19 18:59:00 +00:00
Jason Sams
f75e4ca394
Merge "Make it harder to leak contexts"
2015-03-19 18:38:16 +00:00
Miao Wang
919b6475d3
[RenderScript] Remove duplicate include in jni
...
Change-Id: Ib6019ab22a83d952dce3fd6f5351120d94b49d58
2015-03-18 19:16:47 -07:00
Jason Sams
e16da12b7b
Make it harder to leak contexts
...
Change-Id: Ied60b6428bedb200d7b5b627e8196fbf2b4151e1
2015-03-18 17:04:18 -07:00
Andreas Gampe
e09a941585
am 4f0a96d2: am 9cc36ac2: Merge "Frameworks/base: Remove duplicate check in Mesh"
...
* commit '4f0a96d2d923bd1f4c7f46ec25c83711565b77db':
Frameworks/base: Remove duplicate check in Mesh
2015-03-18 23:50:47 +00:00
Andreas Gampe
3c4ca688ce
am 1dae2f93: am 8df1bedc: Merge "Frameworks/base: Fix potential NPE in Script"
...
* commit '1dae2f9341c05eee5d77489c579ffd621fbe108b':
Frameworks/base: Fix potential NPE in Script
2015-03-18 23:50:25 +00:00
Jason Sams
68af9a9904
am b533f3e1: am 1aadd347: Merge "Avoid duplicate surface creation."
...
* commit 'b533f3e1ad098b38070369609e6b1892828bc111':
Avoid duplicate surface creation.
2015-03-18 23:48:52 +00:00
Andreas Gampe
9cc36ac2a2
Merge "Frameworks/base: Remove duplicate check in Mesh"
2015-03-18 22:19:27 +00:00
Andreas Gampe
8df1bedcba
Merge "Frameworks/base: Fix potential NPE in Script"
2015-03-18 22:18:26 +00:00
Andreas Gampe
ad555f91a0
Frameworks/base: Fix potential NPE in Script
...
Bug: 19797138
Change-Id: I5cd9394bd2c0f7c044c1f2f24665384fa797cd97
2015-03-18 12:24:57 -07:00
Andreas Gampe
16720c1849
Frameworks/base: Remove duplicate check in Mesh
...
Bug: 19797138
Change-Id: I0b11c4ff63a8031d5e58a06ac13f91ae0bbac5dc
2015-03-17 19:10:14 -07:00
Jason Sams
1e68bac5f8
Avoid duplicate surface creation.
...
Change-Id: I43104c8b48dd26681735940e6b2e1ba902af2020
2015-03-17 16:36:55 -07:00
Yang Ni
cc1ca488e2
Added copyright notice and formatted to convention
...
Pure format change. No other changes at all.
Change-Id: I74a53aa67ef0960f70becaf288b85be40066a0ae
2015-03-16 15:53:18 -07:00
Andreas Gampe
716475daa1
am e6857531: am f3e581c9: Merge "Frameworks/base: Check before foreach in Script"
...
* commit 'e685753136ee8e88212ad95b24284a153c86a0c1':
Frameworks/base: Check before foreach in Script
2015-03-16 20:26:43 +00:00
Andreas Gampe
c8ddcddd13
Frameworks/base: Check before foreach in Script
...
According to the if below, ains == null is potentially valid. But
the foreach loop would throw a NullPointerException.
Change-Id: I4460fb1357eaa3abfe0ab9a21effb608f474ab51
2015-03-15 15:57:30 -07:00
Jason Sams
8ab7eb4c02
am bb8c910f: am d2e4a166: Merge "Remove dead path code"
...
* commit 'bb8c910fc12f304c97c94ee86a3a3da56afe8374':
Remove dead path code
2015-03-13 02:59:40 +00:00
Jason Sams
a7e2509d8d
Remove dead path code
...
This API was never shipped and the implementation
never finished.
Change-Id: I2491db216d6a7a8ea30628d791773f89da5fb4d2
2015-03-11 11:00:00 -07:00
Miao Wang
de770528ec
am 989e03f1: am c1e2bf95: am 4b5af9bc: Merge "[RenderScript] Update the java API about Allocation copyTo & From FieldPacker"
...
* commit '989e03f144e8031f33af08945e845283dddcc8ad':
[RenderScript] Update the java API about Allocation copyTo & From FieldPacker
2015-03-08 00:17:34 +00:00
Miao Wang
b5c8004d6f
am 449571c4: am 26f1a538: am 8b86ee9f: Merge "[RenderScript] Add missing variable"
...
* commit '449571c45e47e9b8d118c59dbd909b0d512f7e6d':
[RenderScript] Add missing variable
2015-03-08 00:17:27 +00:00
Miao Wang
12d8a860b8
am ec89c1ea: am a61832c8: am 288e6f67: Merge "[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom."
...
* commit 'ec89c1ea731256cd0d71ee58733b2855e1e6e4fa':
[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom.
2015-03-08 00:17:18 +00:00
Miao Wang
c1e2bf95ab
am 4b5af9bc: Merge "[RenderScript] Update the java API about Allocation copyTo & From FieldPacker"
...
* commit '4b5af9bce10dbb8b6d5ff27a5f0c49f3498a6245':
[RenderScript] Update the java API about Allocation copyTo & From FieldPacker
2015-03-06 01:10:38 +00:00
Miao Wang
26f1a53838
am 8b86ee9f: Merge "[RenderScript] Add missing variable"
...
* commit '8b86ee9fb5909a95a46907aede4d1b22b4ef3bba':
[RenderScript] Add missing variable
2015-03-06 01:02:23 +00:00
Miao Wang
a61832c8fd
am 288e6f67: Merge "[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom."
...
* commit '288e6f67181ce74ec4b97b61def1b9510b1221d0':
[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom.
2015-03-06 01:01:58 +00:00
Miao Wang
45cec0a971
[RenderScript] Update the java API about Allocation copyTo & From FieldPacker
...
Change-Id: I4e1b911d4cdfec8a841bc5a8bc615c64c50e8fc8
2015-03-05 16:52:05 -08:00
Miao Wang
2cd0c340fc
[RenderScript] Add missing variable
...
Change-Id: I148bab3a8c3fb360d345549401d0ed579a37e971
2015-03-05 16:27:15 -08:00
John Reck
f4faeac352
Cleanup Bitmap JNI attempt #2
...
Original version missed a spot
This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b.
Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
2015-03-05 13:56:16 -08:00
Chad Jones
c02977e3bb
Revert "Cleanup Bitmap JNI"
...
This reverts commit b2915245b74b3b5541b123e38403f8e26426b4b7.
Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a
2015-03-05 19:34:26 +00:00
John Reck
b2915245b7
Cleanup Bitmap JNI
...
Fix a bunch of places where mNativeBitmap was being
poked at directly, switch them either to the NDK API
or to GraphicsJNI where it made sense
Change-Id: I6b3df3712d6497cba828c2d3012e725cb4ebb64d
2015-03-05 09:55:02 -08:00
Miao Wang
87e908dfde
[RenderScript] AutoPadding & Unpadding for Vec3 Elements during
...
copyTo & copyFrom.
Change-Id: I10b6fb235717e181ebb30b92e4dbe23e6183a29c
2015-03-04 15:50:11 -08:00
Miao Wang
e5ad00d1f5
am 5830e7a9: am 411473de: am caa8a8fb: Merge "[Renderscript] JAVA API update 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().
2015-03-03 01:44:02 +00:00
Miao Wang
411473de4a
am caa8a8fb: Merge "[Renderscript] JAVA API update for Allocation.CopyTo add 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().
2015-03-03 01:11:18 +00:00
Miao Wang
caa8a8fb98
Merge "[Renderscript] JAVA API update for Allocation.CopyTo add the following functions to make it more symmetric to copyFrom()."
2015-03-03 00:57:48 +00:00
Jason Sams
acbace5f08
am e1bd7f76: am 9fc6948b: am 514e0801: Merge "Fix crash when updating adapter offsets."
...
* commit 'e1bd7f766ea5477ff3ca7103655755f3234602b2':
Fix crash when updating adapter offsets.
2015-03-03 00:17:42 +00:00
Jason Sams
9fc6948b61
am 514e0801: Merge "Fix crash when updating adapter offsets."
...
* commit '514e0801cc95c9827d220104317e1fe45f396b94':
Fix crash when updating adapter offsets.
2015-03-03 00:03:58 +00:00
Jason Sams
514e0801cc
Merge "Fix crash when updating adapter offsets."
2015-03-02 23:57:12 +00:00
John Spurlock
08c7116ab9
Remove unused imports in frameworks/base.
...
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
2015-02-28 14:47:49 -05:00
Jason Sams
add04be7c8
Fix crash when updating adapter offsets.
...
Change-Id: I0a6923e387f9743a06cc2c4c67995a79789d4cdd
2015-02-25 16:42:00 -08:00
Miao Wang
c8e237e271
[Renderscript] JAVA API update for Allocation.CopyTo
...
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
2015-02-25 16:41:09 -08:00
Jason Sams
a15ac5fea3
am adb52ef7: Merge "Implement finalizer for RS contexts."
...
* commit 'adb52ef7034d4d3e0eee58cedae2a343d29771b9':
Implement finalizer for RS contexts.
2015-02-20 20:00:40 +00:00
Jason Sams
d22a6f09dc
Implement finalizer for RS contexts.
...
Fixes memory leak when apps forget to call .destroy() on the context.
Change-Id: Ida4685768e92cfe3875da38846d17b86cc386cd0
2015-02-19 17:19:52 -08:00
Bill Yi
4fecab570d
Merge commit '32acf753e8989766f67fd5300d3eb467f707cc79' into HEAD
2015-02-19 14:31:36 -08:00
Tim Murray
25207df658
Add BLAS intrinsic.
...
Change-Id: I95ddc46cb3f6217d2ead1091fd47450389544324
2015-02-17 13:10:25 -08:00