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
Tim Murray
053e36dfa3
am c9c78206: am 9ba9298e: Merge "Stop sign-extending RS IDs." into lmp-dev
...
* commit 'c9c7820604158bc6c6ba0e413cc48c8e1c0a6366':
Stop sign-extending RS IDs.
2014-08-19 21:07:47 +00:00
Tim Murray
3aa89c1e24
Stop sign-extending RS IDs.
...
bug 16846318
bug 17006933
Change-Id: I6b1e73ed983ec583e80dc532e38c2ae2e504e608
2014-08-18 18:14:54 -07:00
Chris Wailes
488230c3fe
Replace NULL macros with nullptr literals.
...
Change-Id: I6c2af76f1f134d3f233d5462fed3969910ae2f24
2014-08-18 15:21:16 -07:00
Stephen Hines
93697c5f8e
am 4ae9a6d5: am 42895561: Merge "Collapse code paths for single- and multi-input kernels."
...
* commit '4ae9a6d5c517f67d9929cc43568c6b7e3b4dfe23':
Collapse code paths for single- and multi-input kernels.
2014-08-18 20:00:34 +00:00
Chris Wailes
be7b1defb6
Collapse code paths for single- and multi-input kernels.
...
This patch simplifies the RenderScript JNI layer by replacing six functions
with a single funciton. This new function now handles all previous cases.
Functions in android.renderscript.script have been updated to use this new JNI
function.
Change-Id: I6cd5448534c38123d51a589339bbeb7e98453e73
2014-08-18 08:03:52 -07:00
Stephen Hines
42a33d5bbf
am b75dc06b: am 4179e889: Merge "Revert "Collapse code paths for single- and multi-input kernels.""
...
* commit 'b75dc06bbe2fdff1a4c9baa69eb92a849c22715d':
Revert "Collapse code paths for single- and multi-input kernels."
2014-08-13 17:43:00 +00:00
Stephen Hines
c27ebda05e
am 5aaeb8e8: am 24a2ee66: Merge "Collapse code paths for single- and multi-input kernels."
...
* commit '5aaeb8e89eb0afd710ba9586f5e314b76e806116':
Collapse code paths for single- and multi-input kernels.
2014-08-13 17:34:59 +00:00
Stephen Hines
c9c7daf69b
Revert "Collapse code paths for single- and multi-input kernels."
...
This reverts commit eb3470219dea322efa93eb4b5457813ce71d0c5d.
Change-Id: Id943abf953e832ef831318e6699d4b46e9b46201
2014-08-13 17:32:19 +00:00
Chris Wailes
eb3470219d
Collapse code paths for single- and multi-input kernels.
...
This patch simplifies the RenderScript JNI layer by replacing six functions
with a single funciton. This new function now handles all previous cases.
Functions in android.renderscript.script have been updated to use this new JNI
function.
Change-Id: I77e4b155cc7ca1581b05bf901c70ae53a9ff0b12
2014-08-07 14:57:22 -07:00
Chris Wailes
949610653f
Adds support for multi-input kernels to Frameworks/Base/RS.
...
* Added a new JNI call to pass arrays of Allocations to the RS runtime.
* Added a new version of ForEach that takes an array of Allocations.
* Added some casts to disambiguate existing calls to forEach.
Change-Id: I46d2834c37075b2a2407fd8b010546818a4540d1
2014-07-07 12:27:21 -07:00
Stephen Hines
48ba506dfa
resolved conflicts for merge of 31012e2c to master
...
Change-Id: I2e24e0457570d7d856293637a553f0242a97a83b
2014-07-09 07:39:38 -07:00
Stephen Hines
bc5d3eeedc
Switch from size_t -> uint32_t for dimensions array.
...
Change-Id: I159586e98dd47be9b9f5db0f3e27d1072533134c
2014-06-25 00:03:39 -07:00
Stephen Hines
ed38a32d37
am af97f87a: am 6d38cec1: am 924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array."
...
* commit 'af97f87a477efa05905134baa01bc6b5222b2448':
Switch from size_t -> uint32_t for dimensions array.
2014-06-25 20:58:34 +00:00
Tim Murray
56f9e6f8d5
Add support for mixed 32/64 APKs using RenderScript.
...
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
2014-06-03 15:11:37 -07:00
Tim Murray
1afc29ae38
Merge "Add support for mixed 32/64 APKs using RenderScript."
2014-06-03 21:36:19 +00:00
Tim Murray
f0c62b2676
Add support for mixed 32/64 APKs using RenderScript.
...
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
2014-06-03 12:30:53 -07:00
Ying Wang
29894c6176
am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."
...
* commit 'db55bb0622e9fbe4b858d59409f516de01c1f1fd':
Remove unused LOCAL_LDLIBS.
2014-05-08 18:31:18 +00:00
Ying Wang
4463cbc61d
am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."
...
* commit '3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3':
Remove unused LOCAL_LDLIBS.
2014-05-08 00:21:38 +00:00
Ying Wang
b38e3fdf5a
Remove unused LOCAL_LDLIBS.
...
Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
2014-05-07 15:23:37 -07:00
Stephen Hines
9deecdc88f
am fc45b664: am f0aa4cc0: am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."
...
* commit 'fc45b664d421553042629d24086a144761c7b5e1':
Fix improper use of JNI_ABORT for operations where Java objects are written.
2014-04-17 23:33:54 +00:00
Stephen Hines
f0aa4cc0f2
am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."
...
* commit 'a48985349cb26757b6c4be18acc496ab6d1110e5':
Fix improper use of JNI_ABORT for operations where Java objects are written.
2014-04-17 18:20:47 +00:00
Stephen Hines
414fa2c93a
Fix improper use of JNI_ABORT for operations where Java objects are written.
...
In these RS API calls, it is possible (and very likely) that some Java objects
are written to via JNI calls into the RS driver. These writes can end up being
discarded if we specify JNI_ABORT, particularly if the Java object has been
moved due to GC. The change introduces a readonly mode for some macro calls
and updates other JNI callers to appropriately skip JNI_ABORT.
Change-Id: I8c5f2ae959b3fbc9008c9d2ac4542f2ebab29b06
2014-04-17 01:02:42 -07:00
Glenn Kasten
5341f881e0
am 4f346bf0: am ff1e1d99: am 240d5638: am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript"
...
* commit '4f346bf0ffe1c596ca261dfec23c50977de77d82':
Fix 64 bit compile failures in renderscript
2014-03-19 21:22:06 +00:00
Glenn Kasten
240d563863
am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript"
...
* commit 'c1f3d4c1ba7903d1b72c2341b5284da12b79ee46':
Fix 64 bit compile failures in renderscript
2014-03-19 14:05:20 -07:00
Narayan Kamath
78c0ce5612
Fix 64 bit compile failures in renderscript
...
Use uintptr_t for pointers (and not uint32_t) and
also don't assume that size_t is 32 bits wide.
Also uses java longs for passing pointers across
JNI boundaries.
Change-Id: Ie52bd8ae967fbddc911eda3a43cc799d53bbce66
2014-03-19 17:14:54 +00:00
Narayan Kamath
11e4317555
am 62d675c2: am 0d3548be: am d138029d: am 14420e29: Merge "AArch64: Use long[] for RS id array"
...
* commit '62d675c240fd87cb987c86ae4f6ac17dc13374c8':
AArch64: Use long[] for RS id array
2014-02-28 13:35:07 +00:00
Narayan Kamath
d138029d92
am 14420e29: Merge "AArch64: Use long[] for RS id array"
...
* commit '14420e29abc0f16f818ddaf606515861ba69ae68':
AArch64: Use long[] for RS id array
2014-02-28 05:26:30 -08:00
Derek Sollenberger
eece0dda56
Fix includes so that they no longer rely on the global Skia includes directories.
...
bug:13225538
Change-Id: Ia5d816dc665f81c7985f21036af4fd0a63c560cf
2014-02-27 14:31:29 -05:00
Andreas Huber
9ae000ca8c
Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."
...
This reverts commit 7825334929b098b36e1144872200e75ba6d24b13.
Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
2014-02-13 17:22:33 +00:00
Ashok Bhat
9807155b11
AArch64: Use long[] for RS id array
...
Change-Id: Ia5145a547c0d13c7d6f1bb4d8f5472be62481bd9
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-12 23:09:03 +00:00
Andreas Huber
7825334929
Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.
...
AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need
to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv()
thus minimizing build dependencies.
Change-Id: Ia7f0c94c8c02b974c068e0db34774827f96aa95b
2014-02-12 15:00:05 -08:00
Narayan Kamath
f152d95085
am 33a608a0: am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
...
* commit '33a608a0a326d9671bffd6750cb5521d6687cc57':
AArch64: Use long for pointers in RS Java/JNI code
2014-02-10 13:45:15 +00:00
Narayan Kamath
578d4f5f50
am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
...
* commit '56062983f1e07295c812fba0e22ce579a35b6f76':
AArch64: Use long for pointers in RS Java/JNI code
2014-02-10 05:37:18 -08:00
Ashok Bhat
0e0c0885ae
AArch64: Use long for pointers in RS Java/JNI code
...
Changes include
[x] Some JNI functions, with return type jlong, casts
pointer to jint before returning it. This has been fixed.
[x] Minor JNI function prototype changes where
formal paramter type has been changed to a JNI
type (int to jint for example).
[x] long is used for ScriptC, Sampler, Font, ProgramStore
handles as they can be 64-bit.
[x] A new hidden constructor ScriptC(long, RenderScript)
has been added. This should eventually replace public
API method ScriptC(int, RenderScript).
[x] Font and FileA3D use getNativeAsset instead of getAssetInt
to get Asset Handles. The getAssetInt method will be
deprecated in favor of getNativeAsset, as the former does
not support 64-bit.
[x] rsnPathCreate method accepts loop as an int. This should
be long as the underlying RS function assumes this to be
a pointer.
Change-Id: I919d857e5933febe63966049da83de9f9adee6f5
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-05 11:26:38 +00:00
Tim Murray
67d9e0be8e
am 0cc37f4c: Merge "Fix debug context."
...
* commit '0cc37f4cdeaed95e4f61f1a6e7b78f07e7025e97':
Fix debug context.
2014-02-03 14:41:30 -08:00
Tim Murray
42955bab2a
am d8b4dd95: Merge "Fix most logging macros for context pointers."
...
* commit 'd8b4dd9555e987df92206562061080b327598f41':
Fix most logging macros for context pointers.
2014-02-03 14:41:24 -08:00
Tim Murray
16e9362e5f
am 8fced317: Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs."
...
* commit '8fced3174ad45e5d618f28c82d69bd21261f6108':
Move RenderScript from graphics/ to new fw/base subdirectory rs.
2014-02-03 14:41:17 -08:00
Tim Murray
b75c27e870
Fix debug context.
...
bug 12477551
Change-Id: Icac28abc3dabce31834faa1942b596c2f207f29e
2014-01-31 12:35:19 -08:00