summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
authorAlex Sakhartchouk <alexst@google.com>2011-03-02 15:38:10 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-02 15:38:10 -0800
commit98e88ca2dcb8cb6fb3280cd571b917a4c5de191c (patch)
treea6971966226db83379b143bd68c8f723d68211fb /graphics/java
parent04e04fe333874afdbc4bb5936533c5a6f0855cfd (diff)
parent9ea30a69d5c1d5b137b0186116eb74261b3b5a5e (diff)
downloadframeworks_base-98e88ca2dcb8cb6fb3280cd571b917a4c5de191c.zip
frameworks_base-98e88ca2dcb8cb6fb3280cd571b917a4c5de191c.tar.gz
frameworks_base-98e88ca2dcb8cb6fb3280cd571b917a4c5de191c.tar.bz2
Merge "Fixing element count bug in renderscript."
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/renderscript/Type.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/graphics/java/android/renderscript/Type.java b/graphics/java/android/renderscript/Type.java
index 9979e2a..b39d2e4 100644
--- a/graphics/java/android/renderscript/Type.java
+++ b/graphics/java/android/renderscript/Type.java
@@ -142,7 +142,8 @@ public class Type extends BaseObj {
}
int count = x * y * z * faces;
- if (hasLod && (x > 1) && (y > 1) && (z > 1)) {
+
+ while (hasLod && ((x > 1) || (y > 1) || (z > 1))) {
if(x > 1) {
x >>= 1;
}