diff options
| author | Tim Murray <timmurray@google.com> | 2014-02-03 14:41:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-03 14:41:30 -0800 |
| commit | 67d9e0be8e4ff709c03865c3b4ac9f40d5dcfdbb (patch) | |
| tree | adc9b917eab4ec8e7b53e8f722c85734499601e9 /rs | |
| parent | 42e4aee598d2eceab6fc20fc9801b5c2fbf2e50d (diff) | |
| parent | 0cc37f4cdeaed95e4f61f1a6e7b78f07e7025e97 (diff) | |
| download | frameworks_base-67d9e0be8e4ff709c03865c3b4ac9f40d5dcfdbb.zip frameworks_base-67d9e0be8e4ff709c03865c3b4ac9f40d5dcfdbb.tar.gz frameworks_base-67d9e0be8e4ff709c03865c3b4ac9f40d5dcfdbb.tar.bz2 | |
am 0cc37f4c: Merge "Fix debug context."
* commit '0cc37f4cdeaed95e4f61f1a6e7b78f07e7025e97':
Fix debug context.
Diffstat (limited to 'rs')
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index 918a76e..f945690 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -224,28 +224,28 @@ nDeviceCreate(JNIEnv *_env, jobject _this) } static void -nDeviceDestroy(JNIEnv *_env, jobject _this, jint dev) +nDeviceDestroy(JNIEnv *_env, jobject _this, jlong dev) { LOG_API("nDeviceDestroy"); return rsDeviceDestroy((RsDevice)dev); } static void -nDeviceSetConfig(JNIEnv *_env, jobject _this, jint dev, jint p, jint value) +nDeviceSetConfig(JNIEnv *_env, jobject _this, jlong dev, jint p, jint value) { LOG_API("nDeviceSetConfig dev(%p), param(%i), value(%i)", (void *)dev, p, value); return rsDeviceSetConfig((RsDevice)dev, (RsDeviceParam)p, value); } static jlong -nContextCreate(JNIEnv *_env, jobject _this, jint dev, jint ver, jint sdkVer, jint ct) +nContextCreate(JNIEnv *_env, jobject _this, jlong dev, jint ver, jint sdkVer, jint ct) { LOG_API("nContextCreate"); return (jint)rsContextCreate((RsDevice)dev, ver, sdkVer, (RsContextType)ct, 0); } static jlong -nContextCreateGL(JNIEnv *_env, jobject _this, jint dev, jint ver, jint sdkVer, +nContextCreateGL(JNIEnv *_env, jobject _this, jlong dev, jint ver, jint sdkVer, int colorMin, int colorPref, int alphaMin, int alphaPref, int depthMin, int depthPref, |