Merge "Rename ProgramFragmentStore to ProgramStore." (1be97a80) · Commits · e / os / android_frameworks_base

graphics/java/android/renderscript/ProgramStore.java

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -147,17 +147,17 @@ public class ProgramStore extends BaseObj {
	if (b.mOut != null) {		if (b.mOut != null) {
	outID = b.mOut.mID;		outID = b.mOut.mID;
	}		}
	rs.nProgramFragmentStoreBegin(inID, outID);		rs.nProgramStoreBegin(inID, outID);
	rs.nProgramFragmentStoreDepthFunc(b.mDepthFunc.mID);		rs.nProgramStoreDepthFunc(b.mDepthFunc.mID);
	rs.nProgramFragmentStoreDepthMask(b.mDepthMask);		rs.nProgramStoreDepthMask(b.mDepthMask);
	rs.nProgramFragmentStoreColorMask(b.mColorMaskR,		rs.nProgramStoreColorMask(b.mColorMaskR,
	b.mColorMaskG,		b.mColorMaskG,
	b.mColorMaskB,		b.mColorMaskB,
	b.mColorMaskA);		b.mColorMaskA);
	rs.nProgramFragmentStoreBlendFunc(b.mBlendSrc.mID, b.mBlendDst.mID);		rs.nProgramStoreBlendFunc(b.mBlendSrc.mID, b.mBlendDst.mID);
	rs.nProgramFragmentStoreDither(b.mDither);		rs.nProgramStoreDither(b.mDither);

	int id = rs.nProgramFragmentStoreCreate();		int id = rs.nProgramStoreCreate();
	return new ProgramStore(id, rs);		return new ProgramStore(id, rs);
	}		}

