Skip to content

Commit d4ca991

Browse files
author
Jason Sams
committed
GFX api cleanup 2 of 2
Change-Id: Ie928b8ee7d31fcaa26fcad9a2548581bb8395a61
1 parent e619de6 commit d4ca991

File tree

7 files changed

+200
-81
lines changed

7 files changed

+200
-81
lines changed

‎api/current.txt‎

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -19086,12 +19086,12 @@ package android.renderscript {
1908619086
method public void transpose();
1908719087
}
1908819088

19089-
public class Mesh extends android.renderscript.BaseObj {
19090-
method public android.renderscript.Allocation getIndexSetAllocation(int);
19091-
method public android.renderscript.Mesh.Primitive getPrimitive(int);
19092-
method public int getPrimitiveCount();
19093-
method public android.renderscript.Allocation getVertexAllocation(int);
19094-
method public int getVertexAllocationCount();
19089+
public deprecated class Mesh extends android.renderscript.BaseObj {
19090+
method public deprecated android.renderscript.Allocation getIndexSetAllocation(int);
19091+
method public deprecated android.renderscript.Mesh.Primitive getPrimitive(int);
19092+
method public deprecated int getPrimitiveCount();
19093+
method public deprecated android.renderscript.Allocation getVertexAllocation(int);
19094+
method public deprecated int getVertexAllocationCount();
1909519095
}
1909619096

1909719097
public static deprecated class Mesh.AllocationBuilder {
@@ -19104,27 +19104,27 @@ package android.renderscript {
1910419104
method public deprecated int getCurrentVertexTypeIndex();
1910519105
}
1910619106

19107-
public static class Mesh.Builder {
19108-
ctor public Mesh.Builder(android.renderscript.RenderScript, int);
19109-
method public android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Type, android.renderscript.Mesh.Primitive);
19110-
method public android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Mesh.Primitive);
19111-
method public android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Element, int, android.renderscript.Mesh.Primitive);
19112-
method public android.renderscript.Mesh.Builder addVertexType(android.renderscript.Type) throws java.lang.IllegalStateException;
19113-
method public android.renderscript.Mesh.Builder addVertexType(android.renderscript.Element, int) throws java.lang.IllegalStateException;
19114-
method public android.renderscript.Mesh create();
19115-
method public int getCurrentIndexSetIndex();
19116-
method public int getCurrentVertexTypeIndex();
19107+
public static deprecated class Mesh.Builder {
19108+
ctor public deprecated Mesh.Builder(android.renderscript.RenderScript, int);
19109+
method public deprecated android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Type, android.renderscript.Mesh.Primitive);
19110+
method public deprecated android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Mesh.Primitive);
19111+
method public deprecated android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Element, int, android.renderscript.Mesh.Primitive);
19112+
method public deprecated android.renderscript.Mesh.Builder addVertexType(android.renderscript.Type) throws java.lang.IllegalStateException;
19113+
method public deprecated android.renderscript.Mesh.Builder addVertexType(android.renderscript.Element, int) throws java.lang.IllegalStateException;
19114+
method public deprecated android.renderscript.Mesh create();
19115+
method public deprecated int getCurrentIndexSetIndex();
19116+
method public deprecated int getCurrentVertexTypeIndex();
1911719117
}
1911819118

