Merge "Adding support for all allowed textures. Cleaning up unused code Adding error messages" (04b5dd4b) · Commits · e / os / android_frameworks_base

graphics/java/android/renderscript/Program.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -154,6 +154,13 @@ public class Program extends BaseObj {
		mOutputs[mOutputCount++] = e;
		}

		void resetConstant() {
		mConstantCount = 0;
		for(int i = 0; i < MAX_CONSTANT; i ++) {
		mConstants[i] = null;
		}
		}

		public int addConstant(Type t) throws IllegalStateException {
		// Should check for consistant and non-conflicting names...
		if(mConstantCount >= MAX_CONSTANT) {
		@@ -165,7 +172,7 @@ public class Program extends BaseObj {

		public BaseProgramBuilder setTextureCount(int count) throws IllegalArgumentException {
		// Should check for consistant and non-conflicting names...
		if(count >= MAX_CONSTANT) {
		if(count >= MAX_TEXTURE) {
		throw new IllegalArgumentException("Max texture count exceeded.");
		}
		mTextureCount = count;

graphics/java/android/renderscript/ProgramFragment.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ public class ProgramFragment extends Program {
		tmp[idx++] = 3;
		tmp[idx++] = mTextureCount;

		int id = mRS.nProgramFragmentCreate2(mShader, tmp);
		int id = mRS.nProgramFragmentCreate(mShader, tmp);
		ProgramFragment pf = new ProgramFragment(id, mRS);
		initProgram(pf);
		return pf;
		@@ -199,6 +199,7 @@ public class ProgramFragment extends Program {
		mNumTextures ++;
		}
		}
		resetConstant();
		buildShaderString();
		Type constType = null;
		if (!mVaryingColorEnable) {

graphics/java/android/renderscript/ProgramVertex.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ public class ProgramVertex extends Program {
		tmp[idx++] = 3;
		tmp[idx++] = mTextureCount;

		int id = mRS.nProgramVertexCreate2(mShader, tmp);
		int id = mRS.nProgramVertexCreate(mShader, tmp);
		ProgramVertex pv = new ProgramVertex(id, mRS);
		initProgram(pv);
		return pv;

graphics/java/android/renderscript/RenderScript.java

+6 −17

Original line number	Diff line number	Diff line
		@@ -447,25 +447,14 @@ public class RenderScript {
		synchronized void nProgramBindSampler(int vpf, int slot, int s) {
		rsnProgramBindSampler(mContext, vpf, slot, s);
		}

		native int rsnProgramFragmentCreate(int con, int[] params);
		synchronized int nProgramFragmentCreate(int[] params) {
		return rsnProgramFragmentCreate(mContext, params);
		}
		native int rsnProgramFragmentCreate2(int con, String shader, int[] params);
		synchronized int nProgramFragmentCreate2(String shader, int[] params) {
		return rsnProgramFragmentCreate2(mContext, shader, params);
		native int rsnProgramFragmentCreate(int con, String shader, int[] params);
		synchronized int nProgramFragmentCreate(String shader, int[] params) {
		return rsnProgramFragmentCreate(mContext, shader, params);
		}

		native int rsnProgramVertexCreate(int con, boolean texMat);
		synchronized int nProgramVertexCreate(boolean texMat) {
		return rsnProgramVertexCreate(mContext, texMat);
		native int rsnProgramVertexCreate(int con, String shader, int[] params);
		synchronized int nProgramVertexCreate(String shader, int[] params) {
		return rsnProgramVertexCreate(mContext, shader, params);
		}
		native int rsnProgramVertexCreate2(int con, String shader, int[] params);
		synchronized int nProgramVertexCreate2(String shader, int[] params) {
		return rsnProgramVertexCreate2(mContext, shader, params);
		}


		native int rsnMeshCreate(int con, int vtxCount, int indexCount);
		synchronized int nMeshCreate(int vtxCount, int indexCount) {

graphics/jni/android_renderscript_RenderScript.cpp

+19 −41

Original line number	Diff line number	Diff line
		@@ -983,29 +983,16 @@ nProgramBindSampler(JNIEnv *_env, jobject _this, RsContext con, jint vpf, jint s
		// ---------------------------------------------------------------------------

		static jint
		nProgramFragmentCreate(JNIEnv *_env, jobject _this, RsContext con, jintArray params)
		{
		jint *paramPtr = _env->GetIntArrayElements(params, NULL);
		jint paramLen = _env->GetArrayLength(params);

		LOG_API("nProgramFragmentCreate, con(%p), paramLen(%i)", con, paramLen);

		jint ret = (jint)rsProgramFragmentCreate(con, (uint32_t *)paramPtr, paramLen);
		_env->ReleaseIntArrayElements(params, paramPtr, JNI_ABORT);
		return ret;
		}

		static jint
		nProgramFragmentCreate2(JNIEnv *_env, jobject _this, RsContext con, jstring shader, jintArray params)
		nProgramFragmentCreate(JNIEnv *_env, jobject _this, RsContext con, jstring shader, jintArray params)
		{
		const char* shaderUTF = _env->GetStringUTFChars(shader, NULL);
		jint shaderLen = _env->GetStringUTFLength(shader);
		jint *paramPtr = _env->GetIntArrayElements(params, NULL);
		jint paramLen = _env->GetArrayLength(params);

		LOG_API("nProgramFragmentCreate2, con(%p), shaderLen(%i), paramLen(%i)", con, shaderLen, paramLen);
		LOG_API("nProgramFragmentCreate, con(%p), shaderLen(%i), paramLen(%i)", con, shaderLen, paramLen);

		jint ret = (jint)rsProgramFragmentCreate2(con, shaderUTF, shaderLen, (uint32_t *)paramPtr, paramLen);
		jint ret = (jint)rsProgramFragmentCreate(con, shaderUTF, shaderLen, (uint32_t *)paramPtr, paramLen);
		_env->ReleaseStringUTFChars(shader, shaderUTF);
		_env->ReleaseIntArrayElements(params, paramPtr, JNI_ABORT);
		return ret;
		@@ -1015,23 +1002,16 @@ nProgramFragmentCreate2(JNIEnv *_env, jobject _this, RsContext con, jstring shad
		// ---------------------------------------------------------------------------

		static jint
		nProgramVertexCreate(JNIEnv *_env, jobject _this, RsContext con, jboolean texMat)
		{
		LOG_API("nProgramVertexCreate, con(%p), texMat(%i)", con, texMat);
		return (jint)rsProgramVertexCreate(con, texMat);
		}

		static jint
		nProgramVertexCreate2(JNIEnv *_env, jobject _this, RsContext con, jstring shader, jintArray params)
		nProgramVertexCreate(JNIEnv *_env, jobject _this, RsContext con, jstring shader, jintArray params)
		{
		const char* shaderUTF = _env->GetStringUTFChars(shader, NULL);
		jint shaderLen = _env->GetStringUTFLength(shader);
		jint *paramPtr = _env->GetIntArrayElements(params, NULL);
		jint paramLen = _env->GetArrayLength(params);

		LOG_API("nProgramVertexCreate2, con(%p), shaderLen(%i), paramLen(%i)", con, shaderLen, paramLen);
		LOG_API("nProgramVertexCreate, con(%p), shaderLen(%i), paramLen(%i)", con, shaderLen, paramLen);

		jint ret = (jint)rsProgramVertexCreate2(con, shaderUTF, shaderLen, (uint32_t *)paramPtr, paramLen);
		jint ret = (jint)rsProgramVertexCreate(con, shaderUTF, shaderLen, (uint32_t *)paramPtr, paramLen);
		_env->ReleaseStringUTFChars(shader, shaderUTF);
		_env->ReleaseIntArrayElements(params, paramPtr, JNI_ABORT);
		return ret;
		@@ -1307,15 +1287,13 @@ static JNINativeMethod methods[] = {
		{"rsnProgramBindTexture", "(IIII)V", (void*)nProgramBindTexture },
		{"rsnProgramBindSampler", "(IIII)V", (void*)nProgramBindSampler },

		{"rsnProgramFragmentCreate", "(I[I)I", (void*)nProgramFragmentCreate },
		{"rsnProgramFragmentCreate2", "(ILjava/lang/String;[I)I", (void*)nProgramFragmentCreate2 },
		{"rsnProgramFragmentCreate", "(ILjava/lang/String;[I)I", (void*)nProgramFragmentCreate },

		{"rsnProgramRasterCreate", "(IZZZ)I", (void*)nProgramRasterCreate },
		{"rsnProgramRasterSetLineWidth", "(IIF)V", (void*)nProgramRasterSetLineWidth },
		{"rsnProgramRasterSetCullMode", "(III)V", (void*)nProgramRasterSetCullMode },

		{"rsnProgramVertexCreate", "(IZ)I", (void*)nProgramVertexCreate },
		{"rsnProgramVertexCreate2", "(ILjava/lang/String;[I)I", (void*)nProgramVertexCreate2 },
		{"rsnProgramVertexCreate", "(ILjava/lang/String;[I)I", (void*)nProgramVertexCreate },

		{"rsnContextBindRootScript", "(II)V", (void*)nContextBindRootScript },
		{"rsnContextBindProgramStore", "(II)V", (void*)nContextBindProgramStore },