summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Sams <jsams@google.com> 2014-12-02 23:45:16 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-12-02 23:45:17 +0000
commitabdaa32dd79c915d0e419560c8eaa64e3d946b77 (patch)
treed97b655a350b39fff986bc443d36b84216af774c
parente89a286541e242ad96705fcdd1fe2c6a9eafb4a0 (diff)
parent81cd2b18bd36285d1843f78418282e1dad156fbd (diff)
Merge "Fix bug in passing of context flags and version."
-rw-r--r--rs/jni/android_renderscript_RenderScript.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp
index b46058e7bc29..68a0b8387766 100644
--- a/rs/jni/android_renderscript_RenderScript.cpp
+++ b/rs/jni/android_renderscript_RenderScript.cpp
@@ -258,12 +258,12 @@ 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)
{
if (kLogApi) {
ALOGD("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