diff options
| author | Jason Sams <rjsams@android.com> | 2010-02-04 17:32:57 -0800 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-02-04 17:32:57 -0800 |
| commit | 82e1a27ba0367e7d5ca8df8cbfc4c0781688bf5a (patch) | |
| tree | 1f41cf27a6d59665bef4eac4bfb0f5aec4691f24 /src | |
| parent | 23dcb7babfac69bb330c33efae89a6b98eb86934 (diff) | |
| download | android_packages_apps_Trebuchet-82e1a27ba0367e7d5ca8df8cbfc4c0781688bf5a.tar.gz android_packages_apps_Trebuchet-82e1a27ba0367e7d5ca8df8cbfc4c0781688bf5a.tar.bz2 android_packages_apps_Trebuchet-82e1a27ba0367e7d5ca8df8cbfc4c0781688bf5a.zip | |
More dead code cleanup.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/AllAppsView.java | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java index ef1455553..8f80afd86 100644 --- a/src/com/android/launcher2/AllAppsView.java +++ b/src/com/android/launcher2/AllAppsView.java @@ -796,13 +796,10 @@ public class AllAppsView extends RSSurfaceView private Script.Invokable mInvokeSetZoom; private ProgramStore mPSIcons; - private ProgramStore mPSText; - private ProgramFragment mPFColor; private ProgramFragment mPFTexMip; private ProgramFragment mPFTexMipAlpha; private ProgramFragment mPFTexNearest; private ProgramVertex mPV; - private ProgramVertex mPVOrtho; private ProgramVertex mPVCurve; private SimpleMesh mMesh; private ProgramVertex.MatrixAllocation mPVA; @@ -890,14 +887,13 @@ public class AllAppsView extends RSSurfaceView initProgramVertex(); initProgramFragment(); initProgramStore(); - //initMesh(); initGl(); initData(); initTouchState(); initRs(); } - public void initMesh2() { + public void initMesh() { SimpleMesh.TriangleMeshBuilder tm = new SimpleMesh.TriangleMeshBuilder(mRS, 2, 0); for (int ct=0; ct < 16; ct++) { @@ -938,7 +934,7 @@ public class AllAppsView extends RSSurfaceView mUniformAlloc = Allocation.createSized(mRS, e, 1); - initMesh2(); + initMesh(); ProgramVertex.ShaderBuilder sb = new ProgramVertex.ShaderBuilder(mRS); String t = new String("void main() {\n" + // Animation @@ -1004,19 +1000,6 @@ public class AllAppsView extends RSSurfaceView mPVCurve.bindAllocation(mPVA); mPVCurve.bindConstants(mUniformAlloc, 1); - float tf[] = new float[] {72.f, 72.f, - 120.f, 120.f, 0.f, 0.f, - 120.f, 680.f, - (2.f / 480.f), 0, -240.f, -380.f}; - mUniformAlloc.data(tf); - - //pva = new ProgramVertex.MatrixAllocation(mRS); - //pva.setupOrthoWindow(mWidth, mHeight); - //pvb.setTextureMatrixEnable(true); - //mPVOrtho = pvb.create(); - //mPVOrtho.setName("PVOrtho"); - //mPVOrtho.bindAllocation(pva); - mRS.contextBindProgramVertex(mPV); } @@ -1033,9 +1016,6 @@ public class AllAppsView extends RSSurfaceView Sampler nearest = sb.create(); ProgramFragment.Builder bf = new ProgramFragment.Builder(mRS); - //mPFColor = bf.create(); - //mPFColor.setName("PFColor"); - bf.setTexture(ProgramFragment.Builder.EnvMode.MODULATE, ProgramFragment.Builder.Format.RGBA, 0); mPFTexMip = bf.create(); @@ -1063,10 +1043,6 @@ public class AllAppsView extends RSSurfaceView ProgramStore.BlendDstFunc.ONE_MINUS_SRC_ALPHA); mPSIcons = bs.create(); mPSIcons.setName("PSIcons"); - - //bs.setDitherEnable(false); - //mPSText = bs.create(); - //mPSText.setName("PSText"); } private void initGl() { |