diff options
| author | 2014-01-10 20:37:12 +0000 | |
|---|---|---|
| committer | 2014-01-10 20:37:12 +0000 | |
| commit | 291d64685dd05f76deaf210a75d2d06c153f4b39 (patch) | |
| tree | ff4af41dc25f22a46c2c30e866036c83438d70e3 | |
| parent | 45fbe0e7baf91e9cc510073790c9ab8563aa2461 (diff) | |
| parent | 5eaf468434e96bc7c8d4cfeb138699a1c7b256ca (diff) | |
Merge "Fix debug context."
| -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 84d9a22443bf..5cf3a83b19c6 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, |