19119-
public static final class Mesh.Primitive extends java.lang.Enum {
19119+
public static final deprecated class Mesh.Primitive extends java.lang.Enum {
1912019120
method public static android.renderscript.Mesh.Primitive valueOf(java.lang.String);
1912119121
method public static final android.renderscript.Mesh.Primitive[] values();
19122-
enum_constant public static final android.renderscript.Mesh.Primitive LINE;
19123-
enum_constant public static final android.renderscript.Mesh.Primitive LINE_STRIP;
19124-
enum_constant public static final android.renderscript.Mesh.Primitive POINT;
19125-
enum_constant public static final android.renderscript.Mesh.Primitive TRIANGLE;
19126-
enum_constant public static final android.renderscript.Mesh.Primitive TRIANGLE_FAN;
19127-
enum_constant public static final android.renderscript.Mesh.Primitive TRIANGLE_STRIP;
19122+
enum_constant public static final deprecated android.renderscript.Mesh.Primitive LINE;
19123+
enum_constant public static final deprecated android.renderscript.Mesh.Primitive LINE_STRIP;
19124+
enum_constant public static final deprecated android.renderscript.Mesh.Primitive POINT;
19125+
enum_constant public static final deprecated android.renderscript.Mesh.Primitive TRIANGLE;
19126+
enum_constant public static final deprecated android.renderscript.Mesh.Primitive TRIANGLE_FAN;
19127+
enum_constant public static final deprecated android.renderscript.Mesh.Primitive TRIANGLE_STRIP;
1912819128
}
1912919129

1913019130
public static deprecated class Mesh.TriangleMeshBuilder {
@@ -19171,12 +19171,12 @@ package android.renderscript {
1917119171
enum_constant public static final android.renderscript.Program.TextureType TEXTURE_CUBE;
1917219172
}
1917319173

19174-
public class ProgramFragment extends android.renderscript.Program {
19174+
public deprecated class ProgramFragment extends android.renderscript.Program {
1917519175
}
1917619176

19177-
public static class ProgramFragment.Builder extends android.renderscript.Program.BaseProgramBuilder {
19178-
ctor public ProgramFragment.Builder(android.renderscript.RenderScript);
19179-
method public android.renderscript.ProgramFragment create();
19177+
public static deprecated class ProgramFragment.Builder extends android.renderscript.Program.BaseProgramBuilder {
19178+
ctor public deprecated ProgramFragment.Builder(android.renderscript.RenderScript);
19179+
method public deprecated android.renderscript.ProgramFragment create();
1918019180
}
1918119181

1918219182
public deprecated class ProgramFragmentFixedFunction extends android.renderscript.ProgramFragment {
@@ -19208,27 +19208,27 @@ package android.renderscript {
1920819208
enum_constant public static final deprecated android.renderscript.ProgramFragmentFixedFunction.Builder.Format RGBA;
1920919209
}
1921019210

19211-
public class ProgramRaster extends android.renderscript.BaseObj {
19212-
method public static android.renderscript.ProgramRaster CULL_BACK(android.renderscript.RenderScript);
19213-
method public static android.renderscript.ProgramRaster CULL_FRONT(android.renderscript.RenderScript);
19214-
method public static android.renderscript.ProgramRaster CULL_NONE(android.renderscript.RenderScript);
19215-
method public android.renderscript.ProgramRaster.CullMode getCullMode();
19216-
method public boolean isPointSpriteEnabled();
19211+
public deprecated class ProgramRaster extends android.renderscript.BaseObj {
19212+
method public static deprecated android.renderscript.ProgramRaster CULL_BACK(android.renderscript.RenderScript);
19213+
method public static deprecated android.renderscript.ProgramRaster CULL_FRONT(android.renderscript.RenderScript);
19214+
method public static deprecated android.renderscript.ProgramRaster CULL_NONE(android.renderscript.RenderScript);
19215+
method public deprecated android.renderscript.ProgramRaster.CullMode getCullMode();
19216+
method public deprecated boolean isPointSpriteEnabled();
1921719217
}
1921819218

19219-
public static class ProgramRaster.Builder {
19220-
ctor public ProgramRaster.Builder(android.renderscript.RenderScript);
19221-
method public android.renderscript.ProgramRaster create();
19222-
method public android.renderscript.ProgramRaster.Builder setCullMode(android.renderscript.ProgramRaster.CullMode);
19223-
method public android.renderscript.ProgramRaster.Builder setPointSpriteEnabled(boolean);
19219+
public static deprecated class ProgramRaster.Builder {
19220+
ctor public deprecated ProgramRaster.Builder(android.renderscript.RenderScript);
19221+
method public deprecated android.renderscript.ProgramRaster create();
19222+
method public deprecated android.renderscript.ProgramRaster.Builder setCullMode(android.renderscript.ProgramRaster.CullMode);
19223+
method public deprecated android.renderscript.ProgramRaster.Builder setPointSpriteEnabled(boolean);
1922419224
}
1922519225

19226-
public static final class ProgramRaster.CullMode extends java.lang.Enum {
19226+
public static final deprecated class ProgramRaster.CullMode extends java.lang.Enum {
1922719227
method public static android.renderscript.ProgramRaster.CullMode valueOf(java.lang.String);
1922819228
method public static final android.renderscript.ProgramRaster.CullMode[] values();
19229-
enum_constant public static final android.renderscript.ProgramRaster.CullMode BACK;
19230-
enum_constant public static final android.renderscript.ProgramRaster.CullMode FRONT;
19231-
enum_constant public static final android.renderscript.ProgramRaster.CullMode NONE;
19229+
enum_constant public static final deprecated android.renderscript.ProgramRaster.CullMode BACK;
19230+
enum_constant public static final deprecated android.renderscript.ProgramRaster.CullMode FRONT;
19231+
enum_constant public static final deprecated android.renderscript.ProgramRaster.CullMode NONE;
1923219232
}
1923319233

1923419234
public class ProgramStore extends android.renderscript.BaseObj {
@@ -19296,15 +19296,15 @@ package android.renderscript {
1929619296
enum_constant public static final android.renderscript.ProgramStore.DepthFunc NOT_EQUAL;
1929719297
}
1929819298

19299-
public class ProgramVertex extends android.renderscript.Program {
19300-
method public android.renderscript.Element getInput(int);
19301-
method public int getInputCount();
19299+
public deprecated class ProgramVertex extends android.renderscript.Program {
19300+
method public deprecated android.renderscript.Element getInput(int);
19301+
method public deprecated int getInputCount();
1930219302
}
1930319303

19304-
public static class ProgramVertex.Builder extends android.renderscript.Program.BaseProgramBuilder {
19305-
ctor public ProgramVertex.Builder(android.renderscript.RenderScript);
19306-
method public android.renderscript.ProgramVertex.Builder addInput(android.renderscript.Element) throws java.lang.IllegalStateException;
19307-
method public android.renderscript.ProgramVertex create();
19304+
public static deprecated class ProgramVertex.Builder extends android.renderscript.Program.BaseProgramBuilder {
19305+
ctor public deprecated ProgramVertex.Builder(android.renderscript.RenderScript);
19306+
method public deprecated android.renderscript.ProgramVertex.Builder addInput(android.renderscript.Element) throws java.lang.IllegalStateException;
19307+
method public deprecated android.renderscript.ProgramVertex create();
1930819308
}
1930919309

1931019310
public deprecated class ProgramVertexFixedFunction extends android.renderscript.ProgramVertex {
@@ -19355,19 +19355,19 @@ package android.renderscript {
1935519355
method public deprecated void surfaceDestroyed(android.view.SurfaceHolder);
1935619356
}
1935719357

19358-
public class RSTextureView extends android.view.TextureView implements android.view.TextureView.SurfaceTextureListener {
19359-
ctor public RSTextureView(android.content.Context);
19360-
ctor public RSTextureView(android.content.Context, android.util.AttributeSet);
19361-
method public android.renderscript.RenderScriptGL createRenderScriptGL(android.renderscript.RenderScriptGL.SurfaceConfig);
19362-
method public void destroyRenderScriptGL();
19363-
method public android.renderscript.RenderScriptGL getRenderScriptGL();
19364-
method public void onSurfaceTextureAvailable(android.graphics.SurfaceTexture, int, int);
19365-
method public boolean onSurfaceTextureDestroyed(android.graphics.SurfaceTexture);
19366-
method public void onSurfaceTextureSizeChanged(android.graphics.SurfaceTexture, int, int);
19367-
method public void onSurfaceTextureUpdated(android.graphics.SurfaceTexture);
19368-
method public void pause();
19369-
method public void resume();
19370-
method public void setRenderScriptGL(android.renderscript.RenderScriptGL);
19358+
public deprecated class RSTextureView extends android.view.TextureView implements android.view.TextureView.SurfaceTextureListener {
19359+
ctor public deprecated RSTextureView(android.content.Context);
19360+
ctor public deprecated RSTextureView(android.content.Context, android.util.AttributeSet);
19361+
method public deprecated android.renderscript.RenderScriptGL createRenderScriptGL(android.renderscript.RenderScriptGL.SurfaceConfig);
19362+
method public deprecated void destroyRenderScriptGL();
19363+
method public deprecated android.renderscript.RenderScriptGL getRenderScriptGL();
19364+
method public deprecated void onSurfaceTextureAvailable(android.graphics.SurfaceTexture, int, int);
19365+
method public deprecated boolean onSurfaceTextureDestroyed(android.graphics.SurfaceTexture);
19366+
method public deprecated void onSurfaceTextureSizeChanged(android.graphics.SurfaceTexture, int, int);
19367+
method public deprecated void onSurfaceTextureUpdated(android.graphics.SurfaceTexture);
19368+
method public deprecated void pause();
19369+
method public deprecated void resume();
19370+
method public deprecated void setRenderScriptGL(android.renderscript.RenderScriptGL);
1937119371
}
1937219372

1937319373
public class RenderScript {
@@ -19405,28 +19405,28 @@ package android.renderscript {
1940519405
field protected int mLength;
1940619406
}
1940719407

19408-
public class RenderScriptGL extends android.renderscript.RenderScript {
19409-
ctor public RenderScriptGL(android.content.Context, android.renderscript.RenderScriptGL.SurfaceConfig);
19410-
method public void bindProgramFragment(android.renderscript.ProgramFragment);
19411-
method public void bindProgramRaster(android.renderscript.ProgramRaster);
19412-
method public void bindProgramStore(android.renderscript.ProgramStore);
19413-
method public void bindProgramVertex(android.renderscript.ProgramVertex);
19414-
method public void bindRootScript(android.renderscript.Script);
19415-
method public int getHeight();
19416-
method public int getWidth();
19417-
method public void pause();
19418-
method public void resume();
19419-
method public void setSurface(android.view.SurfaceHolder, int, int);
19408+
public deprecated class RenderScriptGL extends android.renderscript.RenderScript {
19409+
ctor public deprecated RenderScriptGL(android.content.Context, android.renderscript.RenderScriptGL.SurfaceConfig);
19410+
method public deprecated void bindProgramFragment(android.renderscript.ProgramFragment);
19411+
method public deprecated void bindProgramRaster(android.renderscript.ProgramRaster);
19412+
method public deprecated void bindProgramStore(android.renderscript.ProgramStore);
19413+
method public deprecated void bindProgramVertex(android.renderscript.ProgramVertex);
19414+
method public deprecated void bindRootScript(android.renderscript.Script);
19415+
method public deprecated int getHeight();
19416+
method public deprecated int getWidth();
19417+
method public deprecated void pause();
19418+
method public deprecated void resume();
19419+
method public deprecated void setSurface(android.view.SurfaceHolder, int, int);
1942019420
method public deprecated void setSurfaceTexture(android.graphics.SurfaceTexture, int, int);
1942119421
}
1942219422

19423-
public static class RenderScriptGL.SurfaceConfig {
19424-
ctor public RenderScriptGL.SurfaceConfig();
19425-
ctor public RenderScriptGL.SurfaceConfig(android.renderscript.RenderScriptGL.SurfaceConfig);
19426-
method public void setAlpha(int, int);
19427-
method public void setColor(int, int);
19428-
method public void setDepth(int, int);
19429-
method public void setSamples(int, int, float);
19423+
public static deprecated class RenderScriptGL.SurfaceConfig {
19424+
ctor public deprecated RenderScriptGL.SurfaceConfig();
19425+
ctor public deprecated RenderScriptGL.SurfaceConfig(android.renderscript.RenderScriptGL.SurfaceConfig);
19426+
method public deprecated void setAlpha(int, int);
19427+
method public deprecated void setColor(int, int);
19428+
method public deprecated void setDepth(int, int);
19429+
method public deprecated void setSamples(int, int, float);
1943019430
}
1943119431

1943219432
public class Sampler extends android.renderscript.BaseObj {

0 commit comments

Comments
 (0)