From 9c54bdbf458e3c9433d237ae71cf47c4ec47d852 Mon Sep 17 00:00:00 2001 From: Jason Sams Date: Wed, 17 Jun 2009 16:52:59 -0700 Subject: Implement default programs and implement defaults and parents for imports. --- libs/rs/java/Fountain/res/raw/fountain.c | 5 ++--- .../rs/java/Fountain/src/com/android/fountain/FountainRS.java | 11 ----------- 2 files changed, 2 insertions(+), 14 deletions(-) (limited to 'libs/rs/java') 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; -- cgit v1.2.3-59-g8ed1b