summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2010-01-06 17:25:32 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-01-06 17:25:32 -0800
commit6d7b907ab5c4580542426aa3ebd8ff275077c7c4 (patch)
tree4a3900f509891d950e649d06e81206c8beff9c6f /graphics
parent0caa13b257935d2ed436ed0b05f6144c5f48a23c (diff)
parent74e02ef2000ff2783e526d6916e2f0b5d517593e (diff)
downloadframeworks_base-6d7b907ab5c4580542426aa3ebd8ff275077c7c4.zip
frameworks_base-6d7b907ab5c4580542426aa3ebd8ff275077c7c4.tar.gz
frameworks_base-6d7b907ab5c4580542426aa3ebd8ff275077c7c4.tar.bz2
Merge "Support npot on es 2.0 HW."
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/renderscript/Allocation.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java
index 880e459..115dd62 100644
--- a/graphics/java/android/renderscript/Allocation.java
+++ b/graphics/java/android/renderscript/Allocation.java
@@ -266,7 +266,7 @@ public class Allocation extends BaseObj {
return new Allocation(id, rs, null);
}
- static public Allocation createFromBitmapBoxed(RenderScript rs, Bitmap b, Element dstFmt, boolean genMips)
+ static Allocation createFromBitmapBoxed(RenderScript rs, Bitmap b, Element dstFmt, boolean genMips)
throws IllegalArgumentException {
rs.validate();