commit b713926766c4b342a881cb251964050a0d3d0a41
author Jim Shuma <jshuma@google.com> Mon Jan 24 13:52:25 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 24 13:52:25 2011 -0800
tree 74631840657e351410caa906084207eb2215f914
parent 0de20d1ebd3dc8e766f7f4f4dbc3f77dd7326e30
parent ec18350090abbba03c3f0c9f0511cfde4afee66f

Merge "Proper error checking for setting cards" into honeycomb

carousel/java/com/android/ex/carousel/carousel.rs

diff --git a/carousel/java/com/android/ex/carousel/carousel.rs b/carousel/java/com/android/ex/carousel/carousel.rs
index 7468c6f..483c502 100644
--- a/carousel/java/com/android/ex/carousel/carousel.rs
+++ b/carousel/java/com/android/ex/carousel/carousel.rs
@@ -464,6 +464,13 @@
     rsMatrixTranslate(matrix, -eye.x, -eye.y, -eye.z);
 }
 
+/*
+ * Returns true if a state represents a texture that is loaded enough to draw
+ */
+static bool textureEverLoaded(int state) {
+    return (state == STATE_LOADED) || (state == STATE_STALE) || (state == STATE_UPDATING);
+}
+
 void setTexture(int n, rs_allocation texture)
 {
     if (n < 0 || n >= cardCount) return;
@@ -497,7 +504,8 @@
         cards[n].textureState = STATE_INVALID;
         rsClearObject(&cards[n].texture);
     } else {
-        cards[n].textureState = STATE_STALE;
+        cards[n].textureState =
+            textureEverLoaded(cards[n].textureState) ? STATE_STALE : STATE_INVALID;
     }
 }
 
@@ -508,7 +516,8 @@
         cards[n].detailTextureState = STATE_INVALID;
         rsClearObject(&cards[n].detailTexture);
     } else {
-        cards[n].detailTextureState = STATE_STALE;
+        cards[n].detailTextureState =
+            textureEverLoaded(cards[n].detailTextureState) ? STATE_STALE : STATE_INVALID;
     }
 }
 
@@ -682,8 +691,7 @@
             // Bind the appropriate shader network.  If there's no alpha blend, then
             // switch to single shader for better performance.
             const int state = cards[i].textureState;
-            const bool loaded = (state == STATE_LOADED) || (state == STATE_STALE) ||
-                (state == STATE_UPDATING);
+            bool loaded = textureEverLoaded(state) && rsIsObject(cards[i].texture);
             if (shaderConstants->fadeAmount == 1.0f || shaderConstants->fadeAmount < 0.01f) {
                 if (overallAlpha < 1.0) {
                     rsgBindProgramFragment(singleTextureBlendingFragmentProgram);
@@ -790,8 +798,7 @@
     for (int i = cardCount-1; i >= 0; --i) {
         if (cards[i].cardVisible) {
             const int state = cards[i].detailTextureState;
-            const bool isLoaded = (state == STATE_LOADED) || (state == STATE_STALE) ||
-                (state == STATE_UPDATING);
+            const bool isLoaded = textureEverLoaded(state);
             if (isLoaded && cards[i].detailTexture.p != 0) {
                 const float lineWidth = rsAllocationGetDimX(detailLineTexture);