97 Commits

Author SHA1 Message Date
Yang Ni
9310e3db45 Moved limit constants for kernel and script group
b/20728113

so that we can share them with support lib.

Change-Id: I231c0d20c41ee53342d8a975c2db5a31854b9d40
(cherry picked from commit 7b2a46fee0f95b9ae2485db36e0d279730623c4a)
2015-05-11 11:01:32 -07:00
Chih-Hung Hsieh
9eb9dd326a Fix clang warnings on unused variable, mismatched tag, print format.
BUG: 20890093
Change-Id: I91588f481d80b69823bc9d104b8bd09167ee5373
2015-05-07 12:30:13 -07:00
Jason Sams
d1516dffa8 Fix Allocation-less launches
Cherry-pick fix from AOSP.  Error check for kernel launch was
generating a false positive.

bug 20690242


Change-Id: Ic4c6644072a11aab9a273070be5734519136f685
2015-05-05 18:00:34 -07:00
Yang Ni
17c2d7a3e1 Sanity checks in JNI code for closure creation
b/20728113

In case the requested size for memory allocation overflows, or memory
allocation fails.

Change-Id: I8dac132dd4d0210938660ffbb82cbe44000d2a90
(cherry picked from commit 4e90b9b57cc96964a9d5c1845172a72cb51feafb)
2015-05-04 15:09:29 -07:00
Miao Wang
8724d359bf Merge "[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params." into mnc-dev 2015-04-30 21:25:25 +00:00
Miao Wang
82585b3906 [RenderScript] typo fix in rs BLAS jni, to correctly handle complex
params.

Change-Id: Ie44f430dc7ed4155f40aa9f9c2864fb0429c97fe
2015-04-30 13:44:49 -07:00
John Reck
ed207b9274 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

Attempt #2 to land this, original issue was in getSkBitmap
and should be fixed

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
2015-04-30 12:46:57 -07:00
John Reck
c1b33d665c GraphicsJNI Canvas cleanup
Change-Id: I72e142986a8bc9f464c1951b6b5187919de3462e
2015-04-22 09:34:34 -07:00
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
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
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
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
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
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
919b6475d3 [RenderScript] Remove duplicate include in jni
Change-Id: Ib6019ab22a83d952dce3fd6f5351120d94b49d58
2015-03-18 19:16:47 -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
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
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
Tim Murray
25207df658 Add BLAS intrinsic.
Change-Id: I95ddc46cb3f6217d2ead1091fd47450389544324
2015-02-17 13:10:25 -08:00
Jason Sams
2a3cdf57a4 Merge "Implement array types" 2015-02-09 22:58:13 +00:00
Jason Sams
46ba27e3fd Implement array types
Change-Id: I1b83f21ea2aeaa4b9f5934aadcb69d4a1c1fea20
2015-02-06 17:45:15 -08:00
Elliott Hughes
7ff53fa0d4 Fix clang build.
Change-Id: If795820ef6431fee9c9c3862cc91ad4a9cc04507
2015-02-05 21:36:10 -08:00
Yang Ni
be392ad35e Adds invocable functions to ScriptGroup
This also includes InvokeID support

Change-Id: I5b59df166ea30b309b8dd9623825ac0e72d03856
2015-02-04 16:24:48 -08:00
Yang Ni
ebf63408d2 Pass in code cache directory when creating a script group.
Change-Id: Ia73ea917a126a5055ec97f13d90a5feaafd6a2f5
2015-01-29 08:46:46 -08:00
Jason Sams
14331ab1c3 Initialize clipping structure
placeholder until array clipping is added to the API.

Change-Id: Ib20dbd71989c559c0669385a5088ec261596913c
2015-01-26 18:15:05 -08:00
Yang Ni
281c325251 New Script Group API.
Change-Id: I73d3572276a38dac775025b472ba229ad8770c84
2015-01-07 15:07:16 -08:00
Jason Sams
81cd2b18bd Fix bug in passing of context flags and version.
Change-Id: Id20906f6f47b573d881025453a3b6356bcf6e9c7
2014-12-02 12:37:04 -08:00
Bernhard Rosenkränzer
09993f768b Fix format strings mismatching the parameters passed to them
Change-Id: Ia0d33aec9edadac60508fb422e0821e6d8f28afa
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-20 15:24:46 -08:00
Andreas Gampe
67333928bf Frameworks/base: Wall Werror in rs
Turn on -Wall -Werror in rs/. Fix warnings.

Change-Id: I41923e4578edf26dbf6a31a83b6999e80d6d385a
2014-11-10 20:35:59 -08:00
Stephen Hines
4a043c1853 resolved conflicts for merge of 5a2d0432 to lmp-dev-plus-aosp
Change-Id: I59be35e67ab2b4709f27c39916b6aebc1abba56f
2014-08-21 23:20:32 -07:00