commit 3055353fd4037e58bb7a7081ca50c0a76935959b
author Jason Sams <rjsams@android.com> Thu Jul 07 16:10:38 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 07 16:10:38 2011 -0700
tree 01db4edfe05adb644f01991e0af2d262c38e6498
parent 08009f1446eaad72946ec1af806590dbf60d95bf
parent 452a7661e8b06459b75493b441d33244939c1153

Merge "Fix defered type creation when loading from A3D."

graphics/java/android/renderscript/Allocation.java

diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java
index 44cdc1c..cc59d18 100644
--- a/graphics/java/android/renderscript/Allocation.java
+++ b/graphics/java/android/renderscript/Allocation.java
@@ -155,6 +155,18 @@
         }
     }
 
+    private void updateCacheInfo(Type t) {
+        mCurrentDimX = t.getX();
+        mCurrentDimY = t.getY();
+        mCurrentDimZ = t.getZ();
+        mCurrentCount = mCurrentDimX;
+        if (mCurrentDimY > 1) {
+            mCurrentCount *= mCurrentDimY;
+        }
+        if (mCurrentDimZ > 1) {
+            mCurrentCount *= mCurrentDimZ;
+        }
+    }
 
     Allocation(int id, RenderScript rs, Type t, int usage) {
         super(id, rs);
@@ -167,15 +179,8 @@
         }
         mType = t;
 
-        mCurrentDimX = t.getX();
-        mCurrentDimY = t.getY();
-        mCurrentDimZ = t.getZ();
-        mCurrentCount = mCurrentDimX;
-        if (mCurrentDimY > 1) {
-            mCurrentCount *= mCurrentDimY;
-        }
-        if (mCurrentDimZ > 1) {
-            mCurrentCount *= mCurrentDimZ;
+        if (t != null) {
+            updateCacheInfo(t);
         }
     }
 
@@ -785,6 +790,7 @@
         int typeID = mRS.nAllocationGetType(getID());
         mType = new Type(typeID, mRS);
         mType.updateFromNative();
+        updateCacheInfo(mType);
     }
 
     /*