Update scripts to use programStore rather than programFragmentStore.
This is just an API name change.
Change-Id: I131d01cbc6609b350d6fcd3bed82a98d1b166f42
diff --git a/res/raw/distort.rs b/res/raw/distort.rs
index 3158a04..7a874ce 100644
--- a/res/raw/distort.rs
+++ b/res/raw/distort.rs
@@ -405,7 +405,7 @@
void drawLeaves() {
bindProgramFragment(NAMED_PFSky);
- bindProgramFragmentStore(NAMED_PFSLeaf);
+ bindProgramStore(NAMED_PFSLeaf);
bindProgramVertex(NAMED_PVSky);
bindTexture(NAMED_PFSky, 0, NAMED_TLeaves);
@@ -441,7 +441,7 @@
color(1.0f, 1.0f, 1.0f, 0.4f);
bindProgramFragment(NAMED_PFSky);
- bindProgramFragmentStore(NAMED_PFSLeaf);
+ bindProgramStore(NAMED_PFSLeaf);
bindTexture(NAMED_PFSky, 0, NAMED_TSky);
float x = skyOffsetX + State->skySpeedX;
@@ -470,7 +470,7 @@
specular(0.44f, 0.44f, 0.44f, 1.0f);
shininess(40.0f);
- bindProgramFragmentStore(NAMED_PFSBackground);
+ bindProgramStore(NAMED_PFSBackground);
bindProgramFragment(NAMED_PFLighting);
bindProgramVertex(NAMED_PVLight);
diff --git a/res/raw/fall.rs b/res/raw/fall.rs
index 7ae8a6a..59b7897 100644
--- a/res/raw/fall.rs
+++ b/res/raw/fall.rs
@@ -321,7 +321,7 @@
void drawLeaves() {
bindProgramFragment(g_PFSky);
- bindProgramFragmentStore(g_PFSLeaf);
+ bindProgramStore(g_PFSLeaf);
bindProgramVertex(g_PVSky);
bindTexture(g_PFSky, 0, g_TLeaves);
@@ -369,7 +369,7 @@
void drawRiverbed() {
bindProgramFragment(g_PFBackground);
- bindProgramFragmentStore(g_PFSBackground);
+ bindProgramStore(g_PFSBackground);
bindTexture(g_PFBackground, 0, g_TRiverbed);
drawSimpleMesh(g_WaterMesh);
}
diff --git a/res/raw/fall_bc.bc b/res/raw/fall_bc.bc
index c8207ab..6b84e3f 100644
--- a/res/raw/fall_bc.bc
+++ b/res/raw/fall_bc.bc
Binary files differ
diff --git a/res/raw/galaxy.rs b/res/raw/galaxy.rs
index f09d9c5..7cfaeeb 100644
--- a/res/raw/galaxy.rs
+++ b/res/raw/galaxy.rs
@@ -169,7 +169,7 @@
static void drawParticles(float offset) {
bindProgramVertex(gPVStars);
bindProgramFragment(gPFStars);
- bindProgramFragmentStore(gPSLights);
+ bindProgramStore(gPSLights);
bindTexture(gPFStars, 0, gTFlares);
float a = offset * angle;
diff --git a/res/raw/galaxy_bc.bc b/res/raw/galaxy_bc.bc
index 2b857c6..0644dfe 100644
--- a/res/raw/galaxy_bc.bc
+++ b/res/raw/galaxy_bc.bc
Binary files differ
diff --git a/res/raw/nexus.rs b/res/raw/nexus.rs
index ed7ba3c..f161004 100644
--- a/res/raw/nexus.rs
+++ b/res/raw/nexus.rs
@@ -156,7 +156,7 @@
void drawPulses(pulse_t * pulseSet, int setSize) {
//debugPi(99, 2);
bindProgramFragment(gPFTexture);
- bindProgramFragmentStore(gPSBlend);
+ bindProgramStore(gPSBlend);
float matrix[16];
diff --git a/res/raw/nexus_bc.bc b/res/raw/nexus_bc.bc
index 99c433b..c8daff1 100644
--- a/res/raw/nexus_bc.bc
+++ b/res/raw/nexus_bc.bc
Binary files differ
diff --git a/src/com/android/wallpaper/nexus/NexusRS.java b/src/com/android/wallpaper/nexus/NexusRS.java
index 2c13a91..d2eb48e 100644
--- a/src/com/android/wallpaper/nexus/NexusRS.java
+++ b/src/com/android/wallpaper/nexus/NexusRS.java
@@ -149,7 +149,7 @@
builder.setBlendFunc(BlendSrcFunc.ONE, BlendDstFunc.ONE);
builder.setDitherEnable(false);
ProgramStore solid = builder.create();
- mRS.contextBindProgramFragmentStore(solid);
+ mRS.contextBindProgramStore(solid);
builder.setBlendFunc(BlendSrcFunc.SRC_ALPHA, BlendDstFunc.ONE);
mScript.set_gPSBlend(builder.create());