diff options
author | Jason Sams <rjsams@android.com> | 2009-08-04 18:47:46 -0700 |
---|---|---|
committer | Jason Sams <rjsams@android.com> | 2009-08-04 19:00:00 -0700 |
commit | 110195fe9ff96255242bfa4df1d15c6a56b140d6 (patch) | |
tree | 0f1b3db3be79b4b4037432f978a940a01a96b4c4 /libs | |
parent | a2136d6b18a26ff34f2e5cd3f6c9413f0c96a5ba (diff) | |
download | frameworks_base-110195fe9ff96255242bfa4df1d15c6a56b140d6.zip frameworks_base-110195fe9ff96255242bfa4df1d15c6a56b140d6.tar.gz frameworks_base-110195fe9ff96255242bfa4df1d15c6a56b140d6.tar.bz2 |
Seperate ProgramVertex from RenderScript.java and merge ProgramVertexAlloc into the ProgramVertex class.
Diffstat (limited to 'libs')
4 files changed, 40 insertions, 40 deletions
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 a1b30f9..e598e0c 100644 --- a/libs/rs/java/Film/src/com/android/film/FilmRS.java +++ b/libs/rs/java/Film/src/com/android/film/FilmRS.java @@ -24,7 +24,7 @@ import android.graphics.Bitmap; import android.util.Log; import android.renderscript.Matrix; -import android.renderscript.ProgramVertexAlloc; +import android.renderscript.ProgramVertex; import android.renderscript.RenderScript; import android.renderscript.Element; import android.renderscript.Allocation; @@ -81,9 +81,9 @@ public class FilmRS { private ProgramStore mPSImages; private ProgramFragment mPFBackground; private ProgramFragment mPFImages; - private RenderScript.ProgramVertex mPVBackground; - private RenderScript.ProgramVertex mPVImages; - private ProgramVertexAlloc mPVA; + private ProgramVertex mPVBackground; + private ProgramVertex mPVImages; + private ProgramVertex.MatrixAllocation mPVA; private Allocation mImages[]; private Allocation mAllocIDs; @@ -144,14 +144,14 @@ public class FilmRS { mLight = (new Light.Builder(mRS)).create(); mLight.setPosition(0, -0.5f, -1.0f); - mRS.programVertexBegin(null, null); - mRS.programVertexAddLight(mLight); - mPVBackground = mRS.programVertexCreate(); + ProgramVertex.Builder pvb = new ProgramVertex.Builder(mRS, null, null); + pvb.addLight(mLight); + mPVBackground = pvb.create(); mPVBackground.setName("PVBackground"); - mRS.programVertexBegin(null, null); - mRS.programVertexSetTextureMatrixEnable(true); - mPVImages = mRS.programVertexCreate(); + pvb = new ProgramVertex.Builder(mRS, null, null); + pvb.setTextureMatrixEnable(true); + mPVImages = pvb.create(); mPVImages.setName("PVImages"); } @@ -239,9 +239,9 @@ public class FilmRS { loadImages(); initState(); - mPVA = new ProgramVertexAlloc(mRS); - mPVBackground.bindAllocation(0, mPVA.mAlloc); - mPVImages.bindAllocation(0, mPVA.mAlloc); + mPVA = new ProgramVertex.MatrixAllocation(mRS); + mPVBackground.bindAllocation(0, mPVA); + mPVImages.bindAllocation(0, mPVA); mPVA.setupProjectionNormalized(320, 480); diff --git a/libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java b/libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java index 4c2ab68..4826879 100644 --- a/libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java +++ b/libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java @@ -26,7 +26,7 @@ import android.graphics.drawable.Drawable; import android.util.Log; import android.renderscript.RenderScript; -import android.renderscript.ProgramVertexAlloc; +import android.renderscript.ProgramVertex; import android.renderscript.Element; import android.renderscript.Allocation; import android.renderscript.Script; 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 309c940..4ff7365 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 @@ -26,7 +26,7 @@ import android.renderscript.RenderScript; import android.renderscript.ProgramFragment; import android.renderscript.ProgramStore; import android.renderscript.Allocation; -import android.renderscript.ProgramVertexAlloc; +import android.renderscript.ProgramVertex; import static android.renderscript.Element.*; import static android.util.MathUtils.*; import android.graphics.Bitmap; @@ -73,8 +73,8 @@ class GrassRS { private Sampler mSampler; private ProgramFragment mPfBackground; private ProgramStore mPfsBackground; - private RenderScript.ProgramVertex mPvBackground; - private ProgramVertexAlloc mPvOrthoAlloc; + private ProgramVertex mPvBackground; + private ProgramVertex.MatrixAllocation mPvOrthoAlloc; private Allocation mTexturesIDs; private Allocation[] mTextures; @@ -98,7 +98,7 @@ class GrassRS { mResources = res; initRS(); } - + public void destroy() { mScript.destroy(); mSampler.destroy(); @@ -259,13 +259,13 @@ class GrassRS { } private void createProgramVertex() { - mPvOrthoAlloc = new ProgramVertexAlloc(mRS); + mPvOrthoAlloc = new ProgramVertex.MatrixAllocation(mRS); mPvOrthoAlloc.setupOrthoWindow(mWidth, mHeight); - mRS.programVertexBegin(null, null); - mRS.programVertexSetTextureMatrixEnable(true); - mPvBackground = mRS.programVertexCreate(); - mPvBackground.bindAllocation(0, mPvOrthoAlloc.mAlloc); + ProgramVertex.Builder pvb = new ProgramVertex.Builder(mRS, null, null); + pvb.setTextureMatrixEnable(true); + mPvBackground = pvb.create(); + mPvBackground.bindAllocation(0, mPvOrthoAlloc); mPvBackground.setName("PVBackground"); } } 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 7497a07..f6cf419 100644 --- a/libs/rs/java/Rollo/src/com/android/rollo/RolloRS.java +++ b/libs/rs/java/Rollo/src/com/android/rollo/RolloRS.java @@ -19,7 +19,7 @@ package com.android.rollo; import java.io.Writer; import android.renderscript.RenderScript; -import android.renderscript.ProgramVertexAlloc; +import android.renderscript.ProgramVertex; import android.renderscript.Element; import android.renderscript.Allocation; import android.renderscript.Script; @@ -102,10 +102,10 @@ public class RolloRS { private ProgramStore mPSText; private ProgramFragment mPFImages; private ProgramFragment mPFText; - private RenderScript.ProgramVertex mPV; - private ProgramVertexAlloc mPVAlloc; - private RenderScript.ProgramVertex mPVOrtho; - private ProgramVertexAlloc mPVOrthoAlloc; + private ProgramVertex mPV; + private ProgramVertex.MatrixAllocation mPVAlloc; + private ProgramVertex mPVOrtho; + private ProgramVertex.MatrixAllocation mPVOrthoAlloc; private Allocation[] mIcons; private Allocation[] mLabels; @@ -162,22 +162,22 @@ public class RolloRS { mPSText = bs.create(); mPSText.setName("PFSText"); - mPVAlloc = new ProgramVertexAlloc(mRS); - mRS.programVertexBegin(null, null); - mRS.programVertexSetTextureMatrixEnable(false); - mPV = mRS.programVertexCreate(); - mPV.setName("PV"); - mPV.bindAllocation(0, mPVAlloc.mAlloc); + mPVAlloc = new ProgramVertex.MatrixAllocation(mRS); mPVAlloc.setupProjectionNormalized(mWidth, mHeight); - mPVOrthoAlloc = new ProgramVertexAlloc(mRS); - mRS.programVertexBegin(null, null); - mRS.programVertexSetTextureMatrixEnable(true); - mPVOrtho = mRS.programVertexCreate(); - mPVOrtho.setName("PVOrtho"); - mPVOrtho.bindAllocation(0, mPVOrthoAlloc.mAlloc); + ProgramVertex.Builder pvb = new ProgramVertex.Builder(mRS, null, null); + mPV = pvb.create(); + mPV.setName("PV"); + mPV.bindAllocation(0, mPVAlloc); + + mPVOrthoAlloc = new ProgramVertex.MatrixAllocation(mRS); mPVOrthoAlloc.setupOrthoWindow(mWidth, mHeight); + pvb.setTextureMatrixEnable(true); + mPVOrtho = pvb.create(); + mPVOrtho.setName("PVOrtho"); + mPVOrtho.bindAllocation(0, mPVOrthoAlloc); + mRS.contextBindProgramVertex(mPV); mAllocScratchBuf = new int[32]; |