diff options
| author | Jason Sams <jsams@google.com> | 2014-12-03 01:27:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-03 01:27:37 +0000 |
| commit | d6e9e61c9d9b7ba88ae7ade0418e17a3ac2ef341 (patch) | |
| tree | fae253715406259d6b0a02cde7eb8756af78ecba | |
| parent | 0fcd3f41079880abccf08c498b5e109dccfc4577 (diff) | |
| parent | bb7e86ff0478ef9ea2e35065bfcb2d6e9ffa9292 (diff) | |
| download | frameworks_base-d6e9e61c9d9b7ba88ae7ade0418e17a3ac2ef341.zip frameworks_base-d6e9e61c9d9b7ba88ae7ade0418e17a3ac2ef341.tar.gz frameworks_base-d6e9e61c9d9b7ba88ae7ade0418e17a3ac2ef341.tar.bz2 | |
Merge "Fix bug in passing of context flags and version." into lmp-mr1-dev
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index 13a649a..5f5b65e 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -240,10 +240,10 @@ nDeviceSetConfig(JNIEnv *_env, jobject _this, jlong dev, jint p, jint value) } static jlong -nContextCreate(JNIEnv *_env, jobject _this, jlong dev, jint ver, jint sdkVer, jint ct) +nContextCreate(JNIEnv *_env, jobject _this, jlong dev, jint flags, jint sdkVer, jint contextType) { LOG_API("nContextCreate"); - return (jlong)(uintptr_t)rsContextCreate((RsDevice)dev, ver, sdkVer, (RsContextType)ct, 0); + return (jlong)(uintptr_t)rsContextCreate((RsDevice)dev, 0, sdkVer, (RsContextType)contextType, flags); } static jlong |