Split ProgramFragment and ProgramStore from RenderScript.java. Update Element and Type to new cached builder for easier app developement.

1 files changed, 10 insertions, 15 deletions

diff --git a/graphics/java/android/renderscript/Script.java b/graphics/java/android/renderscript/Script.java
index e7bb7a5422d0..9696cea528fa 100644
--- a/graphics/java/android/renderscript/Script.java
+++ b/graphics/java/android/renderscript/Script.java
@@ -37,22 +37,28 @@ public class Script extends BaseObj {
     }
 
     public void setClearColor(float r, float g, float b, float a) {
-        //mRS.nScriptCSetClearColor(r, g, b, a);
+        mRS.nScriptSetClearColor(mID, r, g, b, a);
     }
 
     public void setClearDepth(float d) {
-        //mRS.nScriptCSetClearDepth(d);
+        mRS.nScriptSetClearDepth(mID, d);
     }
 
     public void setClearStencil(int stencil) {
-        //mRS.nScriptCSetClearStencil(stencil);
+        mRS.nScriptSetClearStencil(mID, stencil);
     }
 
+    public void setTimeZone(String timeZone) {
+        try {
+            mRS.nScriptSetTimeZone(mID, timeZone.getBytes("UTF-8"));
+        } catch (java.io.UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
     public static class Builder {
         RenderScript mRS;
         boolean mIsRoot = false;
-        byte[] mTimeZone;
 
         Builder(RenderScript rs) {
             mRS = rs;
@@ -63,9 +69,6 @@ public class Script extends BaseObj {
         }
 
         void transferCreate() {
-            if(mTimeZone != null) {
-                mRS.nScriptCSetTimeZone(mTimeZone);
-            }
             mRS.nScriptCSetRoot(mIsRoot);
         }
 
@@ -73,14 +76,6 @@ public class Script extends BaseObj {
             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;
         }