Merge "Add MIRRORED_REPEAT." (ab7a2919) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -20116,6 +20116,9 @@ package android.renderscript {
		method public static android.renderscript.Sampler CLAMP_LINEAR(android.renderscript.RenderScript);
		method public static android.renderscript.Sampler CLAMP_LINEAR_MIP_LINEAR(android.renderscript.RenderScript);
		method public static android.renderscript.Sampler CLAMP_NEAREST(android.renderscript.RenderScript);
		method public static android.renderscript.Sampler MIRRORED_REPEAT_LINEAR(android.renderscript.RenderScript);
		method public static android.renderscript.Sampler MIRRORED_REPEAT_LINEAR_MIP_LINEAR(android.renderscript.RenderScript);
		method public static android.renderscript.Sampler MIRRORED_REPEAT_NEAREST(android.renderscript.RenderScript);
		method public static android.renderscript.Sampler WRAP_LINEAR(android.renderscript.RenderScript);
		method public static android.renderscript.Sampler WRAP_LINEAR_MIP_LINEAR(android.renderscript.RenderScript);
		method public static android.renderscript.Sampler WRAP_NEAREST(android.renderscript.RenderScript);
		@@ -20143,6 +20146,7 @@ package android.renderscript {
		enum_constant public static final android.renderscript.Sampler.Value LINEAR;
		enum_constant public static final android.renderscript.Sampler.Value LINEAR_MIP_LINEAR;
		enum_constant public static final android.renderscript.Sampler.Value LINEAR_MIP_NEAREST;
		enum_constant public static final android.renderscript.Sampler.Value MIRRORED_REPEAT;
		enum_constant public static final android.renderscript.Sampler.Value NEAREST;
		enum_constant public static final android.renderscript.Sampler.Value WRAP;
		}

graphics/java/android/renderscript/RenderScript.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -801,6 +801,9 @@ public class RenderScript {
		Sampler mSampler_WRAP_NEAREST;
		Sampler mSampler_WRAP_LINEAR;
		Sampler mSampler_WRAP_LINEAR_MIP_LINEAR;
		Sampler mSampler_MIRRORED_REPEAT_NEAREST;
		Sampler mSampler_MIRRORED_REPEAT_LINEAR;
		Sampler mSampler_MIRRORED_REPEAT_LINEAR_MIP_LINEAR;

		ProgramStore mProgramStore_BLEND_NONE_DEPTH_TEST;
		ProgramStore mProgramStore_BLEND_NONE_DEPTH_NO_DEPTH;

graphics/java/android/renderscript/Sampler.java

+68 −8

Original line number	Diff line number	Diff line
		@@ -39,7 +39,8 @@ public class Sampler extends BaseObj {
		LINEAR_MIP_LINEAR (2),
		LINEAR_MIP_NEAREST (5),
		WRAP (3),
		CLAMP (4);
		CLAMP (4),
		MIRRORED_REPEAT (6);

		int mID;
		Value(int id) {
		@@ -134,8 +135,8 @@ public class Sampler extends BaseObj {
		}

		/**
		* Retrieve a sampler with ag set to linear, min linear mipmap linear, and
		* to and wrap modes set to clamp.
		* Retrieve a sampler with mag set to linear, min linear mipmap linear, and
		* wrap modes set to clamp.
		*
		* @param rs Context to which the sampler will belong.
		*
		@@ -174,7 +175,7 @@ public class Sampler extends BaseObj {
		}

		/**
		* Retrieve a sampler with min and mag set to nearest and wrap modes set to
		* Retrieve a sampler with min and mag set to linear and wrap modes set to
		* wrap.
		*
		* @param rs Context to which the sampler will belong.
		@@ -194,8 +195,8 @@ public class Sampler extends BaseObj {
		}

		/**
		* Retrieve a sampler with ag set to linear, min linear mipmap linear, and
		* to and wrap modes set to wrap.
		* Retrieve a sampler with mag set to linear, min linear mipmap linear, and
		* wrap modes set to wrap.
		*
		* @param rs Context to which the sampler will belong.
		*
		@@ -213,6 +214,65 @@ public class Sampler extends BaseObj {
		return rs.mSampler_WRAP_LINEAR_MIP_LINEAR;
		}

		/**
		* Retrieve a sampler with min and mag set to nearest and wrap modes set to
		* mirrored repeat.
		*
		* @param rs Context to which the sampler will belong.
		*
		* @return Sampler
		*/
		public static Sampler MIRRORED_REPEAT_NEAREST(RenderScript rs) {
		if(rs.mSampler_MIRRORED_REPEAT_NEAREST == null) {
		Builder b = new Builder(rs);
		b.setMinification(Value.NEAREST);
		b.setMagnification(Value.NEAREST);
		b.setWrapS(Value.MIRRORED_REPEAT);
		b.setWrapT(Value.MIRRORED_REPEAT);
		rs.mSampler_MIRRORED_REPEAT_NEAREST = b.create();
		}
		return rs.mSampler_MIRRORED_REPEAT_NEAREST;
		}

		/**
		* Retrieve a sampler with min and mag set to linear and wrap modes set to
		* mirrored repeat.
		*
		* @param rs Context to which the sampler will belong.
		*
		* @return Sampler
		*/
		public static Sampler MIRRORED_REPEAT_LINEAR(RenderScript rs) {
		if(rs.mSampler_MIRRORED_REPEAT_LINEAR == null) {
		Builder b = new Builder(rs);
		b.setMinification(Value.LINEAR);
		b.setMagnification(Value.LINEAR);
		b.setWrapS(Value.MIRRORED_REPEAT);
		b.setWrapT(Value.MIRRORED_REPEAT);
		rs.mSampler_MIRRORED_REPEAT_LINEAR = b.create();
		}
		return rs.mSampler_MIRRORED_REPEAT_LINEAR;
		}

		/**
		* Retrieve a sampler with min and mag set to linear and wrap modes set to
		* mirrored repeat.
		*
		* @param rs Context to which the sampler will belong.
		*
		* @return Sampler
		*/
		public static Sampler MIRRORED_REPEAT_LINEAR_MIP_LINEAR(RenderScript rs) {
		if(rs.mSampler_MIRRORED_REPEAT_LINEAR_MIP_LINEAR == null) {
		Builder b = new Builder(rs);
		b.setMinification(Value.LINEAR_MIP_LINEAR);
		b.setMagnification(Value.LINEAR);
		b.setWrapS(Value.MIRRORED_REPEAT);
		b.setWrapT(Value.MIRRORED_REPEAT);
		rs.mSampler_MIRRORED_REPEAT_LINEAR_MIP_LINEAR = b.create();
		}
		return rs.mSampler_MIRRORED_REPEAT_LINEAR_MIP_LINEAR;
		}

		/**
		* Builder for creating non-standard samplers. Usefull if mix and match of
		@@ -258,7 +318,7 @@ public class Sampler extends BaseObj {
		}

		public void setWrapS(Value v) {
		if (v == Value.WRAP \|\| v == Value.CLAMP) {
		if (v == Value.WRAP \|\| v == Value.CLAMP \|\| v == Value.MIRRORED_REPEAT) {
		mWrapS = v;
		} else {
		throw new IllegalArgumentException("Invalid value");
		@@ -266,7 +326,7 @@ public class Sampler extends BaseObj {
		}

		public void setWrapT(Value v) {
		if (v == Value.WRAP \|\| v == Value.CLAMP) {
		if (v == Value.WRAP \|\| v == Value.CLAMP \|\| v == Value.MIRRORED_REPEAT) {
		mWrapT = v;
		} else {
		throw new IllegalArgumentException("Invalid value");