summaryrefslogtreecommitdiff
path: root/libs/rs/java
diff options
context:
space:
mode:
author Jason Sams <rjsams@android.com> 2009-06-17 16:52:59 -0700
committer Jason Sams <rjsams@android.com> 2009-06-17 16:52:59 -0700
commit9c54bdbf458e3c9433d237ae71cf47c4ec47d852 (patch)
tree5c740a213b3ac7518184f53692191d0f3cd8cc48 /libs/rs/java
parentb37c0a5db65cd8b72cac6a3250faddd1aecb722e (diff)
Implement default programs and implement defaults and parents for imports.
Diffstat (limited to 'libs/rs/java')
-rw-r--r--libs/rs/java/Fountain/res/raw/fountain.c5
-rw-r--r--libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java11
2 files changed, 2 insertions, 14 deletions
diff --git a/libs/rs/java/Fountain/res/raw/fountain.c b/libs/rs/java/Fountain/res/raw/fountain.c
index 3bd94963931b..54130f932caf 100644
--- a/libs/rs/java/Fountain/res/raw/fountain.c
+++ b/libs/rs/java/Fountain/res/raw/fountain.c
@@ -1,10 +1,9 @@
// Fountain test script
#pragma version(1)
-#pragma stateVertex(orthoWindow)
-#pragma stateRaster(flat)
+#pragma stateVertex(default)
#pragma stateFragment(PgmFragBackground)
-#pragma stateFragmentStore(MyBlend)
+#pragma stateFragmentStore(parent)
int main(void* con, int ft, int launchID) {
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 d167b5fe7d67..467115a5eea2 100644
--- a/libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java
+++ b/libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java
@@ -58,10 +58,8 @@ public class FountainRS {
private RenderScript.ProgramFragmentStore mPFS;
private RenderScript.ProgramFragment mPF;
private RenderScript.ProgramFragment mPF2;
- private RenderScript.ProgramVertex mPV;
private RenderScript.Allocation mTexture;
private RenderScript.Sampler mSampler;
- private ProgramVertexAlloc mPVA;
private Bitmap mBackground;
@@ -110,15 +108,6 @@ public class FountainRS {
mPF2.bindSampler(mSampler, 0);
mPF2.setName("PgmFragBackground");
- mRS.programVertexBegin(null, null);
- mPV = mRS.programVertexCreate();
- mPVA = new ProgramVertexAlloc(mRS);
- mPV.bindAllocation(0, mPVA.mAlloc);
- mPVA.setupOrthoWindow(320, 480);
- mRS.contextBindProgramVertex(mPV);
-
-
-
mParams[0] = 0;
mParams[1] = partCount;