Bug fixes. TriangleMesh now ref-counts, implement missing element formats,... (0826a6f9) · Commits · e / os / android_frameworks_base

libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -18,15 +18,12 @@ package com.android.fountain;

		import java.io.Writer;

		import android.renderscript.RSSurfaceView;
		import android.renderscript.RenderScript;

		import android.content.Context;
		import android.content.res.Resources;
		import android.graphics.Bitmap;
		import android.graphics.drawable.BitmapDrawable;
		import android.graphics.drawable.Drawable;
		import android.util.AttributeSet;
		import android.util.Log;

		public class FountainRS {

libs/rs/java/RenderScript/android/renderscript/Matrix.java

0 → 100644

+188 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009 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 java.lang.Math;
		import android.util.Log;


		class Matrix {

		public Matrix() {
		mMat = new float[16];
		loadIdentity();
		}

		public float get(int i, int j) {
		return mMat[i*4 + j];
		}

		public void set(int i, int j, float v) {
		mMat[i*4 + j] = v;
		}

		public void loadIdentity() {
		mMat[0] = 1;
		mMat[1] = 0;
		mMat[2] = 0;
		mMat[3] = 0;

		mMat[4] = 0;
		mMat[5] = 1;
		mMat[6] = 0;
		mMat[7] = 0;

		mMat[8] = 0;
		mMat[9] = 0;
		mMat[10] = 1;
		mMat[11] = 0;

		mMat[12] = 0;
		mMat[13] = 0;
		mMat[14] = 0;
		mMat[15] = 1;
		}

		public void load(Matrix src) {
		mMat = src.mMat;
		}

		public void loadRotate(float rot, float x, float y, float z) {
		float c, s;
		mMat[3] = 0;
		mMat[7] = 0;
		mMat[11]= 0;
		mMat[12]= 0;
		mMat[13]= 0;
		mMat[14]= 0;
		mMat[15]= 1;
		rot *= (float)(java.lang.Math.PI / 180.0f);
		c = (float)java.lang.Math.cos(rot);
		s = (float)java.lang.Math.sin(rot);

		float len = (float)java.lang.Math.sqrt(xx + yy + z*z);
		if (!(len != 1)) {
		float recipLen = 1.f / len;
		x *= recipLen;
		y *= recipLen;
		z *= recipLen;
		}
		float nc = 1.0f - c;
		float xy = x * y;
		float yz = y * z;
		float zx = z * x;
		float xs = x * s;
		float ys = y * s;
		float zs = z * s;
		mMat[ 0] = xxnc + c;
		mMat[ 4] = xy*nc - zs;
		mMat[ 8] = zx*nc + ys;
		mMat[ 1] = xy*nc + zs;
		mMat[ 5] = yync + c;
		mMat[ 9] = yz*nc - xs;
		mMat[ 2] = zx*nc - ys;
		mMat[ 6] = yz*nc + xs;
		mMat[10] = zznc + c;
		}

		public void loadScale(float x, float y, float z) {
		loadIdentity();
		mMat[0] = x;
		mMat[5] = y;
		mMat[10] = z;
		}

		public void loadTranslate(float x, float y, float z) {
		loadIdentity();
		mMat[12] = x;
		mMat[13] = y;
		mMat[14] = z;
		}

		public void loadMultiply(Matrix lhs, Matrix rhs) {
		for (int i=0 ; i<4 ; i++) {
		float ri0 = 0;
		float ri1 = 0;
		float ri2 = 0;
		float ri3 = 0;
		for (int j=0 ; j<4 ; j++) {
		float rhs_ij = rhs.get(i,j);
		ri0 += lhs.get(j,0) * rhs_ij;
		ri1 += lhs.get(j,1) * rhs_ij;
		ri2 += lhs.get(j,2) * rhs_ij;
		ri3 += lhs.get(j,3) * rhs_ij;
		}
		set(i,0, ri0);
		set(i,1, ri1);
		set(i,2, ri2);
		set(i,3, ri3);
		}
		}

		public void loadOrtho(float l, float r, float b, float t, float n, float f) {
		loadIdentity();
		mMat[0] = 2 / (r - l);
		mMat[5] = 2 / (t - b);
		mMat[10]= -2 / (f - n);
		mMat[12]= -(r + l) / (r - l);
		mMat[12]= -(t + b) / (t - b);
		mMat[12]= -(f + n) / (f - n);
		}

		public void loadFrustum(float l, float r, float b, float t, float n, float f) {
		loadIdentity();
		mMat[0] = 2 * n / (r - l);
		mMat[5] = 2 * n / (t - b);
		mMat[8] = (r + l) / (r - l);
		mMat[9] = (t + b) / (t - b);
		mMat[10]= -(f + n) / (f - n);
		mMat[11]= -1;
		mMat[14]= -2fn / (f - n);
		mMat[15]= 0;
		}

		public void multiply(Matrix rhs) {
		Matrix tmp = new Matrix();
		tmp.loadMultiply(this, rhs);
		load(tmp);
		}
		public void rotate(float rot, float x, float y, float z) {
		Matrix tmp = new Matrix();
		tmp.loadRotate(rot, x, y, z);
		multiply(tmp);
		}
		public void scale(float x, float y, float z) {
		Matrix tmp = new Matrix();
		tmp.loadScale(x, y, z);
		multiply(tmp);
		}
		public void translate(float x, float y, float z) {
		Matrix tmp = new Matrix();
		tmp.loadTranslate(x, y, z);
		multiply(tmp);
		}



		float[] mMat;

		}

libs/rs/java/RenderScript/android/renderscript/ProgramVertexAlloc.java

0 → 100644

+112 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009 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 java.lang.Math;
		import android.util.Log;


		public class ProgramVertexAlloc {
		public static final int MODELVIEW_OFFSET = 0;
		public static final int PROJECTION_OFFSET = 16;
		public static final int TEXTURE_OFFSET = 32;

		Matrix mModel;
		Matrix mProjection;
		Matrix mTexture;

		public RenderScript.Allocation mAlloc;

		public ProgramVertexAlloc(RenderScript rs) {
		mModel = new Matrix();
		mProjection = new Matrix();
		mTexture = new Matrix();

		mAlloc = rs.allocationCreatePredefSized(
		RenderScript.ElementPredefined.USER_FLOAT,
		48);

		mAlloc.subData1D(MODELVIEW_OFFSET, 16, mModel.mMat);
		mAlloc.subData1D(PROJECTION_OFFSET, 16, mProjection.mMat);
		mAlloc.subData1D(TEXTURE_OFFSET, 16, mTexture.mMat);
		}

		public void loadModelview(Matrix m) {
		mModel = m;
		mAlloc.subData1D(MODELVIEW_OFFSET, 16, m.mMat);
		}

		public void loadProjection(Matrix m) {
		mProjection = m;
		mAlloc.subData1D(PROJECTION_OFFSET, 16, m.mMat);
		}

		public void loadTexture(Matrix m) {
		mTexture = m;
		mAlloc.subData1D(TEXTURE_OFFSET, 16, m.mMat);
		}

		public void setupOrthoWindow(int w, int h) {
		mProjection.loadOrtho(0,w, h,0, -1,1);
		mAlloc.subData1D(PROJECTION_OFFSET, 16, mProjection.mMat);
		}

		public void setupOrthoNormalized(int w, int h) {
		// range -1,1 in the narrow axis.
		if(w > h) {
		float aspect = ((float)w) / h;
		mProjection.loadOrtho(-aspect,aspect, -1,1, -1,1);
		} else {
		float aspect = ((float)h) / w;
		mProjection.loadOrtho(-1,1, -aspect,aspect, -1,1);
		}
		mAlloc.subData1D(PROJECTION_OFFSET, 16, mProjection.mMat);
		}

		public void setupProjectionNormalized(int w, int h) {
		// range -1,1 in the narrow axis at z = 0.
		Matrix m1 = new Matrix();
		Matrix m2 = new Matrix();

		if(w > h) {
		float aspect = ((float)w) / h;
		m1.loadFrustum(-aspect,aspect, -1,1, 1,100);
		} else {
		float aspect = ((float)h) / w;
		m1.loadFrustum(-1,1, -aspect,aspect, 1,100);
		}

		m2.loadRotate(180, 0, 1, 0);
		m1.loadMultiply(m1, m2);

		m2.loadScale(-2, 2, 1);
		m1.loadMultiply(m1, m2);

		m2.loadTranslate(0, 0, 2);
		m1.loadMultiply(m1, m2);

		mProjection = m1;
		mAlloc.subData1D(PROJECTION_OFFSET, 16, mProjection.mMat);
		}

		}

libs/rs/java/RenderScript/android/renderscript/RenderScript.java

+25 −10

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@ public class RenderScript {
		native private void nContextBindSampler(int sampler, int slot);
		native private void nContextBindProgramFragmentStore(int pfs);
		native private void nContextBindProgramFragment(int pf);
		native private void nContextBindProgramVertex(int pf);

		native private void nAssignName(int obj, byte[] name);

		@@ -102,6 +103,7 @@ public class RenderScript {
		native private void nTriangleMeshAddVertex_XYZ (float x, float y, float z);
		native private void nTriangleMeshAddVertex_XY_ST (float x, float y, float s, float t);
		native private void nTriangleMeshAddVertex_XYZ_ST (float x, float y, float z, float s, float t);
		native private void nTriangleMeshAddVertex_XYZ_ST_NORM (float x, float y, float z, float s, float t, float nx, float ny, float nz);
		native private void nTriangleMeshAddTriangle(int i1, int i2, int i3);
		native private int nTriangleMeshCreate();

		@@ -155,6 +157,7 @@ public class RenderScript {
		native private void nProgramVertexSetCameraMode(boolean isOrtho);
		native private void nProgramVertexSetTextureMatrixEnable(boolean enable);
		native private void nProgramVertexSetModelMatrixEnable(boolean enable);
		native private void nProgramVertexSetProjectionMatrixEnable(boolean enable);
		native private int nProgramVertexCreate();


		@@ -228,19 +231,19 @@ public class RenderScript {

		A_8 (7),
		RGB_565 (8),
		RGB_888 (12),
		RGB_888 (11),
		RGBA_5551 (9),
		RGBA_4444 (10),
		RGBA_8888 (13),
		RGBA_8888 (12),

		INDEX_16 (16),
		INDEX_32 (17),
		XY_F32 (18),
		XYZ_F32 (19),
		ST_XY_F32 (20),
		ST_XYZ_F32 (21),
		NORM_XYZ_F32 (22),
		NORM_ST_XYZ_F32 (23);
		INDEX_16 (13),
		INDEX_32 (14),
		XY_F32 (15),
		XYZ_F32 (16),
		ST_XY_F32 (17),
		ST_XYZ_F32 (18),
		NORM_XYZ_F32 (19),
		NORM_ST_XYZ_F32 (20);

		int mID;
		ElementPredefined(int id) {
		@@ -593,6 +596,10 @@ public class RenderScript {
		nTriangleMeshAddVertex_XYZ_ST(x, y, z, s, t);
		}

		public void triangleMeshAddVertex_XYZ_ST_NORM(float x, float y, float z, float s, float t, float nx, float ny, float nz) {
		nTriangleMeshAddVertex_XYZ_ST_NORM(x, y, z, s, t, nx, ny, nz);
		}

		public void triangleMeshAddTriangle(int i1, int i2, int i3) {
		nTriangleMeshAddTriangle(i1, i2, i3);
		}
		@@ -738,6 +745,10 @@ public class RenderScript {
		nProgramVertexSetModelMatrixEnable(enable);
		}

		public void programVertexSetProjectionMatrixEnable(boolean enable) {
		nProgramVertexSetProjectionMatrixEnable(enable);
		}

		public ProgramVertex programVertexCreate() {
		int id = nProgramVertexCreate();
		return new ProgramVertex(id);
		@@ -893,6 +904,10 @@ public class RenderScript {
		nContextBindProgramFragment(pf.mID);
		}

		public void contextBindProgramVertex(ProgramVertex pf) {
		nContextBindProgramVertex(pf.mID);
		}

		/*
		RsAdapter2D rsAdapter2DCreate ();
		void rsAdapter2DBindAllocation (RsAdapter2D adapt, RsAllocation alloc);

libs/rs/java/Rollo/Android.mk

0 → 100644

+25 −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.
		#

		LOCAL_PATH := $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES := $(call all-java-files-under, src)
		LOCAL_STATIC_JAVA_LIBRARIES := android.renderscript

		LOCAL_PACKAGE_NAME := Rollo

		include $(BUILD_PACKAGE)