am 7430efed: am 99d93157: am 541f4be5: Merge "Use new API methods in Script Group test"

* commit '7430efedcaa58e3a481aa290daed46c8399e5390':
  Use new API methods in Script Group test

4 files changed, 23 insertions, 38 deletions

diff --git a/java/tests/RsTest/src/com/android/rs/test/UT_script_group2_gatherscatter.java b/java/tests/RsTest/src/com/android/rs/test/UT_script_group2_gatherscatter.java
index 145c8ee4..0d1b940d 100644
--- a/java/tests/RsTest/src/com/android/rs/test/UT_script_group2_gatherscatter.java
+++ b/java/tests/RsTest/src/com/android/rs/test/UT_script_group2_gatherscatter.java
@@ -72,24 +72,22 @@ public class UT_script_group2_gatherscatter extends UnitTest {
 
         ScriptGroup2.Builder builder = new ScriptGroup2.Builder(pRS);
 
-        HashMap<Script.FieldID, Object> map = new HashMap<Script.FieldID, Object>();
-
         ScriptGroup2.UnboundValue unbound = builder.addInput();
 
         ScriptGroup2.Closure c = null;
         ScriptGroup2.Future f = null;
         int stride;
         for (stride = ARRAY_SIZE / 2; stride >= 1; stride >>= 1) {
-            map.put(s.getFieldID_reduction_stride(), new Integer(stride));
+            ScriptGroup2.Binding binding;
             if (f == null) {
-                map.put(s.getFieldID_a_in(), unbound);
+                binding = new ScriptGroup2.Binding(s.getFieldID_a_in(), unbound);
             } else {
-                map.put(s.getFieldID_a_in(), f);
+                binding = new ScriptGroup2.Binding(s.getFieldID_a_in(), f);
             }
             c = builder.addKernel(s.getKernelID_add(),
                                   Type.createX(pRS, Element.I32_4(pRS), stride),
-                                  new Object[0],
-                                  map);
+                                  new ScriptGroup2.Binding(s.getFieldID_reduction_stride(), stride),
+                                  binding);
             f = c.getReturn();
         }
 
diff --git a/java/tests/RsTest/src/com/android/rs/test/UT_script_group2_pointwise.java b/java/tests/RsTest/src/com/android/rs/test/UT_script_group2_pointwise.java
index 3ca7280d..b94c6175 100644
--- a/java/tests/RsTest/src/com/android/rs/test/UT_script_group2_pointwise.java
+++ b/java/tests/RsTest/src/com/android/rs/test/UT_script_group2_pointwise.java
@@ -50,19 +50,17 @@ public class UT_script_group2_pointwise extends UnitTest {
 
         ScriptGroup2.Builder builder = new ScriptGroup2.Builder(pRS);
 
-        HashMap<Script.FieldID, Object> map = new HashMap<Script.FieldID, Object>();
-
         ScriptGroup2.UnboundValue unbound = builder.addInput();
 
         ScriptGroup2.Closure c0 =
                 builder.addKernel(s_inc.getKernelID_increment(),
                                   Type.createX(pRS, Element.I32_4(pRS), ARRAY_SIZE),
-                                  new Object[]{unbound}, map);
+                                  unbound);
 
         ScriptGroup2.Closure c1 =
                 builder.addKernel(s_double.getKernelID_doubleKernel(),
                                   Type.createX(pRS, Element.I32_4(pRS), ARRAY_SIZE),
-                                  new Object[]{c0.getReturn()}, map);
+                                  c0.getReturn());
 
         ScriptGroup2 group = builder.create("AddDouble", c1.getReturn());
 
