Split ScriptC from RenderScript.java. Implement state caching in the Builder objects.
diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java index dd7dd02..365d053 100644 --- a/graphics/java/android/renderscript/RenderScript.java +++ b/graphics/java/android/renderscript/RenderScript.java
@@ -216,7 +216,6 @@ } - public enum DepthFunc { ALWAYS (0), LESS (1), @@ -352,105 +351,6 @@ } ////////////////////////////////////////////////////////////////////////////////// - // Script - - public class Script extends BaseObj { - Script(int id) { - super(RenderScript.this); - mID = id; - } - - public void destroy() { - nScriptDestroy(mID); - mID = 0; - } - - public void bindAllocation(Allocation va, int slot) { - nScriptBindAllocation(mID, va.mID, slot); - } - } - - public void scriptCBegin() { - nScriptCBegin(); - } - - public void scriptCSetTimeZone(String timeZone) { - try { - byte[] bytes = timeZone.getBytes("UTF-8"); - nScriptCSetTimeZone(bytes); - } catch (java.io.UnsupportedEncodingException e) { - throw new RuntimeException(e); - } - } - - public void scriptCSetClearColor(float r, float g, float b, float a) { - nScriptCSetClearColor(r, g, b, a); - } - - public void scriptCSetClearDepth(float d) { - nScriptCSetClearDepth(d); - } - - public void scriptCSetClearStencil(int stencil) { - nScriptCSetClearStencil(stencil); - } - - public void scriptCAddType(Type t) { - nScriptCAddType(t.mID); - } - - public void scriptCSetRoot(boolean r) { - nScriptCSetRoot(r); - } - - public void scriptCSetScript(String s) { - try { - byte[] bytes = s.getBytes("UTF-8"); - nScriptCSetScript(bytes, 0, bytes.length); - } catch (java.io.UnsupportedEncodingException e) { - throw new RuntimeException(e); - } - } - - public void scriptCSetScript(Resources resources, int id) { - InputStream is = resources.openRawResource(id); - try { - try { - scriptCSetScript(is); - } finally { - is.close(); - } - } catch(IOException e) { - throw new Resources.NotFoundException(); - } - } - - public void scriptCSetScript(InputStream is) throws IOException { - byte[] buf = new byte[1024]; - int currentPos = 0; - while(true) { - int bytesLeft = buf.length - currentPos; - if (bytesLeft == 0) { - byte[] buf2 = new byte[buf.length * 2]; - System.arraycopy(buf, 0, buf2, 0, buf.length); - buf = buf2; - bytesLeft = buf.length - currentPos; - } - int bytesRead = is.read(buf, currentPos, bytesLeft); - if (bytesRead <= 0) { - break; - } - currentPos += bytesRead; - } - nScriptCSetScript(buf, 0, currentPos); - } - - public Script scriptCCreate() { - int id = nScriptCCreate(); - return new Script(id); - } - - ////////////////////////////////////////////////////////////////////////////////// // ProgramVertex public class ProgramVertex extends BaseObj {
diff --git a/graphics/java/android/renderscript/Script.java b/graphics/java/android/renderscript/Script.java new file mode 100644 index 0000000..e7bb7a5 --- /dev/null +++ b/graphics/java/android/renderscript/Script.java
@@ -0,0 +1,91 @@ +/* + * 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. + */ + +package android.renderscript; + +/** + * @hide + **/ +public class Script extends BaseObj { + boolean mIsRoot; + + Script(int id, RenderScript rs) { + super(rs); + mID = id; + } + + public void destroy() { + mRS.nScriptDestroy(mID); + mID = 0; + } + + public void bindAllocation(Allocation va, int slot) { + mRS.nScriptBindAllocation(mID, va.mID, slot); + } + + public void setClearColor(float r, float g, float b, float a) { + //mRS.nScriptCSetClearColor(r, g, b, a); + } + + public void setClearDepth(float d) { + //mRS.nScriptCSetClearDepth(d); + } + + public void setClearStencil(int stencil) { + //mRS.nScriptCSetClearStencil(stencil); + } + + + public static class Builder { + RenderScript mRS; + boolean mIsRoot = false; + byte[] mTimeZone; + + Builder(RenderScript rs) { + mRS = rs; + } + + public void addType(Type t) { + mRS.nScriptCAddType(t.mID); + } + + void transferCreate() { + if(mTimeZone != null) { + mRS.nScriptCSetTimeZone(mTimeZone); + } + mRS.nScriptCSetRoot(mIsRoot); + } + + void transferObject(Script s) { + s.mIsRoot = mIsRoot; + } + + public void setTimeZone(String timeZone) { + try { + mTimeZone = timeZone.getBytes("UTF-8"); + } catch (java.io.UnsupportedEncodingException e) { + throw new RuntimeException(e); + } + } + + public void setRoot(boolean r) { + mIsRoot = r; + } + + } + +} +
diff --git a/graphics/java/android/renderscript/ScriptC.java b/graphics/java/android/renderscript/ScriptC.java new file mode 100644 index 0000000..0592f5d --- /dev/null +++ b/graphics/java/android/renderscript/ScriptC.java
@@ -0,0 +1,106 @@ +/* + * 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. + */ + +package android.renderscript; + +import java.io.IOException; +import java.io.InputStream; + +import android.content.res.Resources; + + +/** + * @hide + **/ +public class ScriptC extends Script { + ScriptC(int id, RenderScript rs) { + super(id, rs); + } + + + + + public static class Builder extends Script.Builder { + byte[] mProgram; + int mProgramLength; + + public Builder(RenderScript rs) { + super(rs); + } + + public void setScript(String s) { + try { + mProgram = s.getBytes("UTF-8"); + mProgramLength = mProgram.length; + } catch (java.io.UnsupportedEncodingException e) { + throw new RuntimeException(e); + } + } + + public void setScript(Resources resources, int id) { + InputStream is = resources.openRawResource(id); + try { + try { + setScript(is); + } finally { + is.close(); + } + } catch(IOException e) { + throw new Resources.NotFoundException(); + } + } + + public void setScript(InputStream is) throws IOException { + byte[] buf = new byte[1024]; + int currentPos = 0; + while(true) { + int bytesLeft = buf.length - currentPos; + if (bytesLeft == 0) { + byte[] buf2 = new byte[buf.length * 2]; + System.arraycopy(buf, 0, buf2, 0, buf.length); + buf = buf2; + bytesLeft = buf.length - currentPos; + } + int bytesRead = is.read(buf, currentPos, bytesLeft); + if (bytesRead <= 0) { + break; + } + currentPos += bytesRead; + } + mProgram = buf; + mProgramLength = currentPos; + } + + static synchronized ScriptC internalCreate(Builder b) { + b.mRS.nScriptCBegin(); + b.transferCreate(); + + b.mRS.nScriptCSetScript(b.mProgram, 0, b.mProgramLength); + + + int id = b.mRS.nScriptCCreate(); + ScriptC obj = new ScriptC(id, b.mRS); + b.transferObject(obj); + return obj; + } + + public ScriptC create() { + return internalCreate(this); + } + } + +} +