From a89094aa3bc059c6e03b20b4c5b1ede4582f3da9 Mon Sep 17 00:00:00 2001 From: Alex Sakhartchouk Date: Wed, 4 May 2011 17:45:36 -0700 Subject: Code Cleanup and better Sampler creation method Change-Id: I9e35081ee6034cb619f43a47f8f22f38977f5d12 --- .../java/android/renderscript/RenderScript.java | 23 +++++----------------- 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'graphics/java/android/renderscript/RenderScript.java') diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java index eea0986c694e..feb74b8a94cb 100644 --- a/graphics/java/android/renderscript/RenderScript.java +++ b/graphics/java/android/renderscript/RenderScript.java @@ -473,25 +473,12 @@ public class RenderScript { return rsnScriptCCreate(mContext, resName, cacheDir, script, length); } - native void rsnSamplerBegin(int con); - synchronized void nSamplerBegin() { + native int rsnSamplerCreate(int con, int magFilter, int minFilter, + int wrapS, int wrapT, int wrapR, float aniso); + synchronized int nSamplerCreate(int magFilter, int minFilter, + int wrapS, int wrapT, int wrapR, float aniso) { validate(); - rsnSamplerBegin(mContext); - } - native void rsnSamplerSet(int con, int param, int value); - synchronized void nSamplerSet(int param, int value) { - validate(); - rsnSamplerSet(mContext, param, value); - } - native void rsnSamplerSet2(int con, int param, float value); - synchronized void nSamplerSet2(int param, float value) { - validate(); - rsnSamplerSet2(mContext, param, value); - } - native int rsnSamplerCreate(int con); - synchronized int nSamplerCreate() { - validate(); - return rsnSamplerCreate(mContext); + return rsnSamplerCreate(mContext, magFilter, minFilter, wrapS, wrapT, wrapR, aniso); } native int rsnProgramStoreCreate(int con, boolean r, boolean g, boolean b, boolean a, -- cgit v1.2.3