Merge change 20046

* changes:
  Seperate Light and Sampler from RenderScript.java

4 files changed, 34 insertions, 58 deletions

diff --git a/libs/rs/java/Film/res/raw/filmstrip.c b/libs/rs/java/Film/res/raw/filmstrip.c
index e9c7f285be0b..4e7c37ad0e3a 100644
--- a/libs/rs/java/Film/res/raw/filmstrip.c
+++ b/libs/rs/java/Film/res/raw/filmstrip.c
@@ -5,15 +5,6 @@
 #pragma stateFragment(PFBackground)
 #pragma stateFragmentStore(PSBackground)
 
-/*
-typedef struct FilmScriptUserEnvRec {
-    RsAllocation tex[13];
-    int32_t triangleOffsets[64];
-    float triangleOffsetsTex[64];
-    int32_t triangleOffsetsCount;
-} FilmScriptUserEnv;
-*/
-
 #define POS_TRANSLATE 0
 #define POS_ROTATE 1
 #define POS_FOCUS 2
@@ -39,9 +30,7 @@ int main(int index)
     matrixRotate(mat1, rot, 1.f, 0.f, 0.f);
     storeMatrix(3, 0, mat1);
 
-    //materialDiffuse(con, 0.0f, 0.0f, 0.0f, 1.0f);
-    //materialSpecular(con, 0.5f, 0.5f, 0.5f, 0.5f);
-    //materialShininess(intToFloat(20));
+    // Draw the lighting effect in the strip and fill the Z buffer.
     drawTriangleMesh(NAMED_mesh);
 
 
diff --git a/libs/rs/java/Film/src/com/android/film/FilmRS.java b/libs/rs/java/Film/src/com/android/film/FilmRS.java
index 760beb8424e5..a1b30f934956 100644
--- a/libs/rs/java/Film/src/com/android/film/FilmRS.java
+++ b/libs/rs/java/Film/src/com/android/film/FilmRS.java
@@ -33,6 +33,8 @@ import android.renderscript.ScriptC;
 import android.renderscript.Script;
 import android.renderscript.ProgramFragment;
 import android.renderscript.ProgramStore;
