diff options
| author | Yang Ni <yangni@google.com> | 2016-03-08 21:02:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-03-08 21:02:26 +0000 |
| commit | 5a6d9b6656b3ebd8956c4a129b17c372585d23a9 (patch) | |
| tree | 8648de7fceb61762297378bdc0c3639322e616e4 /rs/jni/android_renderscript_RenderScript.cpp | |
| parent | 4fa1092c5469ad2ea4fbcc7a0aba08a258a62879 (diff) | |
| parent | 8c8daea2efe0f545f570e475250e37a6eb1cb910 (diff) | |
Merge "Revert "Set flags in RS JNI calls for rsObj creation""
Diffstat (limited to 'rs/jni/android_renderscript_RenderScript.cpp')
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index 4877a378aaf4..4e667c659133 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -1062,7 +1062,7 @@ nElementCreate(JNIEnv *_env, jobject _this, jlong con, jlong type, jint kind, jb type, kind, norm, size); } return (jlong)(uintptr_t)rsElementCreate((RsContext)con, (RsDataType)type, (RsDataKind)kind, - norm, size, true); + norm, size); } static jlong @@ -1101,7 +1101,7 @@ nElementCreate2(JNIEnv *_env, jobject _this, jlong con, jlong id = (jlong)(uintptr_t)rsElementCreate2((RsContext)con, (const RsElement *)ids, fieldCount, nameArray, fieldCount * sizeof(size_t), sizeArray, - (const uint32_t *)arraySizes, fieldCount, true); + (const uint32_t *)arraySizes, fieldCount); free(ids); free(arraySizes); @@ -1175,7 +1175,7 @@ nTypeCreate(JNIEnv *_env, jobject _this, jlong con, jlong eid, } return (jlong)(uintptr_t)rsTypeCreate((RsContext)con, (RsElement)eid, dimx, dimy, dimz, mips, - faces, yuv, true); + faces, yuv); } static void @@ -1211,7 +1211,7 @@ nAllocationCreateTyped(JNIEnv *_env, jobject _this, jlong con, jlong type, jint } return (jlong)(uintptr_t) rsAllocationCreateTyped((RsContext)con, (RsType)type, (RsAllocationMipmapControl)mips, - (uint32_t)usage, (uintptr_t)pointer, true); + (uint32_t)usage, (uintptr_t)pointer); } static void @@ -1316,7 +1316,7 @@ nAllocationCreateFromBitmap(JNIEnv *_env, jobject _this, jlong con, jlong type, const void* ptr = bitmap.getPixels(); jlong id = (jlong)(uintptr_t)rsAllocationCreateFromBitmap((RsContext)con, (RsType)type, (RsAllocationMipmapControl)mip, - ptr, bitmap.getSize(), usage, true); + ptr, bitmap.getSize(), usage); bitmap.unlockPixels(); return id; } @@ -1332,7 +1332,7 @@ nAllocationCreateBitmapBackedAllocation(JNIEnv *_env, jobject _this, jlong con, const void* ptr = bitmap.getPixels(); jlong id = (jlong)(uintptr_t)rsAllocationCreateTyped((RsContext)con, (RsType)type, (RsAllocationMipmapControl)mip, - (uint32_t)usage, (uintptr_t)ptr, true); + (uint32_t)usage, (uintptr_t)ptr); bitmap.unlockPixels(); return id; } @@ -1348,7 +1348,7 @@ nAllocationCubeCreateFromBitmap(JNIEnv *_env, jobject _this, jlong con, jlong ty const void* ptr = bitmap.getPixels(); jlong id = (jlong)(uintptr_t)rsAllocationCubeCreateFromBitmap((RsContext)con, (RsType)type, (RsAllocationMipmapControl)mip, - ptr, bitmap.getSize(), usage, true); + ptr, bitmap.getSize(), usage); bitmap.unlockPixels(); return id; } |