am 3c13dd80: Merge "Intrinsics test" into jb-mr1-dev (573a22a3) · Commits · e / os / android_frameworks_base

graphics/java/android/renderscript/RenderScript.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -561,6 +561,12 @@ public class RenderScript {
		return rsnScriptCCreate(mContext, resName, cacheDir, script, length);
		}

		native int rsnScriptIntrinsicCreate(int con, int id, int eid);
		synchronized int nScriptIntrinsicCreate(int id, int eid) {
		validate();
		return rsnScriptIntrinsicCreate(mContext, id, eid);
		}

		native int rsnSamplerCreate(int con, int magFilter, int minFilter,
		int wrapS, int wrapT, int wrapR, float aniso);
		synchronized int nSamplerCreate(int magFilter, int minFilter,

graphics/java/android/renderscript/ScriptIntrinsic.java

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.renderscript;

		import android.content.Context;
		import android.content.res.Resources;
		import android.util.Log;


		/**
		* @hide
		**/
		public class ScriptIntrinsic extends Script {
		ScriptIntrinsic(int id, RenderScript rs) {
		super(id, rs);
		}

		public void forEach(Allocation ain, Allocation aout) {
		forEach(0, ain, aout, null);
		}
		}

graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java

0 → 100644

+65 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.renderscript;

		import android.content.Context;
		import android.content.res.Resources;
		import android.util.Log;

		import java.io.File;
		import java.io.IOException;
		import java.io.InputStream;
		import java.util.Map.Entry;
		import java.util.HashMap;


		/**
		* @hide
		**/
		public class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic {
		private float[] mValues = new float[9];

		ScriptIntrinsicConvolve3x3(int id, RenderScript rs) {
		super(id, rs);
		}

		/**
		* Supported elements types are float, float4, uchar, uchar4
		*
		*
		* @param rs
		* @param e
		*
		* @return ScriptIntrinsicConvolve3x3
		*/
		public static ScriptIntrinsicConvolve3x3 create(RenderScript rs, Element e) {
		int id = rs.nScriptIntrinsicCreate(1, e.getID(rs));
		return new ScriptIntrinsicConvolve3x3(id, rs);

		}


		public void setValues(float v[]) {
		FieldPacker fp = new FieldPacker(9*4);
		for (int ct=0; ct < mValues.length; ct++) {
		mValues[ct] = v[ct];
		fp.addF32(mValues[ct]);
		}
		setVar(0, fp);
		}
		}

graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java

0 → 100644

+64 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.renderscript;

		import android.content.Context;
		import android.content.res.Resources;
		import android.util.Log;

		import java.io.File;
		import java.io.IOException;
		import java.io.InputStream;
		import java.util.Map.Entry;
		import java.util.HashMap;

		import java.lang.reflect.Field;
		import java.lang.reflect.Modifier;

		/**
		* @hide
		**/
		public class ScriptIntrinsicYuvToRGB extends ScriptIntrinsic {
		ScriptIntrinsicYuvToRGB(int id, RenderScript rs) {
		super(id, rs);
		}



		public static class Builder {
		RenderScript mRS;

		public Builder(RenderScript rs) {
		mRS = rs;
		}

		public void setInputFormat(int inputFormat) {

		}

		public void setOutputFormat(Element e) {

		}

		public ScriptIntrinsicYuvToRGB create() {
		return null;

		}

		}

		}

graphics/jni/android_renderscript_RenderScript.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -1071,6 +1071,13 @@ exit:
		return ret;
		}

		static jint
		nScriptIntrinsicCreate(JNIEnv *_env, jobject _this, RsContext con, jint id, jint eid)
		{
		LOG_API("nScriptIntrinsicCreate, con(%p) id(%i) element(%p)", con, id, (void *)eid);
		return (jint)rsScriptIntrinsicCreate(con, id, (RsElement)eid);
		}

		// ---------------------------------------------------------------------------

		static jint
		@@ -1412,6 +1419,7 @@ static JNINativeMethod methods[] = {
		{"rsnScriptSetVarObj", "(IIII)V", (void*)nScriptSetVarObj },

		{"rsnScriptCCreate", "(ILjava/lang/String;Ljava/lang/String;[BI)I", (void*)nScriptCCreate },
		{"rsnScriptIntrinsicCreate", "(III)I", (void*)nScriptIntrinsicCreate },

		{"rsnProgramStoreCreate", "(IZZZZZZIII)I", (void*)nProgramStoreCreate },