diff --git a/java/tests/ScriptGroupTest/src/com/android/rs/sgtest/Filters.java b/java/tests/ScriptGroupTest/src/com/android/rs/sgtest/Filters.java
index 3a9561bd..068850ce 100644
--- a/java/tests/ScriptGroupTest/src/com/android/rs/sgtest/Filters.java
+++ b/java/tests/ScriptGroupTest/src/com/android/rs/sgtest/Filters.java
@@ -46,8 +46,7 @@ public class Filters extends TestBase {
     abstract class FilterBase implements FilterInterface {
         public ScriptGroup2.Closure asyncLaunch(ScriptGroup2.Builder builder,
                                                 Object in, Type outputType) {
-            return builder.addKernel(getKernelID(), outputType, new Object[] { in },
-                                     new HashMap<Script.FieldID, Object>());
+            return builder.addKernel(getKernelID(), outputType, in);
         }
     }
 
@@ -117,25 +116,19 @@ public class Filters extends TestBase {
     }
 
     public void init() {
-        // s.set_sampler(Sampler.CLAMP_LINEAR(mRS));
     }
 
     public ScriptGroup2.Closure prepInit(ScriptGroup2.Builder b) {
         return b.addInvoke(s.getInvokeID_init_filter(),
-                           new Object[] { new Integer(dimX), new Integer(dimY),
-                                          new Float(0.5f), new Float(0.5f), new Float(0.5f),
-                                          Sampler.CLAMP_LINEAR(mRS)},
-                           new HashMap<Script.FieldID, Object>());
+                           dimX, dimY, 0.5f, 0.5f, 0.5f, Sampler.CLAMP_LINEAR(mRS));
     }
 
     public Script.KernelID getKernelID() { return s.getKernelID_fisheye(); }
 
     public ScriptGroup2.Closure asyncLaunch(ScriptGroup2.Builder builder,
                                             Object in, Type outputType) {
-        HashMap<Script.FieldID, Object> globals = new HashMap<Script.FieldID, Object>();
-        globals.put(s.getFieldID_in_alloc(), in);
-        //globals.put(s.getFieldID_sampler(), Sampler.CLAMP_LINEAR(mRS));
-        return builder.addKernel(getKernelID(), outputType, new Object[0], globals);
+        return builder.addKernel(getKernelID(), outputType,
+                                 new ScriptGroup2.Binding(s.getFieldID_in_alloc(), in));
     }
 
     public void forEach(Allocation in, Allocation out) {
@@ -210,10 +203,8 @@ public class Filters extends TestBase {
 
     public ScriptGroup2.Closure prepInit(ScriptGroup2.Builder b) {
         return b.addInvoke(s.getInvokeID_initialize(),
-                           new Object[] { new Float(mInBlack), new Float(mOutBlack),
-                                          new Float(mInWMinInB), new Float(mOutWMinOutB),
-                                          new Float(mOverInWMinInB), mSatMatrix },
-                           new HashMap<Script.FieldID, Object>());
+                           mInBlack, mOutBlack, mInWMinInB, mOutWMinOutB,
+                           mOverInWMinInB, mSatMatrix);
     }
 
     public Script.KernelID getKernelID() { return s.getKernelID_levels_v4(); }
@@ -229,9 +220,7 @@ public class Filters extends TestBase {
     public void init() { s.invoke_prepareShadows(50.f); }
 
     public ScriptGroup2.Closure prepInit(ScriptGroup2.Builder b) {
-      cInit = b.addInvoke(s.getInvokeID_prepareShadows(),
-          new Object[] { new Float(50.f) },
-          new HashMap<Script.FieldID, Object>());
+      cInit = b.addInvoke(s.getInvokeID_prepareShadows(), 50.f);
       return cInit;
     }
 
@@ -275,13 +264,11 @@ public class Filters extends TestBase {
 
     public ScriptGroup2.Closure prepInit(ScriptGroup2.Builder b) {
       cInit = b.addInvoke(s.getInvokeID_init_vignette(),
-          new Object[] {
-            new Integer(mInPixelsAllocation.getType().getX()),
-            new Integer(mInPixelsAllocation.getType().getY()),
-            new Float(center_x),
-            new Float(center_y),
-            new Float(scale), new Float(shade), new Float(slope) },
-          new HashMap<Script.FieldID, Object>());
+            mInPixelsAllocation.getType().getX(),
+            mInPixelsAllocation.getType().getY(),
+            center_x,
+            center_y,
+            scale, shade, slope);
       return cInit;
     }
 
@@ -296,7 +283,10 @@ public class Filters extends TestBase {
     ColorMatrixFilter.class,
     ContrastFilter.class,
     ExposureFilter.class,
+    /* The fisheye filter uses rsSample, which does not work for float4 element
+       type.
     FisheyeFilter.class,
+    */
     GreyFilter.class,
     LevelsFilter.class,
     ShadowsFilter.class,
@@ -403,8 +393,6 @@ public class Filters extends TestBase {
             connect, new Object[]{ in }, emptyMap);
 
         for (int i = 0; i < mIndices.length; i++) {
-//          c = b2.addKernel(mFilters[i].getKernelID(), connect,
-//              new Object[]{ c.getReturn() }, emptyMap);
             c = mFilters[i].asyncLaunch(b2, c.getReturn(), connect);
         }
 
diff --git a/java/tests/ScriptGroupTest/src/com/android/rs/sgtest/fisheye_approx_f.rsh b/java/tests/ScriptGroupTest/src/com/android/rs/sgtest/fisheye_approx_f.rsh
index 055c0c4b..1bfcaec9 100644
--- a/java/tests/ScriptGroupTest/src/com/android/rs/sgtest/fisheye_approx_f.rsh
+++ b/java/tests/ScriptGroupTest/src/com/android/rs/sgtest/fisheye_approx_f.rsh
@@ -54,6 +54,7 @@ float4 __attribute__((kernel)) fisheye(uint32_t x, uint32_t y) {
     const float radian = M_PI_2 - atan((alpha * half_sqrt(radius2 - dist2)) * inv_dist);
     const float scalar = radian * factor * inv_dist;
     const float2 new_coord = mad(coord, scalar, center);
+    // TODO: rsSample does not work with element type float4.
     const float4 fout = rsSample(in_alloc, sampler, new_coord);
     return fout;
 }