From a9eb319965da1f2d59c06135d0d8d4631312bfff Mon Sep 17 00:00:00 2001
From: Alex Sakhartchouk <alexst@google.com>
Date: Tue, 7 Feb 2012 16:14:11 -0800
Subject: [PATCH] Making a graceful fallback for missing textures.

Change-Id: Ib628d8344ab9bdd5f82c61a599c42a4c7ca3052e
---
 .../SceneGraph/res/drawable-nodpi/checker.png    | Bin 8422 -> 0 bytes
 .../res/drawable-nodpi/defaultcube.png           | Bin 2791 -> 0 bytes
 .../src/com/android/scenegraph/SceneManager.java |  14 ++++++++------
 .../src/com/android/scenegraph/Texture2D.java    |   2 +-
 .../src/com/android/scenegraph/TextureCube.java  |   2 +-
 .../src/com/android/scenegraph/render.rs         |   1 -
 6 files changed, 10 insertions(+), 9 deletions(-)
 delete mode 100644 tests/RenderScriptTests/SceneGraph/res/drawable-nodpi/checker.png
 delete mode 100644 tests/RenderScriptTests/SceneGraph/res/drawable-nodpi/defaultcube.png

diff --git a/tests/RenderScriptTests/SceneGraph/res/drawable-nodpi/checker.png b/tests/RenderScriptTests/SceneGraph/res/drawable-nodpi/checker.png
deleted file mode 100644
index 4bf9de5b5bb2e03d0c4e1ef40756a7b3140083ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8422
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
ABme*a

diff --git a/tests/RenderScriptTests/SceneGraph/res/drawable-nodpi/defaultcube.png b/tests/RenderScriptTests/SceneGraph/res/drawable-nodpi/defaultcube.png
deleted file mode 100644
index 351fc125aeb76d1d1c60f4a3c248ee18ff0955fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2791
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

diff --git a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/SceneManager.java b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/SceneManager.java
index 0f14486b42857..f77f48323770f 100644
--- a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/SceneManager.java
+++ b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/SceneManager.java
@@ -111,8 +111,8 @@ public class SceneManager extends SceneGraphBase {
         if (sSceneManager == null) {
             return null;
         }
-        if (sSceneManager.sDefaultCube != null) {
-            sSceneManager.sDefault2D = getDefault(true);
+        if (sSceneManager.sDefaultCube == null) {
+            sSceneManager.sDefaultCube = getDefault(true);
         }
         return sSceneManager.sDefaultCube;
     }
@@ -156,6 +156,9 @@ public class SceneManager extends SceneGraphBase {
 
     public static Allocation loadCubemap(String name, RenderScriptGL rs, Resources res) {
         Bitmap b = loadBitmap(name, res);
+        if (b == null) {
+            return null;
+        }
         return Allocation.createCubemapFromBitmap(rs, b,
                                                   MipmapControl.MIPMAP_ON_SYNC_TO_TEXTURE,
                                                   Allocation.USAGE_GRAPHICS_TEXTURE);
@@ -163,6 +166,9 @@ public class SceneManager extends SceneGraphBase {
 
     public static Allocation loadTexture2D(String name, RenderScriptGL rs, Resources res) {
         Bitmap b = loadBitmap(name, res);
+        if (b == null) {
+            return null;
+        }
         return Allocation.createFromBitmap(rs, b,
                                            Allocation.MipmapControl.MIPMAP_ON_SYNC_TO_TEXTURE,
                                            Allocation.USAGE_GRAPHICS_TEXTURE);
@@ -336,10 +342,6 @@ public class SceneManager extends SceneGraphBase {
         mRenderLoop.set_gVertexParamsScript(mVertexParamsScript);
         mRenderLoop.set_gCullScript(mCullScript);
 
-        Allocation checker = Allocation.createFromBitmapResource(mRS, mRes, R.drawable.checker,
-                                                         MipmapControl.MIPMAP_ON_SYNC_TO_TEXTURE,
-                                                         Allocation.USAGE_GRAPHICS_TEXTURE);
-        mRenderLoop.set_gTGrid(checker);
         mRenderLoop.set_gPFSBackground(ProgramStore.BLEND_NONE_DEPTH_TEST(mRS));
     }
 
diff --git a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/Texture2D.java b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/Texture2D.java
index 0809df8666fc4..8fae9d9317008 100644
--- a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/Texture2D.java
+++ b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/Texture2D.java
@@ -53,7 +53,7 @@ public class Texture2D extends TextureBase {
     }
 
     public void setTexture(Allocation tex) {
-        mData.texture = tex;
+        mData.texture = tex != null ? tex : SceneManager.getDefaultTex2D();
         if (mField != null) {
             mField.set_texture(0, mData.texture, true);
         }
diff --git a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/TextureCube.java b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/TextureCube.java
index 05870e7531e4c..12c81c20dd11c 100644
--- a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/TextureCube.java
+++ b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/TextureCube.java
@@ -60,7 +60,7 @@ public class TextureCube extends TextureBase {
     }
 
     public void setTexture(Allocation tex) {
-        mData.texture = tex;
+        mData.texture = tex != null ? tex : SceneManager.getDefaultTexCube();
         if (mField != null) {
             mField.set_texture(0, mData.texture, true);
         }
diff --git a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/render.rs b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/render.rs
index aea01135e5b46..d8d48b3da25c2 100644
--- a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/render.rs
+++ b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/render.rs
@@ -37,7 +37,6 @@ rs_allocation gRenderableObjects;
 rs_allocation gRenderPasses;
 
 // Temporary shaders
-rs_allocation gTGrid;
 rs_program_store gPFSBackground;
 
 uint32_t *gFrontToBack;