+import android.renderscript.Sampler;
+import android.renderscript.Light;
 
 public class FilmRS {
     private final int POS_TRANSLATE = 0;
@@ -74,7 +76,7 @@ public class FilmRS {
     private Script mScriptImage;
     private Element mElementVertex;
     private Element mElementIndex;
-    private RenderScript.Sampler mSampler;
+    private Sampler mSampler;
     private ProgramStore mPSBackground;
     private ProgramStore mPSImages;
     private ProgramFragment mPFBackground;
@@ -92,7 +94,7 @@ public class FilmRS {
     private Allocation mAllocOffsets;
 
     private RenderScript.TriangleMesh mMesh;
-    private RenderScript.Light mLight;
+    private Light mLight;
 
     private FilmStripMesh mFSM;
 
@@ -119,16 +121,12 @@ public class FilmRS {
     }
 
     private void initPF() {
-        mRS.samplerBegin();
-        mRS.samplerSet(RenderScript.SamplerParam.FILTER_MIN,
-                       RenderScript.SamplerValue.LINEAR);//_MIP_LINEAR);
-        mRS.samplerSet(RenderScript.SamplerParam.FILTER_MAG,
-                       RenderScript.SamplerValue.LINEAR);
-        mRS.samplerSet(RenderScript.SamplerParam.WRAP_MODE_S,
-                       RenderScript.SamplerValue.CLAMP);
-        mRS.samplerSet(RenderScript.SamplerParam.WRAP_MODE_T,
-                       RenderScript.SamplerValue.WRAP);
-        mSampler = mRS.samplerCreate();
+        Sampler.Builder bs = new Sampler.Builder(mRS);
+        bs.setMin(Sampler.Value.LINEAR);//_MIP_LINEAR);
+        bs.setMag(Sampler.Value.LINEAR);
+        bs.setWrapS(Sampler.Value.CLAMP);
+        bs.setWrapT(Sampler.Value.WRAP);
+        mSampler = bs.create();
 
         ProgramFragment.Builder b = new ProgramFragment.Builder(mRS, null, null);
 
@@ -143,8 +141,7 @@ public class FilmRS {
     }
 
     private void initPV() {
-        mRS.lightBegin();
-        mLight = mRS.lightCreate();
+        mLight = (new Light.Builder(mRS)).create();
         mLight.setPosition(0, -0.5f, -1.0f);
 
         mRS.programVertexBegin(null, null);
diff --git a/libs/rs/java/Grass/src/com/android/grass/rs/GrassRS.java b/libs/rs/java/Grass/src/com/android/grass/rs/GrassRS.java
index 8852b3ca857d..e9aa3cc09bcf 100644
--- a/libs/rs/java/Grass/src/com/android/grass/rs/GrassRS.java
+++ b/libs/rs/java/Grass/src/com/android/grass/rs/GrassRS.java
@@ -17,8 +17,8 @@
 package com.android.grass.rs;
 
 import android.content.res.Resources;
-import static android.renderscript.RenderScript.SamplerParam.*;
-import static android.renderscript.RenderScript.SamplerValue.*;
+import android.renderscript.Sampler;
+import static android.renderscript.Sampler.Value.*;
 import static android.renderscript.ProgramFragment.EnvMode.*;
 import static android.renderscript.ProgramStore.DepthFunc.*;
 import static android.renderscript.ProgramStore.BlendSrcFunc;
@@ -72,7 +72,7 @@ class GrassRS {
     @SuppressWarnings({"FieldCanBeLocal"})
     private ScriptC mScript;
     @SuppressWarnings({"FieldCanBeLocal"})
-    private RenderScript.Sampler mSampler;
+    private Sampler mSampler;
     @SuppressWarnings({"FieldCanBeLocal"})
     private ProgramFragment mPfBackground;
     @SuppressWarnings({"FieldCanBeLocal"})
@@ -205,12 +205,12 @@ class GrassRS {
     }
 
     private void createProgramFragment() {
-        mRS.samplerBegin();
-        mRS.samplerSet(FILTER_MIN, LINEAR);
-        mRS.samplerSet(FILTER_MAG, LINEAR);
-        mRS.samplerSet(WRAP_MODE_S, CLAMP);
-        mRS.samplerSet(WRAP_MODE_T, CLAMP);
-        mSampler = mRS.samplerCreate();
+        Sampler.Builder bs = new Sampler.Builder(mRS);
+        bs.setMin(LINEAR);
+        bs.setMag(LINEAR);
+        bs.setWrapS(CLAMP);
+        bs.setWrapT(CLAMP);
+        mSampler = bs.create();
 
         ProgramFragment.Builder b;
         b = new ProgramFragment.Builder(mRS, null, null);
diff --git a/libs/rs/java/Rollo/src/com/android/rollo/RolloRS.java b/libs/rs/java/Rollo/src/com/android/rollo/RolloRS.java
index 9389688e022d..7497a07e30bb 100644
--- a/libs/rs/java/Rollo/src/com/android/rollo/RolloRS.java
+++ b/libs/rs/java/Rollo/src/com/android/rollo/RolloRS.java
@@ -26,6 +26,7 @@ import android.renderscript.Script;
 import android.renderscript.ScriptC;
 import android.renderscript.ProgramFragment;
 import android.renderscript.ProgramStore;
+import android.renderscript.Sampler;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -95,8 +96,8 @@ public class RolloRS {
     private Resources mRes;
     private RenderScript mRS;
     private Script mScript;
-    private RenderScript.Sampler mSampler;
-    private RenderScript.Sampler mSamplerText;
+    private Sampler mSampler;
+    private Sampler mSamplerText;
     private ProgramStore mPSBackground;
     private ProgramStore mPSText;
     private ProgramFragment mPFImages;
@@ -121,27 +122,16 @@ public class RolloRS {
     private Allocation mAllocScratch;
 
     private void initNamed() {
-        mRS.samplerBegin();
-        mRS.samplerSet(RenderScript.SamplerParam.FILTER_MIN,
-                       RenderScript.SamplerValue.LINEAR);//_MIP_LINEAR);
-        mRS.samplerSet(RenderScript.SamplerParam.FILTER_MAG,
-                       RenderScript.SamplerValue.LINEAR);
-        mRS.samplerSet(RenderScript.SamplerParam.WRAP_MODE_S,
-                       RenderScript.SamplerValue.CLAMP);
-        mRS.samplerSet(RenderScript.SamplerParam.WRAP_MODE_T,
-                       RenderScript.SamplerValue.CLAMP);
-        mSampler = mRS.samplerCreate();
-
-        mRS.samplerBegin();
-        mRS.samplerSet(RenderScript.SamplerParam.FILTER_MIN,
-                       RenderScript.SamplerValue.NEAREST);
-        mRS.samplerSet(RenderScript.SamplerParam.FILTER_MAG,
-                       RenderScript.SamplerValue.NEAREST);
-        mRS.samplerSet(RenderScript.SamplerParam.WRAP_MODE_S,
-                       RenderScript.SamplerValue.CLAMP);
-        mRS.samplerSet(RenderScript.SamplerParam.WRAP_MODE_T,
-                       RenderScript.SamplerValue.CLAMP);
-        mSamplerText = mRS.samplerCreate();
+        Sampler.Builder sb = new Sampler.Builder(mRS);
+        sb.setMin(Sampler.Value.LINEAR);//_MIP_LINEAR);
+        sb.setMag(Sampler.Value.LINEAR);
+        sb.setWrapS(Sampler.Value.CLAMP);
+        sb.setWrapT(Sampler.Value.CLAMP);
+        mSampler = sb.create();
+
+        sb.setMin(Sampler.Value.NEAREST);
+        sb.setMag(Sampler.Value.NEAREST);
+        mSamplerText = sb.create();
 
 
         ProgramFragment.Builder bf = new ProgramFragment.Builder(mRS, null, null);