summaryrefslogtreecommitdiffstats
path: root/graphics/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2010-03-01 15:42:03 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-03-01 15:42:03 -0800
commit1549257d12d8c134c0671ae56981e2e40d471d05 (patch)
treea08580ec71bf4b1ff73c8cdf028466e366649115 /graphics/java/android/renderscript/RenderScript.java
parent053100e6b6fdb57dbea98f7adff48fd07455c00b (diff)
parentc2908e60c9b021fb4bb69acff8d49981dd4dade8 (diff)
downloadframeworks_base-1549257d12d8c134c0671ae56981e2e40d471d05.zip
frameworks_base-1549257d12d8c134c0671ae56981e2e40d471d05.tar.gz
frameworks_base-1549257d12d8c134c0671ae56981e2e40d471d05.tar.bz2
Merge "Support defered generation of mipmaps. With this change we support mipmap generation when the texture is uploaded to GL without requiring RS to retain the full chain."
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
-rw-r--r--graphics/java/android/renderscript/RenderScript.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java
index 84b1a70..70c97ea 100644
--- a/graphics/java/android/renderscript/RenderScript.java
+++ b/graphics/java/android/renderscript/RenderScript.java
@@ -101,7 +101,7 @@ public class RenderScript {
native int nAllocationCreateFromBitmapBoxed(int dstFmt, boolean genMips, Bitmap bmp);
native int nAllocationCreateFromAssetStream(int dstFmt, boolean genMips, int assetStream);
- native void nAllocationUploadToTexture(int alloc, int baseMioLevel);
+ native void nAllocationUploadToTexture(int alloc, boolean genMips, int baseMioLevel);
native void nAllocationUploadToBufferObject(int alloc);
native void nAllocationSubData1D(int id, int off, int count, int[] d, int sizeBytes);