am abdaa32d: Merge "Fix bug in passing of context flags and version."

* commit 'abdaa32dd79c915d0e419560c8eaa64e3d946b77':
  Fix bug in passing of context flags and version.
This commit is contained in:
Jason Sams
2014-12-02 23:52:12 +00:00
committed by Android Git Automerger

View File

@@ -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