graphics/java/android/renderscript/RenderScript.java

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -71,7 +71,7 @@ public class RenderScript {

	native void nContextBindRootScript(int script);		native void nContextBindRootScript(int script);
	native void nContextBindSampler(int sampler, int slot);		native void nContextBindSampler(int sampler, int slot);
	native void nContextBindProgramFragmentStore(int pfs);		native void nContextBindProgramStore(int pfs);
	native void nContextBindProgramFragment(int pf);		native void nContextBindProgramFragment(int pf);
	native void nContextBindProgramVertex(int pf);		native void nContextBindProgramVertex(int pf);
	native void nContextBindProgramRaster(int pr);		native void nContextBindProgramRaster(int pr);
	@@ -154,13 +154,13 @@ public class RenderScript {
	native void nSamplerSet(int param, int value);		native void nSamplerSet(int param, int value);
	native int nSamplerCreate();		native int nSamplerCreate();

	native void nProgramFragmentStoreBegin(int in, int out);		native void nProgramStoreBegin(int in, int out);
	native void nProgramFragmentStoreDepthFunc(int func);		native void nProgramStoreDepthFunc(int func);
	native void nProgramFragmentStoreDepthMask(boolean enable);		native void nProgramStoreDepthMask(boolean enable);
	native void nProgramFragmentStoreColorMask(boolean r, boolean g, boolean b, boolean a);		native void nProgramStoreColorMask(boolean r, boolean g, boolean b, boolean a);
	native void nProgramFragmentStoreBlendFunc(int src, int dst);		native void nProgramStoreBlendFunc(int src, int dst);
	native void nProgramFragmentStoreDither(boolean enable);		native void nProgramStoreDither(boolean enable);
	native int nProgramFragmentStoreCreate();		native int nProgramStoreCreate();

	native int nProgramRasterCreate(int in, int out, boolean pointSmooth, boolean lineSmooth, boolean pointSprite);		native int nProgramRasterCreate(int in, int out, boolean pointSmooth, boolean lineSmooth, boolean pointSprite);
	native void nProgramRasterSetLineWidth(int pr, float v);		native void nProgramRasterSetLineWidth(int pr, float v);

graphics/java/android/renderscript/RenderScriptGL.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -74,9 +74,9 @@ public class RenderScriptGL extends RenderScript {
	nContextBindRootScript(safeID(s));		nContextBindRootScript(safeID(s));
	}		}

	public void contextBindProgramFragmentStore(ProgramStore p) {		public void contextBindProgramStore(ProgramStore p) {
	validate();		validate();
	nContextBindProgramFragmentStore(safeID(p));		nContextBindProgramStore(safeID(p));
	}		}

	public void contextBindProgramFragment(ProgramFragment p) {		public void contextBindProgramFragment(ProgramFragment p) {

graphics/jni/android_renderscript_RenderScript.cpp

+32 −32

Original line number	Original line	Diff line number	Diff line
	@@ -1042,60 +1042,60 @@ nScriptCAddDefineF(JNIEnv *_env, jobject _this, jstring name, jfloat value)
	// ---------------------------------------------------------------------------		// ---------------------------------------------------------------------------

	static void		static void
	nProgramFragmentStoreBegin(JNIEnv *_env, jobject _this, jint in, jint out)		nProgramStoreBegin(JNIEnv *_env, jobject _this, jint in, jint out)
	{		{
	RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));		RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
	LOG_API("nProgramFragmentStoreBegin, con(%p), in(%p), out(%p)", con, (RsElement)in, (RsElement)out);		LOG_API("nProgramStoreBegin, con(%p), in(%p), out(%p)", con, (RsElement)in, (RsElement)out);
	rsProgramFragmentStoreBegin(con, (RsElement)in, (RsElement)out);		rsProgramStoreBegin(con, (RsElement)in, (RsElement)out);
	}		}

	static void		static void
	nProgramFragmentStoreDepthFunc(JNIEnv *_env, jobject _this, jint func)		nProgramStoreDepthFunc(JNIEnv *_env, jobject _this, jint func)
	{		{
	RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));		RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
	LOG_API("nProgramFragmentStoreDepthFunc, con(%p), func(%i)", con, func);		LOG_API("nProgramStoreDepthFunc, con(%p), func(%i)", con, func);
	rsProgramFragmentStoreDepthFunc(con, (RsDepthFunc)func);		rsProgramStoreDepthFunc(con, (RsDepthFunc)func);
	}		}

	static void		static void
	nProgramFragmentStoreDepthMask(JNIEnv *_env, jobject _this, jboolean enable)		nProgramStoreDepthMask(JNIEnv *_env, jobject _this, jboolean enable)
	{		{
	RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));		RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
	LOG_API("nProgramFragmentStoreDepthMask, con(%p), enable(%i)", con, enable);		LOG_API("nProgramStoreDepthMask, con(%p), enable(%i)", con, enable);
	rsProgramFragmentStoreDepthMask(con, enable);		rsProgramStoreDepthMask(con, enable);
	}		}

	static void		static void
	nProgramFragmentStoreColorMask(JNIEnv *_env, jobject _this, jboolean r, jboolean g, jboolean b, jboolean a)		nProgramStoreColorMask(JNIEnv *_env, jobject _this, jboolean r, jboolean g, jboolean b, jboolean a)
	{		{
	RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));		RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
	LOG_API("nProgramFragmentStoreColorMask, con(%p), r(%i), g(%i), b(%i), a(%i)", con, r, g, b, a);		LOG_API("nProgramStoreColorMask, con(%p), r(%i), g(%i), b(%i), a(%i)", con, r, g, b, a);
	rsProgramFragmentStoreColorMask(con, r, g, b, a);		rsProgramStoreColorMask(con, r, g, b, a);
	}		}

	static void		static void
	nProgramFragmentStoreBlendFunc(JNIEnv *_env, jobject _this, int src, int dst)		nProgramStoreBlendFunc(JNIEnv *_env, jobject _this, int src, int dst)
	{		{
	RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));		RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
	LOG_API("nProgramFragmentStoreBlendFunc, con(%p), src(%i), dst(%i)", con, src, dst);		LOG_API("nProgramStoreBlendFunc, con(%p), src(%i), dst(%i)", con, src, dst);
	rsProgramFragmentStoreBlendFunc(con, (RsBlendSrcFunc)src, (RsBlendDstFunc)dst);		rsProgramStoreBlendFunc(con, (RsBlendSrcFunc)src, (RsBlendDstFunc)dst);
	}		}

	static void		static void
	nProgramFragmentStoreDither(JNIEnv *_env, jobject _this, jboolean enable)		nProgramStoreDither(JNIEnv *_env, jobject _this, jboolean enable)
	{		{
	RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));		RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
	LOG_API("nProgramFragmentStoreDither, con(%p), enable(%i)", con, enable);		LOG_API("nProgramStoreDither, con(%p), enable(%i)", con, enable);
	rsProgramFragmentStoreDither(con, enable);		rsProgramStoreDither(con, enable);
	}		}

	static jint		static jint
	nProgramFragmentStoreCreate(JNIEnv *_env, jobject _this)		nProgramStoreCreate(JNIEnv *_env, jobject _this)
	{		{
	RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));		RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
	LOG_API("nProgramFragmentStoreCreate, con(%p)", con);		LOG_API("nProgramStoreCreate, con(%p)", con);

	return (jint)rsProgramFragmentStoreCreate(con);		return (jint)rsProgramStoreCreate(con);
	}		}

	// ---------------------------------------------------------------------------		// ---------------------------------------------------------------------------
	@@ -1225,11 +1225,11 @@ nContextBindRootScript(JNIEnv *_env, jobject _this, jint script)
	}		}

	static void		static void
	nContextBindProgramFragmentStore(JNIEnv *_env, jobject _this, jint pfs)		nContextBindProgramStore(JNIEnv *_env, jobject _this, jint pfs)
	{		{
	RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));		RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
	LOG_API("nContextBindProgramFragmentStore, con(%p), pfs(%p)", con, (RsProgramFragmentStore)pfs);		LOG_API("nContextBindProgramStore, con(%p), pfs(%p)", con, (RsProgramStore)pfs);
	rsContextBindProgramFragmentStore(con, (RsProgramFragmentStore)pfs);		rsContextBindProgramStore(con, (RsProgramStore)pfs);
	}		}

	static void		static void
	@@ -1453,13 +1453,13 @@ static JNINativeMethod methods[] = {
	{"nScriptCSetScript", "([BII)V", (void*)nScriptCSetScript },		{"nScriptCSetScript", "([BII)V", (void*)nScriptCSetScript },
	{"nScriptCCreate", "()I", (void*)nScriptCCreate },		{"nScriptCCreate", "()I", (void*)nScriptCCreate },

	{"nProgramFragmentStoreBegin", "(II)V", (void*)nProgramFragmentStoreBegin },		{"nProgramStoreBegin", "(II)V", (void*)nProgramStoreBegin },
	{"nProgramFragmentStoreDepthFunc", "(I)V", (void*)nProgramFragmentStoreDepthFunc },		{"nProgramStoreDepthFunc", "(I)V", (void*)nProgramStoreDepthFunc },
	{"nProgramFragmentStoreDepthMask", "(Z)V", (void*)nProgramFragmentStoreDepthMask },		{"nProgramStoreDepthMask", "(Z)V", (void*)nProgramStoreDepthMask },
	{"nProgramFragmentStoreColorMask", "(ZZZZ)V", (void*)nProgramFragmentStoreColorMask },		{"nProgramStoreColorMask", "(ZZZZ)V", (void*)nProgramStoreColorMask },
	{"nProgramFragmentStoreBlendFunc", "(II)V", (void*)nProgramFragmentStoreBlendFunc },		{"nProgramStoreBlendFunc", "(II)V", (void*)nProgramStoreBlendFunc },
	{"nProgramFragmentStoreDither", "(Z)V", (void*)nProgramFragmentStoreDither },		{"nProgramStoreDither", "(Z)V", (void*)nProgramStoreDither },
	{"nProgramFragmentStoreCreate", "()I", (void*)nProgramFragmentStoreCreate },		{"nProgramStoreCreate", "()I", (void*)nProgramStoreCreate },

	{"nProgramBindConstants", "(III)V", (void*)nProgramBindConstants },		{"nProgramBindConstants", "(III)V", (void*)nProgramBindConstants },
	{"nProgramBindTexture", "(III)V", (void*)nProgramBindTexture },		{"nProgramBindTexture", "(III)V", (void*)nProgramBindTexture },
	@@ -1483,7 +1483,7 @@ static JNINativeMethod methods[] = {
	{"nLightSetPosition", "(IFFF)V", (void*)nLightSetPosition },		{"nLightSetPosition", "(IFFF)V", (void*)nLightSetPosition },

	{"nContextBindRootScript", "(I)V", (void*)nContextBindRootScript },		{"nContextBindRootScript", "(I)V", (void*)nContextBindRootScript },
	{"nContextBindProgramFragmentStore","(I)V", (void*)nContextBindProgramFragmentStore },		{"nContextBindProgramStore", "(I)V", (void*)nContextBindProgramStore },
	{"nContextBindProgramFragment", "(I)V", (void*)nContextBindProgramFragment },		{"nContextBindProgramFragment", "(I)V", (void*)nContextBindProgramFragment },
	{"nContextBindProgramVertex", "(I)V", (void*)nContextBindProgramVertex },		{"nContextBindProgramVertex", "(I)V", (void*)nContextBindProgramVertex },
	{"nContextBindProgramRaster", "(I)V", (void*)nContextBindProgramRaster },		{"nContextBindProgramRaster", "(I)V", (void*)nContextBindProgramRaster },

libs/rs/Android.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -91,7 +91,7 @@ LOCAL_SRC_FILES:= \
	rsNoise.cpp \		rsNoise.cpp \
	rsProgram.cpp \		rsProgram.cpp \
	rsProgramFragment.cpp \		rsProgramFragment.cpp \
	rsProgramFragmentStore.cpp \		rsProgramStore.cpp \
	rsProgramRaster.cpp \		rsProgramRaster.cpp \
	rsProgramVertex.cpp \		rsProgramVertex.cpp \
	rsSampler.cpp \		rsSampler.cpp \