commit 070ada8f866465c705448b64c0631c01bc185258
author Jason Sams <rjsams@android.com> Wed Aug 04 17:53:07 2010 -0700
committer Jason Sams <rjsams@android.com> Thu Aug 05 09:59:38 2010 -0700
tree a22c11177ab07a43392133d99ecfbe45757ea033
parent 976ebec9e31643d3513f9f0de2b433d9aa186ce9

Update to RS api chance moving constant colors to ProgramFragment.

Change-Id: I28d436151f7a764939878676633b9acab85e919a

src/com/android/launcher2/AllApps3D.java

diff --git a/src/com/android/launcher2/AllApps3D.java b/src/com/android/launcher2/AllApps3D.java
index 653f355..e975fa1 100644
--- a/src/com/android/launcher2/AllApps3D.java
+++ b/src/com/android/launcher2/AllApps3D.java
@@ -1135,14 +1135,17 @@
             ProgramFragment.Builder bf = new ProgramFragment.Builder(sRS);
             bf.setTexture(ProgramFragment.Builder.EnvMode.MODULATE,
                           ProgramFragment.Builder.Format.RGBA, 0);
+            bf.setVaryingColor(true);
             ProgramFragment pfTexMip = bf.create();
             pfTexMip.bindSampler(linear, 0);
 
+            bf.setVaryingColor(false);
             ProgramFragment pfTexNearest = bf.create();
             pfTexNearest.bindSampler(nearest, 0);
 
             bf.setTexture(ProgramFragment.Builder.EnvMode.MODULATE,
                           ProgramFragment.Builder.Format.ALPHA, 0);
+            bf.setVaryingColor(true);
             ProgramFragment pfTexMipAlpha = bf.create();
             pfTexMipAlpha.bindSampler(linear, 0);
 

src/com/android/launcher2/allapps.rs

diff --git a/src/com/android/launcher2/allapps.rs b/src/com/android/launcher2/allapps.rs
index 0c55eea..64c99db 100644
--- a/src/com/android/launcher2/allapps.rs
+++ b/src/com/android/launcher2/allapps.rs
@@ -235,7 +235,6 @@
 static void
 draw_home_button()
 {
-    color(1.0f, 1.0f, 1.0f, 1.0f);
     rsgBindTexture(gPFTexNearest, 0, gHomeButton);
 
     float w = rsgGetWidth();
@@ -282,7 +281,6 @@
 
     vpConstants->Position.z = p;
 
-    color(1.0f, 1.0f, 1.0f, 1.0f);
     for (row = -5; row < 15; row++) {
         float y = yoff - ((-rowFrac + row) * rowHeight);