Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f5dca07 authored by Yang Ni's avatar Yang Ni Committed by Android Git Automerger
Browse files

am 869b428b: am f5fa550a: Merge "Move new script group API into ScriptGroup class" 

* commit '869b428b':
  Move new script group API into ScriptGroup class
parents a5ee27b3 869b428b

api/current.txt

+34 −4
Original line number Diff line number Diff line
@@ -26518,6 +26518,7 @@ package android.renderscript { 
  public class Script extends android.renderscript.BaseObj {

    method public void bindAllocation(android.renderscript.Allocation, int);

    method protected android.renderscript.Script.FieldID createFieldID(int, android.renderscript.Element);

    method protected android.renderscript.Script.InvokeID createInvokeID(int);

    method protected android.renderscript.Script.KernelID createKernelID(int, int, android.renderscript.Element, android.renderscript.Element);

    method protected void forEach(int, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.FieldPacker);

    method protected void forEach(int, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.FieldPacker, android.renderscript.Script.LaunchOptions);
@@ -26558,6 +26559,9 @@ package android.renderscript { 
  public static final class Script.FieldID extends android.renderscript.BaseObj {

  }













  public static final class Script.InvokeID extends android.renderscript.BaseObj {













  }



























  public static final class Script.KernelID extends android.renderscript.BaseObj {















  }























@@ -26582,12 +26586,19 @@ package android.renderscript {













  }





























  public final class ScriptGroup extends android.renderscript.BaseObj {













    method public void execute();













    method public void setInput(android.renderscript.Script.KernelID, android.renderscript.Allocation);













    method public void setOutput(android.renderscript.Script.KernelID, android.renderscript.Allocation);













    method public java.lang.Object[] execute(java.lang.Object...);













    method public deprecated void execute();













    method public deprecated void setInput(android.renderscript.Script.KernelID, android.renderscript.Allocation);













    method public deprecated void setOutput(android.renderscript.Script.KernelID, android.renderscript.Allocation);















  }



























  public static final class ScriptGroup.Builder {













  public static final class ScriptGroup.Binding {













    ctor public ScriptGroup.Binding(android.renderscript.Script.FieldID, java.lang.Object);













    method public android.renderscript.Script.FieldID getField();













    method public java.lang.Object getValue();













  }

























  public static final deprecated class ScriptGroup.Builder {















    ctor public ScriptGroup.Builder(android.renderscript.RenderScript);















    method public android.renderscript.ScriptGroup.Builder addConnection(android.renderscript.Type, android.renderscript.Script.KernelID, android.renderscript.Script.FieldID);















    method public android.renderscript.ScriptGroup.Builder addConnection(android.renderscript.Type, android.renderscript.Script.KernelID, android.renderscript.Script.KernelID);









@@ -26595,6 +26606,25 @@ package android.renderscript {













    method public android.renderscript.ScriptGroup create();















  }



























  public static final class ScriptGroup.Builder2 {













    ctor public ScriptGroup.Builder2(android.renderscript.RenderScript);













    method public android.renderscript.ScriptGroup.Input addInput();













    method public android.renderscript.ScriptGroup.Closure addInvoke(android.renderscript.Script.InvokeID, java.lang.Object...);













    method public android.renderscript.ScriptGroup.Closure addKernel(android.renderscript.Script.KernelID, android.renderscript.Type, java.lang.Object...);













    method public android.renderscript.ScriptGroup create(java.lang.String, android.renderscript.ScriptGroup.Future...);













  }

























  public static final class ScriptGroup.Closure extends android.renderscript.BaseObj {













    method public android.renderscript.ScriptGroup.Future getGlobal(android.renderscript.Script.FieldID);













    method public android.renderscript.ScriptGroup.Future getReturn();













  }

























  public static final class ScriptGroup.Future {













  }

























  public static final class ScriptGroup.Input {













  }



























  public abstract class ScriptIntrinsic extends android.renderscript.Script {















  }







































api/system-current.txt



+34
−4




























Original line number
Diff line number
Diff line








@@ -28117,6 +28117,7 @@ package android.renderscript {













  public class Script extends android.renderscript.BaseObj {















    method public void bindAllocation(android.renderscript.Allocation, int);















    method protected android.renderscript.Script.FieldID createFieldID(int, android.renderscript.Element);













    method protected android.renderscript.Script.InvokeID createInvokeID(int);















    method protected android.renderscript.Script.KernelID createKernelID(int, int, android.renderscript.Element, android.renderscript.Element);















    method protected void forEach(int, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.FieldPacker);















    method protected void forEach(int, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.FieldPacker, android.renderscript.Script.LaunchOptions);










@@ -28157,6 +28158,9 @@ package android.renderscript {













  public static final class Script.FieldID extends android.renderscript.BaseObj {















  }



























  public static final class Script.InvokeID extends android.renderscript.BaseObj {













  }



























  public static final class Script.KernelID extends android.renderscript.BaseObj {















  }























@@ -28181,12 +28185,19 @@ package android.renderscript {













  }





























  public final class ScriptGroup extends android.renderscript.BaseObj {













    method public void execute();













    method public void setInput(android.renderscript.Script.KernelID, android.renderscript.Allocation);













    method public void setOutput(android.renderscript.Script.KernelID, android.renderscript.Allocation);













    method public java.lang.Object[] execute(java.lang.Object...);













    method public deprecated void execute();













    method public deprecated void setInput(android.renderscript.Script.KernelID, android.renderscript.Allocation);













    method public deprecated void setOutput(android.renderscript.Script.KernelID, android.renderscript.Allocation);















  }



























  public static final class ScriptGroup.Builder {













  public static final class ScriptGroup.Binding {













    ctor public ScriptGroup.Binding(android.renderscript.Script.FieldID, java.lang.Object);













    method public android.renderscript.Script.FieldID getField();













    method public java.lang.Object getValue();













  }

























  public static final deprecated class ScriptGroup.Builder {















    ctor public ScriptGroup.Builder(android.renderscript.RenderScript);















    method public android.renderscript.ScriptGroup.Builder addConnection(android.renderscript.Type, android.renderscript.Script.KernelID, android.renderscript.Script.FieldID);















    method public android.renderscript.ScriptGroup.Builder addConnection(android.renderscript.Type, android.renderscript.Script.KernelID, android.renderscript.Script.KernelID);









@@ -28194,6 +28205,25 @@ package android.renderscript {













    method public android.renderscript.ScriptGroup create();















  }



























  public static final class ScriptGroup.Builder2 {













    ctor public ScriptGroup.Builder2(android.renderscript.RenderScript);













    method public android.renderscript.ScriptGroup.Input addInput();













    method public android.renderscript.ScriptGroup.Closure addInvoke(android.renderscript.Script.InvokeID, java.lang.Object...);













    method public android.renderscript.ScriptGroup.Closure addKernel(android.renderscript.Script.KernelID, android.renderscript.Type, java.lang.Object...);













    method public android.renderscript.ScriptGroup create(java.lang.String, android.renderscript.ScriptGroup.Future...);













  }

























  public static final class ScriptGroup.Closure extends android.renderscript.BaseObj {













    method public android.renderscript.ScriptGroup.Future getGlobal(android.renderscript.Script.FieldID);













    method public android.renderscript.ScriptGroup.Future getReturn();













  }

























  public static final class ScriptGroup.Future {













  }

























  public static final class ScriptGroup.Input {













  }



























  public abstract class ScriptIntrinsic extends android.renderscript.Script {















  }







































rs/java/android/renderscript/Script.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -66,7 +66,6 @@ public class Script extends BaseObj {













    }































    /**













     * @hide Pending API review















     * InvokeID is an identifier for an invoke function. It is used















     * as an identifier for ScriptGroup creation.















     *









@@ -86,7 +85,6 @@ public class Script extends BaseObj {





























    private final SparseArray<InvokeID> mIIDs = new SparseArray<InvokeID>();















    /**













     * @hide Pending API review















     * Only to be used by generated reflected classes.















     */















    protected InvokeID createInvokeID(int slot) {

































rs/java/android/renderscript/ScriptGroup.java



+577
−20


























File changed.
Preview size limit exceeded, changes collapsed.