Stephen Hines b6b17a575f resolved conflicts for merge of 764f08ad to master ...

Change-Id: I0a22225b2d26b6d806de2dcc70ffba29c96865b3

2015-04-07 14:47:32 -07:00

..

Allocation.java

am 1327fa9e: am 511eb660: am 6aed9ec1: Merge "[RenderScript] update exception reporting for copyTo() after autoPadding added."

2015-04-03 18:18:01 +00:00

AllocationAdapter.java

unhide AllocationAdapter APIs

2015-03-20 15:09:35 -07:00

BaseObj.java

Fix null check for BaseObj.equals.

2014-02-28 16:57:47 -08:00

Byte2.java

…

Byte3.java

…

Byte4.java

…

Double2.java

…

Double3.java

…

Double4.java

…

Element.java

unhide RS apis

2015-03-30 15:31:26 -07:00

FieldPacker.java

Rewrote FieldPack::createFieldPack for alignment

2015-04-06 14:49:53 -07:00

FileA3D.java

Catch errors for unknown object types.

2015-03-26 15:29:56 -07:00

Float2.java

…

Float3.java

…

Float4.java

…

Font.java

Switch from Droid -> Noto for RS fonts.

2014-06-11 17:57:16 -07:00

Int2.java

…

Int3.java

…

Int4.java

…

Long2.java

…

Long3.java

…

Long4.java

Fix a typo.

2014-02-07 11:04:26 -08:00

Matrix2f.java

…

Matrix3f.java

…

Matrix4f.java

…

Mesh.java

Fix potential npe

2015-03-26 14:47:17 -07:00

package.html

…

Program.java

…

ProgramFragment.java

am 62d675c2: am 0d3548be: am d138029d: am 14420e29: Merge "AArch64: Use long[] for RS id array"

2014-02-28 13:35:07 +00:00

ProgramFragmentFixedFunction.java

am 62d675c2: am 0d3548be: am d138029d: am 14420e29: Merge "AArch64: Use long[] for RS id array"

2014-02-28 13:35:07 +00:00

ProgramRaster.java

…

ProgramStore.java

am 33a608a0: am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"

2014-02-10 13:45:15 +00:00

ProgramVertex.java

am 62d675c2: am 0d3548be: am d138029d: am 14420e29: Merge "AArch64: Use long[] for RS id array"

2014-02-28 13:35:07 +00:00

ProgramVertexFixedFunction.java

am c5b11fcc: am ff83ed2d: am b02dadd4: Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP."

2014-06-19 03:26:15 +00:00

RenderScript.java

resolved conflicts for merge of 764f08ad to master

2015-04-07 14:47:32 -07:00

RenderScriptCacheDir.java

Move cache dir to its own class.

2015-04-07 13:24:14 -07:00

RenderScriptGL.java

am c796ccaa: am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"

2014-04-01 00:24:57 +00:00

RSDriverException.java

…

RSIllegalArgumentException.java

…

RSInvalidStateException.java

…

RSRuntimeException.java

…

RSSurfaceView.java

…

RSTextureView.java

…

Sampler.java

am 33a608a0: am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"

2014-02-10 13:45:15 +00:00

Script.java

Update LaunchOptions description

2015-03-30 17:01:10 -07:00

ScriptC.java

Move cache dir to its own class.

2015-04-07 13:24:14 -07:00

ScriptGroup2.java

Merge "Add a name to ScriptGroup2.Builder.create method"

2015-04-07 19:54:31 +00:00

ScriptGroup.java

am 62d675c2: am 0d3548be: am d138029d: am 14420e29: Merge "AArch64: Use long[] for RS id array"

2014-02-28 13:35:07 +00:00

ScriptIntrinsic3DLUT.java

…

ScriptIntrinsic.java

Add check and throw for failed Intrinsic init.

2014-06-23 15:15:08 -07:00

ScriptIntrinsicBLAS.java

Add BLAS intrinsic.

2015-02-17 13:10:25 -08:00

ScriptIntrinsicBlend.java

Fix broken blend intrinsic.

2014-07-10 13:00:10 -07:00

ScriptIntrinsicBlur.java

Fix minor blur doc bug

2015-04-02 14:10:53 -07:00

ScriptIntrinsicColorMatrix.java

…

ScriptIntrinsicConvolve3x3.java

resolved conflicts for merge of 31012e2c to master

2014-07-09 07:39:38 -07:00

ScriptIntrinsicConvolve5x5.java

resolved conflicts for merge of 31012e2c to master

2014-07-09 07:39:38 -07:00

ScriptIntrinsicHistogram.java

[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram

2015-01-23 19:15:57 +00:00

ScriptIntrinsicLUT.java

…

ScriptIntrinsicResize.java

Add Float32 suppor for IntrinsicResize. base part.

2014-11-13 15:32:18 -08:00

ScriptIntrinsicYuvToRGB.java

Adds support for multi-input kernels to Frameworks/Base/RS.

2014-07-07 12:27:21 -07:00

Short2.java

…

Short3.java

…

Short4.java

…

Type.java

unhide RS apis

2015-03-30 15:31:26 -07:00